diff options
author | eri <eri@inventati.org> | 2024-03-05 19:19:04 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-05 18:19:04 +0000 |
commit | 3552bb2464cbaa57facbcb9ad2bcb266bc5a87f6 (patch) | |
tree | e2a91e49e76dbf6a01a7248cad62e1503ea64a50 /components/devtools | |
parent | da873779b496c9a1236cd92388efb1316f97e3d6 (diff) | |
download | servo-3552bb2464cbaa57facbcb9ad2bcb266bc5a87f6.tar.gz servo-3552bb2464cbaa57facbcb9ad2bcb266bc5a87f6.zip |
clippy: Fix several warnings in components/devtools (#31501)
Diffstat (limited to 'components/devtools')
-rw-r--r-- | components/devtools/actor.rs | 8 | ||||
-rw-r--r-- | components/devtools/actors/browsing_context.rs | 8 | ||||
-rw-r--r-- | components/devtools/actors/console.rs | 24 | ||||
-rw-r--r-- | components/devtools/actors/device.rs | 2 | ||||
-rw-r--r-- | components/devtools/actors/emulation.rs | 8 | ||||
-rw-r--r-- | components/devtools/actors/framerate.rs | 4 | ||||
-rw-r--r-- | components/devtools/actors/inspector.rs | 48 | ||||
-rw-r--r-- | components/devtools/actors/network_event.rs | 16 | ||||
-rw-r--r-- | components/devtools/actors/object.rs | 2 | ||||
-rw-r--r-- | components/devtools/actors/performance.rs | 2 | ||||
-rw-r--r-- | components/devtools/actors/profiler.rs | 2 | ||||
-rw-r--r-- | components/devtools/actors/root.rs | 4 | ||||
-rw-r--r-- | components/devtools/actors/stylesheets.rs | 2 | ||||
-rw-r--r-- | components/devtools/actors/tab.rs | 2 | ||||
-rw-r--r-- | components/devtools/actors/thread.rs | 2 | ||||
-rw-r--r-- | components/devtools/actors/timeline.rs | 22 | ||||
-rw-r--r-- | components/devtools/lib.rs | 13 | ||||
-rw-r--r-- | components/devtools/protocol.rs | 2 |
18 files changed, 85 insertions, 86 deletions
diff --git a/components/devtools/actor.rs b/components/devtools/actor.rs index 2f53e87a2ad..64b6064faa6 100644 --- a/components/devtools/actor.rs +++ b/components/devtools/actor.rs @@ -5,7 +5,7 @@ use std::any::Any; use std::cell::{Cell, RefCell}; use std::collections::HashMap; -use std::mem::replace; +use std::mem; use std::net::TcpStream; use std::sync::{Arc, Mutex}; @@ -105,7 +105,7 @@ impl ActorRegistry { /// Get start stamp when registry was started pub fn start_stamp(&self) -> PreciseTime { - self.start_stamp.clone() + self.start_stamp } pub fn register_script_actor(&self, script_id: String, actor: String) { @@ -194,12 +194,12 @@ impl ActorRegistry { } }, } - let new_actors = replace(&mut *self.new_actors.borrow_mut(), vec![]); + let new_actors = mem::take(&mut *self.new_actors.borrow_mut()); for actor in new_actors.into_iter() { self.actors.insert(actor.name().to_owned(), actor); } - let old_actors = replace(&mut *self.old_actors.borrow_mut(), vec![]); + let old_actors = mem::take(&mut *self.old_actors.borrow_mut()); for name in old_actors { self.drop_actor(name); } diff --git a/components/devtools/actors/browsing_context.rs b/components/devtools/actors/browsing_context.rs index 8a36d19137a..af67814d127 100644 --- a/components/devtools/actors/browsing_context.rs +++ b/components/devtools/actors/browsing_context.rs @@ -284,11 +284,11 @@ impl BrowsingContextActor { let tabdesc = TabDescriptorActor::new(actors, name.clone()); let target = BrowsingContextActor { - name: name, + name, script_chan: script_sender, - title: RefCell::new(String::from(title)), + title: RefCell::new(title), url: RefCell::new(url.into_string()), - console: console, + console, _emulation: emulation.name(), _inspector: inspector.name(), _timeline: timeline.name(), @@ -355,7 +355,7 @@ impl BrowsingContextActor { from: self.name(), type_: "tabNavigated".to_owned(), url: url.as_str().to_owned(), - title: title, + title, nativeConsoleAPI: true, state: state.to_owned(), isFrameSwitching: false, diff --git a/components/devtools/actors/console.rs b/components/devtools/actors/console.rs index f83fc3c05b2..b60e506ba43 100644 --- a/components/devtools/actors/console.rs +++ b/components/devtools/actors/console.rs @@ -133,7 +133,7 @@ impl ConsoleActor { } } - fn streams_mut<'a>(&self, registry: &'a ActorRegistry, cb: impl Fn(&mut TcpStream)) { + fn streams_mut(&self, registry: &ActorRegistry, cb: impl Fn(&mut TcpStream)) { match &self.root { Root::BrowsingContext(bc) => registry .find::<BrowsingContextActor>(bc) @@ -221,7 +221,7 @@ impl ConsoleActor { ActorValue { class, uuid } => { //TODO: make initial ActorValue message include these properties? let mut m = Map::new(); - let actor = ObjectActor::new(registry, uuid); + let actor = ObjectActor::register(registry, uuid); m.insert("type".to_owned(), Value::String("object".to_owned())); m.insert("class".to_owned(), Value::String(class)); @@ -236,8 +236,8 @@ impl ConsoleActor { //TODO: catch and return exception values from JS evaluation let reply = EvaluateJSReply { from: self.name(), - input: input, - result: result, + input, + result, timestamp: 0, exception: Value::Null, exceptionMessage: Value::Null, @@ -255,7 +255,7 @@ impl ConsoleActor { self.cached_events .borrow_mut() .entry(id.clone()) - .or_insert(vec![]) + .or_default() .push(CachedConsoleMessage::PageError(page_error.clone())); if id == self.current_unique_id(registry) { let msg = PageErrorMsg { @@ -287,7 +287,7 @@ impl ConsoleActor { self.cached_events .borrow_mut() .entry(id.clone()) - .or_insert(vec![]) + .or_default() .push(CachedConsoleMessage::ConsoleAPI(ConsoleAPI { type_: "ConsoleAPI".to_owned(), level: level.clone(), @@ -306,7 +306,7 @@ impl ConsoleActor { from: self.name(), type_: "consoleAPICall".to_owned(), message: ConsoleMsg { - level: level, + level, timeStamp: SystemTime::now() .duration_since(UNIX_EPOCH) .unwrap_or_default() @@ -351,7 +351,7 @@ impl Actor for ConsoleActor { .unwrap() .as_array() .unwrap() - .into_iter() + .iter() .map(|json_type| json_type.as_str().unwrap()); let mut message_types = CachedConsoleMessageTypes::empty(); for str_type in str_types { @@ -393,7 +393,7 @@ impl Actor for ConsoleActor { let msg = GetCachedMessagesReply { from: self.name(), - messages: messages, + messages, }; let _ = stream.write_json_packet(&msg); ActorMessageStatus::Processed @@ -445,7 +445,7 @@ impl Actor for ConsoleActor { }, "evaluateJS" => { - let msg = self.evaluateJS(®istry, &msg); + let msg = self.evaluateJS(registry, msg); let _ = stream.write_json_packet(&msg); ActorMessageStatus::Processed }, @@ -468,14 +468,14 @@ impl Actor for ConsoleActor { return Ok(ActorMessageStatus::Processed); } - let reply = self.evaluateJS(®istry, &msg).unwrap(); + let reply = self.evaluateJS(registry, msg).unwrap(); let msg = EvaluateJSEvent { from: self.name(), r#type: "evaluationResult".to_owned(), input: reply.input, result: reply.result, timestamp: reply.timestamp, - resultID: resultID, + resultID, exception: reply.exception, exceptionMessage: reply.exceptionMessage, helperResult: reply.helperResult, diff --git a/components/devtools/actors/device.rs b/components/devtools/actors/device.rs index 9fb0c6a84b9..ed4c7993c9c 100644 --- a/components/devtools/actors/device.rs +++ b/components/devtools/actors/device.rs @@ -59,7 +59,7 @@ impl Actor for DeviceActor { impl DeviceActor { pub fn new(name: String) -> DeviceActor { - DeviceActor { name: name } + DeviceActor { name } } pub fn description() -> ActorDescription { diff --git a/components/devtools/actors/emulation.rs b/components/devtools/actors/emulation.rs index 4acfee1048e..6e91bea0037 100644 --- a/components/devtools/actors/emulation.rs +++ b/components/devtools/actors/emulation.rs @@ -21,19 +21,17 @@ impl Actor for EmulationActor { fn handle_message( &self, _registry: &ActorRegistry, - msg_type: &str, + _msg_type: &str, _msg: &Map<String, Value>, _stream: &mut TcpStream, _id: StreamId, ) -> Result<ActorMessageStatus, ()> { - Ok(match msg_type { - _ => ActorMessageStatus::Ignored, - }) + Ok(ActorMessageStatus::Ignored) } } impl EmulationActor { pub fn new(name: String) -> EmulationActor { - EmulationActor { name: name } + EmulationActor { name } } } diff --git a/components/devtools/actors/framerate.rs b/components/devtools/actors/framerate.rs index 607222489fa..5428a5cba67 100644 --- a/components/devtools/actors/framerate.rs +++ b/components/devtools/actors/framerate.rs @@ -51,7 +51,7 @@ impl FramerateActor { let mut actor = FramerateActor { name: actor_name.clone(), pipeline: pipeline_id, - script_sender: script_sender, + script_sender, is_recording: false, ticks: Vec::new(), }; @@ -71,7 +71,7 @@ impl FramerateActor { } pub fn take_pending_ticks(&mut self) -> Vec<HighResolutionStamp> { - mem::replace(&mut self.ticks, Vec::new()) + mem::take(&mut self.ticks) } fn start_recording(&mut self) { diff --git a/components/devtools/actors/inspector.rs b/components/devtools/actors/inspector.rs index 0728f967411..eae82683748 100644 --- a/components/devtools/actors/inspector.rs +++ b/components/devtools/actors/inspector.rs @@ -207,8 +207,8 @@ impl NodeInfoToProtocol for NodeInfo { let name = actors.new_name("node"); let node_actor = NodeActor { name: name.clone(), - script_chan: script_chan, - pipeline: pipeline.clone(), + script_chan, + pipeline, }; actors.register_script_actor(self.uniqueId, name.clone()); actors.register_later(Box::new(node_actor)); @@ -315,7 +315,7 @@ impl Actor for WalkerActor { let msg = DocumentElementReply { from: self.name(), - node: node, + node, }; let _ = stream.write_json_packet(&msg); ActorMessageStatus::Processed @@ -538,16 +538,16 @@ impl Actor for PageStyleActor { let auto_margins = msg .get("autoMargins") - .and_then(&Value::as_bool) + .and_then(Value::as_bool) .unwrap_or(false); // http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/styles.js let msg = GetLayoutReply { from: self.name(), - display: display, - position: position, - zIndex: zIndex, - boxSizing: boxSizing, + display, + position, + zIndex, + boxSizing, autoMargins: if auto_margins { let mut m = Map::new(); let auto = serde_json::value::Value::String("auto".to_owned()); @@ -567,20 +567,20 @@ impl Actor for PageStyleActor { } else { serde_json::value::Value::Null }, - marginTop: marginTop, - marginRight: marginRight, - marginBottom: marginBottom, - marginLeft: marginLeft, - borderTopWidth: borderTopWidth, - borderRightWidth: borderRightWidth, - borderBottomWidth: borderBottomWidth, - borderLeftWidth: borderLeftWidth, - paddingTop: paddingTop, - paddingRight: paddingRight, - paddingBottom: paddingBottom, - paddingLeft: paddingLeft, - width: width, - height: height, + marginTop, + marginRight, + marginBottom, + marginLeft, + borderTopWidth, + borderRightWidth, + borderBottomWidth, + borderLeftWidth, + paddingTop, + paddingRight, + paddingBottom, + paddingLeft, + width, + height, }; let msg = serde_json::to_string(&msg).unwrap(); let msg = serde_json::from_str::<Value>(&msg).unwrap(); @@ -614,7 +614,7 @@ impl Actor for InspectorActor { let walker = WalkerActor { name: registry.new_name("walker"), script_chan: self.script_chan.clone(), - pipeline: pipeline, + pipeline, }; let mut walker_name = self.walker.borrow_mut(); *walker_name = Some(walker.name()); @@ -643,7 +643,7 @@ impl Actor for InspectorActor { let style = PageStyleActor { name: registry.new_name("pageStyle"), script_chan: self.script_chan.clone(), - pipeline: pipeline, + pipeline, }; let mut pageStyle = self.pageStyle.borrow_mut(); *pageStyle = Some(style.name()); diff --git a/components/devtools/actors/network_event.rs b/components/devtools/actors/network_event.rs index 7eb664f9757..2a5a4f77e65 100644 --- a/components/devtools/actors/network_event.rs +++ b/components/devtools/actors/network_event.rs @@ -200,7 +200,7 @@ impl Actor for NetworkEventActor { } let msg = GetRequestHeadersReply { from: self.name(), - headers: headers, + headers, headerSize: headersSize, rawHeaders: rawHeadersString, }; @@ -218,7 +218,7 @@ impl Actor for NetworkEventActor { let msg = GetRequestCookiesReply { from: self.name(), - cookies: cookies, + cookies, }; let _ = stream.write_json_packet(&msg); ActorMessageStatus::Processed @@ -244,13 +244,13 @@ impl Actor for NetworkEventActor { }); headersSize += name.as_str().len() + value.len(); rawHeadersString.push_str(name.as_str()); - rawHeadersString.push_str(":"); + rawHeadersString.push(':'); rawHeadersString.push_str(value.to_str().unwrap()); rawHeadersString.push_str("\r\n"); } let msg = GetResponseHeadersReply { from: self.name(), - headers: headers, + headers, headerSize: headersSize, rawHeaders: rawHeadersString, }; @@ -269,7 +269,7 @@ impl Actor for NetworkEventActor { let msg = GetResponseCookiesReply { from: self.name(), - cookies: cookies, + cookies, }; let _ = stream.write_json_packet(&msg); ActorMessageStatus::Processed @@ -322,7 +322,7 @@ impl Actor for NetworkEventActor { impl NetworkEventActor { pub fn new(name: String) -> NetworkEventActor { NetworkEventActor { - name: name, + name, request: HttpRequest { url: String::new(), method: Method::GET, @@ -378,8 +378,8 @@ impl NetworkEventActor { .as_millis() as i64, ) { LocalResult::None => "".to_owned(), - LocalResult::Single(dateTime) => format!("{}", dateTime.to_rfc3339()), - LocalResult::Ambiguous(dateTime, _) => format!("{}", dateTime.to_rfc3339()), + LocalResult::Single(dateTime) => dateTime.to_rfc3339().to_string(), + LocalResult::Ambiguous(dateTime, _) => dateTime.to_rfc3339().to_string(), }; EventActor { diff --git a/components/devtools/actors/object.rs b/components/devtools/actors/object.rs index 4d08cb3c305..4091596f0b2 100644 --- a/components/devtools/actors/object.rs +++ b/components/devtools/actors/object.rs @@ -31,7 +31,7 @@ impl Actor for ObjectActor { } impl ObjectActor { - pub fn new(registry: &ActorRegistry, uuid: String) -> String { + pub fn register(registry: &ActorRegistry, uuid: String) -> String { if !registry.script_actor_registered(uuid.clone()) { let name = registry.new_name("object"); let actor = ObjectActor { diff --git a/components/devtools/actors/performance.rs b/components/devtools/actors/performance.rs index 5e8bc2b5738..2c60d79e30a 100644 --- a/components/devtools/actors/performance.rs +++ b/components/devtools/actors/performance.rs @@ -98,7 +98,7 @@ impl Actor for PerformanceActor { impl PerformanceActor { pub fn new(name: String) -> PerformanceActor { - PerformanceActor { name: name } + PerformanceActor { name } } pub fn description() -> ActorDescription { diff --git a/components/devtools/actors/profiler.rs b/components/devtools/actors/profiler.rs index 7db5f77a284..38c3d03f8cc 100644 --- a/components/devtools/actors/profiler.rs +++ b/components/devtools/actors/profiler.rs @@ -32,6 +32,6 @@ impl Actor for ProfilerActor { impl ProfilerActor { pub fn new(name: String) -> ProfilerActor { - ProfilerActor { name: name } + ProfilerActor { name } } } diff --git a/components/devtools/actors/root.rs b/components/devtools/actors/root.rs index 384a6022fd8..7cb96b512de 100644 --- a/components/devtools/actors/root.rs +++ b/components/devtools/actors/root.rs @@ -189,7 +189,7 @@ impl Actor for RootActor { .map(|target| { registry .find::<TabDescriptorActor>(target) - .encodable(®istry) + .encodable(registry) }) .collect(), }; @@ -223,7 +223,7 @@ impl Actor for RootActor { let tab = registry.find::<TabDescriptorActor>(&self.tabs[0]); let reply = GetTabReply { from: self.name(), - tab: tab.encodable(®istry), + tab: tab.encodable(registry), }; let _ = stream.write_json_packet(&reply); ActorMessageStatus::Processed diff --git a/components/devtools/actors/stylesheets.rs b/components/devtools/actors/stylesheets.rs index fadb16f1f3c..772d807e4ea 100644 --- a/components/devtools/actors/stylesheets.rs +++ b/components/devtools/actors/stylesheets.rs @@ -50,6 +50,6 @@ impl Actor for StyleSheetsActor { impl StyleSheetsActor { pub fn new(name: String) -> StyleSheetsActor { - StyleSheetsActor { name: name } + StyleSheetsActor { name } } } diff --git a/components/devtools/actors/tab.rs b/components/devtools/actors/tab.rs index 6f31b9b79c0..3e8ac2b4bb9 100644 --- a/components/devtools/actors/tab.rs +++ b/components/devtools/actors/tab.rs @@ -79,7 +79,7 @@ impl TabDescriptorActor { let root = actors.find_mut::<RootActor>("root"); root.tabs.push(name.clone()); TabDescriptorActor { - name: name, + name, browsing_context_actor, } } diff --git a/components/devtools/actors/thread.rs b/components/devtools/actors/thread.rs index 353f429ac54..00cd0839ab2 100644 --- a/components/devtools/actors/thread.rs +++ b/components/devtools/actors/thread.rs @@ -73,7 +73,7 @@ pub struct ThreadActor { impl ThreadActor { pub fn new(name: String) -> ThreadActor { - ThreadActor { name: name } + ThreadActor { name } } } diff --git a/components/devtools/actors/timeline.rs b/components/devtools/actors/timeline.rs index 9a28bdcbefa..7931f083426 100644 --- a/components/devtools/actors/timeline.rs +++ b/components/devtools/actors/timeline.rs @@ -107,7 +107,7 @@ pub struct HighResolutionStamp(f64); impl HighResolutionStamp { pub fn new(start_stamp: PreciseTime, time: PreciseTime) -> HighResolutionStamp { let duration = start_stamp.to(time).as_micros(); - HighResolutionStamp(duration as f64 / 1000 as f64) + HighResolutionStamp(duration as f64 / 1000_f64) } pub fn wrap(time: f64) -> HighResolutionStamp { @@ -132,10 +132,10 @@ impl TimelineActor { let marker_types = vec![TimelineMarkerType::Reflow, TimelineMarkerType::DOMEvent]; TimelineActor { - name: name, - pipeline: pipeline, - marker_types: marker_types, - script_sender: script_sender, + name, + pipeline, + marker_types, + script_sender, is_recording: Arc::new(Mutex::new(false)), stream: RefCell::new(None), @@ -217,7 +217,7 @@ impl Actor for TimelineActor { if let Some(true) = with_ticks.as_bool() { let framerate_actor = Some(FramerateActor::create( registry, - self.pipeline.clone(), + self.pipeline, self.script_sender.clone(), )); *self.framerate_actor.borrow_mut() = framerate_actor; @@ -274,7 +274,7 @@ impl Actor for TimelineActor { "isRecording" => { let msg = IsRecordingReply { from: self.name(), - value: self.is_recording.lock().unwrap().clone(), + value: *self.is_recording.lock().unwrap(), }; let _ = stream.write_json_packet(&msg); @@ -297,9 +297,9 @@ impl Emitter { ) -> Emitter { Emitter { from: name, - stream: stream, - registry: registry, - start_stamp: start_stamp, + stream, + registry, + start_stamp, framerate_actor: framerate_actor_name, memory_actor: memory_actor_name, @@ -320,7 +320,7 @@ impl Emitter { let end_time = PreciseTime::now(); let reply = MarkersEmitterReply { type_: "markers".to_owned(), - markers: markers, + markers, from: self.from.clone(), endTime: HighResolutionStamp::new(self.start_stamp, end_time), }; diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index 5ed2111ee6e..a51b8b7612d 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -10,6 +10,7 @@ #![crate_name = "devtools"] #![crate_type = "rlib"] #![allow(non_snake_case)] +#![allow(clippy::too_many_arguments)] #![deny(unsafe_code)] use std::borrow::ToOwned; @@ -135,7 +136,7 @@ fn run_server( port: u16, embedder: EmbedderProxy, ) { - let bound = TcpListener::bind(&("0.0.0.0", port)).ok().and_then(|l| { + let bound = TcpListener::bind(("0.0.0.0", port)).ok().and_then(|l| { l.local_addr() .map(|addr| addr.port()) .ok() @@ -259,7 +260,7 @@ fn run_server( Some(bc) => bc, None => return, }; - let name = match browsing_contexts.get(&bc) { + let name = match browsing_contexts.get(bc) { Some(name) => name, None => return, }; @@ -299,7 +300,7 @@ fn run_server( name: worker_name.clone(), console: console_name.clone(), thread: thread_name, - id: id, + id, url: page_info.url.clone(), type_: WorkerType::Dedicated, script_chan: script_sender, @@ -324,7 +325,7 @@ fn run_server( page_info, pipeline, script_sender, - &mut *actors, + &mut actors, ); let name = browsing_context_actor.name(); browsing_contexts.insert(browsing_context, name.clone()); @@ -366,7 +367,7 @@ fn run_server( let actors = actors.lock().unwrap(); let console_actor = actors.find::<ConsoleActor>(&console_actor_name); let id = worker_id.map_or(UniqueId::Pipeline(id), UniqueId::Worker); - console_actor.handle_page_error(page_error, id, &*actors); + console_actor.handle_page_error(page_error, id, &actors); } fn handle_console_message( @@ -392,7 +393,7 @@ fn run_server( let actors = actors.lock().unwrap(); let console_actor = actors.find::<ConsoleActor>(&console_actor_name); let id = worker_id.map_or(UniqueId::Pipeline(id), UniqueId::Worker); - console_actor.handle_console_api(console_message, id, &*actors); + console_actor.handle_console_api(console_message, id, &actors); } fn find_console_actor( diff --git a/components/devtools/protocol.rs b/components/devtools/protocol.rs index 8edbce95a8c..5926e27701a 100644 --- a/components/devtools/protocol.rs +++ b/components/devtools/protocol.rs @@ -80,7 +80,7 @@ impl JsonPacketStream for TcpStream { Ok(packet_len) => packet_len, Err(_) => return Err("nonvalid UTF8 in packet length".to_owned()), }; - let packet_len = match u64::from_str_radix(&packet_len_str, 10) { + let packet_len = match packet_len_str.parse::<u64>() { Ok(packet_len) => packet_len, Err(_) => return Err("packet length missing / not parsable".to_owned()), }; |