mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
Fix some clippy warnings in components/gfx
and components/script
(#32215)
* clippy: Squish warnings and errors in gfx warning: redundant closure (gfx/font.rs:415:18) warning: useless conversion to the same type (gfx/font.rs:534:9) warning: the following explicit lifetimes could be elided: 'a (gfx/font.rs:619:16) error: this loop never actually loops (gfx/font_cache_thread.rs:112:9) warning: this expression creates a reference which is immediately dereferenced by the compiler (gfx/font_cache_thread.rs:229:51) warning: redundant closure (gfx/font_cache_thread.rs:551:18) 3 instances of: warning: casting integer literal to `f64` is unnecessary (gfx/platform/freetype/font_list.rs:271-273) * clippy: methods called `from_*` usually take no `self` It reports that by standard convention, from_* methods should not take any `&self` parameter * clippy: you should consider adding a `Default` implementation It reports that public types with a pub fn new() -> Self should have a Default implementation since they can be constructed without arguments * clippy: casting to the same type is unnecessary (`f32` -> `f32`) * clippy: use of `unwrap_or_else` to construct default value * clippy: methods called `is_*` usually take `self` by mutable reference or `self` by reference or no `self` * clippy: manual `!RangeInclusive::contains` implementation contains expresses the intent better and has less failure modes (such as fencepost errors or using || instead of &&) * clippy: this function has an empty `#[must_use]` attribute, but returns a type already marked as `#[must_use]` * clippy: Fix some new warnings warning: this `if` statement can be collapsed (gfx/font.rs:468:130) warning: this lifetime isn't used in the impl (gfx/platform/freetype/font.rs:341:6) warning: field assignment outside of initializer for an instance created with Default::default() (compositor.rs:881:17)
This commit is contained in:
parent
ca064eaa51
commit
160c7c0b0f
19 changed files with 56 additions and 47 deletions
|
@ -91,9 +91,9 @@ pub trait WorkerEventLoopMethods {
|
|||
fn task_queue(&self) -> &TaskQueue<Self::WorkerMsg>;
|
||||
fn handle_event(&self, event: Self::Event) -> bool;
|
||||
fn handle_worker_post_event(&self, worker: &TrustedWorkerAddress) -> Option<AutoWorkerReset>;
|
||||
fn from_control_msg(&self, msg: Self::ControlMsg) -> Self::Event;
|
||||
fn from_worker_msg(&self, msg: Self::WorkerMsg) -> Self::Event;
|
||||
fn from_devtools_msg(&self, msg: DevtoolScriptControlMsg) -> Self::Event;
|
||||
fn from_control_msg(msg: Self::ControlMsg) -> Self::Event;
|
||||
fn from_worker_msg(msg: Self::WorkerMsg) -> Self::Event;
|
||||
fn from_devtools_msg(msg: DevtoolScriptControlMsg) -> Self::Event;
|
||||
fn control_receiver(&self) -> &Receiver<Self::ControlMsg>;
|
||||
}
|
||||
|
||||
|
@ -114,13 +114,13 @@ pub fn run_worker_event_loop<T, WorkerMsg, Event>(
|
|||
.map(|_| scope.from_devtools_receiver());
|
||||
let task_queue = worker_scope.task_queue();
|
||||
let event = select! {
|
||||
recv(worker_scope.control_receiver()) -> msg => worker_scope.from_control_msg(msg.unwrap()),
|
||||
recv(worker_scope.control_receiver()) -> msg => T::from_control_msg(msg.unwrap()),
|
||||
recv(task_queue.select()) -> msg => {
|
||||
task_queue.take_tasks(msg.unwrap());
|
||||
worker_scope.from_worker_msg(task_queue.recv().unwrap())
|
||||
T::from_worker_msg(task_queue.recv().unwrap())
|
||||
},
|
||||
recv(devtools_port.unwrap_or(&crossbeam_channel::never())) -> msg =>
|
||||
worker_scope.from_devtools_msg(msg.unwrap()),
|
||||
T::from_devtools_msg(msg.unwrap()),
|
||||
};
|
||||
let mut sequential = vec![];
|
||||
sequential.push(event);
|
||||
|
@ -136,9 +136,9 @@ pub fn run_worker_event_loop<T, WorkerMsg, Event>(
|
|||
Err(_) => match devtools_port.map(|port| port.try_recv()) {
|
||||
None => {},
|
||||
Some(Err(_)) => break,
|
||||
Some(Ok(ev)) => sequential.push(worker_scope.from_devtools_msg(ev)),
|
||||
Some(Ok(ev)) => sequential.push(T::from_devtools_msg(ev)),
|
||||
},
|
||||
Ok(ev) => sequential.push(worker_scope.from_worker_msg(ev)),
|
||||
Ok(ev) => sequential.push(T::from_worker_msg(ev)),
|
||||
}
|
||||
}
|
||||
// Step 3
|
||||
|
|
|
@ -195,3 +195,9 @@ where
|
|||
rval.set(ObjectValue(js_object.handle().get()));
|
||||
}
|
||||
}
|
||||
|
||||
impl<K: RecordKey, V> Default for Record<K, V> {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -98,6 +98,12 @@ impl BluetoothExtraPermissionData {
|
|||
}
|
||||
}
|
||||
|
||||
impl Default for BluetoothExtraPermissionData {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
||||
struct BluetoothContext<T: AsyncBluetoothListener + DomObject> {
|
||||
promise: Option<TrustedPromise>,
|
||||
receiver: Trusted<T>,
|
||||
|
|
|
@ -219,15 +219,15 @@ impl WorkerEventLoopMethods for DedicatedWorkerGlobalScope {
|
|||
Some(ar)
|
||||
}
|
||||
|
||||
fn from_control_msg(&self, msg: DedicatedWorkerControlMsg) -> MixedMessage {
|
||||
fn from_control_msg(msg: DedicatedWorkerControlMsg) -> MixedMessage {
|
||||
MixedMessage::Control(msg)
|
||||
}
|
||||
|
||||
fn from_worker_msg(&self, msg: DedicatedWorkerScriptMsg) -> MixedMessage {
|
||||
fn from_worker_msg(msg: DedicatedWorkerScriptMsg) -> MixedMessage {
|
||||
MixedMessage::Worker(msg)
|
||||
}
|
||||
|
||||
fn from_devtools_msg(&self, msg: DevtoolScriptControlMsg) -> MixedMessage {
|
||||
fn from_devtools_msg(msg: DevtoolScriptControlMsg) -> MixedMessage {
|
||||
MixedMessage::Devtools(msg)
|
||||
}
|
||||
|
||||
|
|
|
@ -994,8 +994,8 @@ impl Document {
|
|||
// (like Acid2).
|
||||
let device_pixel_ratio = self.window.device_pixel_ratio().get();
|
||||
(
|
||||
rect.origin.x.to_nearest_pixel(device_pixel_ratio) as f32,
|
||||
rect.origin.y.to_nearest_pixel(device_pixel_ratio) as f32,
|
||||
rect.origin.x.to_nearest_pixel(device_pixel_ratio),
|
||||
rect.origin.y.to_nearest_pixel(device_pixel_ratio),
|
||||
)
|
||||
})
|
||||
.or_else(|| {
|
||||
|
|
|
@ -238,7 +238,7 @@ impl ElementInternalsMethods for ElementInternals {
|
|||
if bits.is_empty() {
|
||||
self.set_validation_message(DOMString::new());
|
||||
} else {
|
||||
self.set_validation_message(message.unwrap_or_else(DOMString::new));
|
||||
self.set_validation_message(message.unwrap_or_default());
|
||||
}
|
||||
|
||||
// Step 6: If element's customError validity flag is true, then set element's custom validity error
|
||||
|
|
|
@ -218,3 +218,9 @@ impl Identities {
|
|||
self.select(id.backend()).render_bundles.free(id);
|
||||
}
|
||||
}
|
||||
|
||||
impl Default for Identities {
|
||||
fn default() -> Self {
|
||||
Self::new()
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1325,7 +1325,7 @@ pub trait LayoutNodeHelpers<'dom> {
|
|||
fn owner_doc_for_layout(self) -> LayoutDom<'dom, Document>;
|
||||
fn containing_shadow_root_for_layout(self) -> Option<LayoutDom<'dom, ShadowRoot>>;
|
||||
|
||||
fn is_element_for_layout(self) -> bool;
|
||||
fn is_element_for_layout(&self) -> bool;
|
||||
unsafe fn get_flag(self, flag: NodeFlags) -> bool;
|
||||
unsafe fn set_flag(self, flag: NodeFlags, value: bool);
|
||||
|
||||
|
@ -1387,8 +1387,8 @@ impl<'dom> LayoutNodeHelpers<'dom> for LayoutDom<'dom, Node> {
|
|||
}
|
||||
|
||||
#[inline]
|
||||
fn is_element_for_layout(self) -> bool {
|
||||
self.is::<Element>()
|
||||
fn is_element_for_layout(&self) -> bool {
|
||||
(*self).is::<Element>()
|
||||
}
|
||||
|
||||
#[inline]
|
||||
|
|
|
@ -81,8 +81,7 @@ impl OfflineAudioContext {
|
|||
if channel_count > MAX_CHANNEL_COUNT ||
|
||||
channel_count == 0 ||
|
||||
length == 0 ||
|
||||
sample_rate < MIN_SAMPLE_RATE ||
|
||||
sample_rate > MAX_SAMPLE_RATE
|
||||
!(MIN_SAMPLE_RATE..=MAX_SAMPLE_RATE).contains(&sample_rate)
|
||||
{
|
||||
return Err(Error::NotSupported);
|
||||
}
|
||||
|
|
|
@ -201,15 +201,15 @@ impl WorkerEventLoopMethods for ServiceWorkerGlobalScope {
|
|||
None
|
||||
}
|
||||
|
||||
fn from_control_msg(&self, msg: ServiceWorkerControlMsg) -> MixedMessage {
|
||||
fn from_control_msg(msg: ServiceWorkerControlMsg) -> MixedMessage {
|
||||
MixedMessage::Control(msg)
|
||||
}
|
||||
|
||||
fn from_worker_msg(&self, msg: ServiceWorkerScriptMsg) -> MixedMessage {
|
||||
fn from_worker_msg(msg: ServiceWorkerScriptMsg) -> MixedMessage {
|
||||
MixedMessage::ServiceWorker(msg)
|
||||
}
|
||||
|
||||
fn from_devtools_msg(&self, msg: DevtoolScriptControlMsg) -> MixedMessage {
|
||||
fn from_devtools_msg(msg: DevtoolScriptControlMsg) -> MixedMessage {
|
||||
MixedMessage::Devtools(msg)
|
||||
}
|
||||
|
||||
|
|
|
@ -283,7 +283,6 @@ impl Tokenizer {
|
|||
tokenizer
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
pub fn feed(&mut self, input: &mut BufferQueue) -> TokenizerResult<DomRoot<HTMLScriptElement>> {
|
||||
let mut send_tendrils = VecDeque::new();
|
||||
while let Some(str) = input.pop_front() {
|
||||
|
|
|
@ -78,7 +78,6 @@ impl Tokenizer {
|
|||
Tokenizer { inner }
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
pub fn feed(&mut self, input: &mut BufferQueue) -> TokenizerResult<DomRoot<HTMLScriptElement>> {
|
||||
match self.inner.feed(input) {
|
||||
TokenizerResult::Done => TokenizerResult::Done,
|
||||
|
|
|
@ -698,7 +698,6 @@ enum Tokenizer {
|
|||
}
|
||||
|
||||
impl Tokenizer {
|
||||
#[must_use]
|
||||
fn feed(&mut self, input: &mut BufferQueue) -> TokenizerResult<DomRoot<HTMLScriptElement>> {
|
||||
match *self {
|
||||
Tokenizer::Html(ref mut tokenizer) => tokenizer.feed(input),
|
||||
|
|
|
@ -41,7 +41,6 @@ impl Tokenizer {
|
|||
Tokenizer { inner: tok }
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
pub fn feed(&mut self, input: &mut BufferQueue) -> TokenizerResult<DomRoot<HTMLScriptElement>> {
|
||||
self.inner.run(input);
|
||||
match self.inner.sink.sink.script.take() {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue