mirror of
https://github.com/servo/servo.git
synced 2025-08-03 12:40:06 +01:00
clippy: Fix last few warnings (#32270)
* Fix clippy in components/script warning: writing `&mut Vec` instead of `&mut [_]` involves a new object where a slice will do (components/script/dom/htmlformelement.rs:896:20) warning: `Box::new(_)` of default value (components/script/dom/paintworkletglobalscope.rs:291:29) warning: this creates an owned instance just for comparison (components/script/dom/radionodelist.rs:105:50) * Fix clippy in layout_thread (2013 and 2020) warning: this `if` statement can be collapsed (components/layout_thread/lib.rs:876:17) warning: the following explicit lifetimes could be elided: 'a (components/layout_thread/lib.rs:239 and 2020 same line) warning: deref which would be done by auto-deref (components/layout_thread/lib.rs:500 and 1289) warning: dereferencing a tuple pattern where every element takes a reference (components/layout_thread/lib.rs:503,1562 and 2020 line 1153) warning: useless conversion to the same type: `style::invalidation::element::restyle_hints::RestyleHint` (components/layout_thread_2020/lib.rs:742:36) * Fix clippy in components/servo warning: constants have by default a `'static` lifetime (components/servo/lib.rs:1238:31) warning: creating a `let` binding to a value of unit type, which usually can't be used afterwards (5 occurances in components/servo/lib.rs) * FIx clippy in ports/servoshell warning: this expression creates a reference which is immediately dereferenced by the compiler (ports/servoshell/app.rs:251:89) warning: using `clone` on type `Option<TopLevelBrowsingContextId>` which implements the `Copy` trait (ports/servoshell/webview.rs:122:9)
This commit is contained in:
parent
1f6d358cf9
commit
3d4fd0e550
8 changed files with 49 additions and 55 deletions
|
@ -260,7 +260,7 @@ impl Layout for LayoutThread {
|
|||
self.handle_request(Request::FromFontCache);
|
||||
}
|
||||
|
||||
fn device<'a>(&'a self) -> &'a Device {
|
||||
fn device(&self) -> &Device {
|
||||
self.stylist.device()
|
||||
}
|
||||
|
||||
|
@ -497,10 +497,10 @@ impl Layout for LayoutThread {
|
|||
let properties = properties
|
||||
.drain(..)
|
||||
.filter_map(|name| {
|
||||
let id = PropertyId::parse_enabled_for_all_content(&*name).ok()?;
|
||||
let id = PropertyId::parse_enabled_for_all_content(&name).ok()?;
|
||||
Some((name.clone(), id))
|
||||
})
|
||||
.filter(|&(_, ref id)| !id.is_shorthand())
|
||||
.filter(|(_, id)| !id.is_shorthand())
|
||||
.collect();
|
||||
let registered_painter = RegisteredPainterImpl {
|
||||
name: name.clone(),
|
||||
|
@ -873,40 +873,39 @@ impl LayoutThread {
|
|||
let traversal = ComputeStackingRelativePositions { layout_context };
|
||||
traversal.traverse(layout_root);
|
||||
|
||||
if layout_root
|
||||
if (layout_root
|
||||
.base()
|
||||
.restyle_damage
|
||||
.contains(ServoRestyleDamage::REPAINT) ||
|
||||
self.display_list.borrow().is_none()
|
||||
self.display_list.borrow().is_none()) &&
|
||||
reflow_goal.needs_display_list()
|
||||
{
|
||||
if reflow_goal.needs_display_list() {
|
||||
let background_color = get_root_flow_background_color(layout_root);
|
||||
let mut build_state = sequential::build_display_list_for_subtree(
|
||||
layout_root,
|
||||
layout_context,
|
||||
background_color,
|
||||
data.page_clip_rect.size,
|
||||
);
|
||||
let background_color = get_root_flow_background_color(layout_root);
|
||||
let mut build_state = sequential::build_display_list_for_subtree(
|
||||
layout_root,
|
||||
layout_context,
|
||||
background_color,
|
||||
data.page_clip_rect.size,
|
||||
);
|
||||
|
||||
debug!("Done building display list.");
|
||||
debug!("Done building display list.");
|
||||
|
||||
let root_size = {
|
||||
let root_flow = layout_root.base();
|
||||
root_flow.overflow.scroll.size
|
||||
};
|
||||
let root_size = {
|
||||
let root_flow = layout_root.base();
|
||||
root_flow.overflow.scroll.size
|
||||
};
|
||||
|
||||
let origin = Rect::new(Point2D::new(Au(0), Au(0)), root_size).to_layout();
|
||||
build_state.root_stacking_context.bounds = origin;
|
||||
build_state.root_stacking_context.overflow = origin;
|
||||
let origin = Rect::new(Point2D::new(Au(0), Au(0)), root_size).to_layout();
|
||||
build_state.root_stacking_context.bounds = origin;
|
||||
build_state.root_stacking_context.overflow = origin;
|
||||
|
||||
// We will not use build_state.iframe_sizes again, so it's safe to move it.
|
||||
let iframe_sizes = std::mem::take(&mut build_state.iframe_sizes);
|
||||
self.update_iframe_sizes(iframe_sizes);
|
||||
// We will not use build_state.iframe_sizes again, so it's safe to move it.
|
||||
let iframe_sizes = std::mem::take(&mut build_state.iframe_sizes);
|
||||
self.update_iframe_sizes(iframe_sizes);
|
||||
|
||||
*self.indexable_text.borrow_mut() =
|
||||
std::mem::take(&mut build_state.indexable_text);
|
||||
*self.display_list.borrow_mut() = Some(build_state.to_display_list());
|
||||
}
|
||||
*self.indexable_text.borrow_mut() =
|
||||
std::mem::take(&mut build_state.indexable_text);
|
||||
*self.display_list.borrow_mut() = Some(build_state.to_display_list());
|
||||
}
|
||||
|
||||
if !reflow_goal.needs_display() {
|
||||
|
@ -1286,7 +1285,7 @@ impl LayoutThread {
|
|||
thread_pool: Option<&rayon::ThreadPool>,
|
||||
) {
|
||||
Self::cancel_animations_for_nodes_not_in_flow_tree(
|
||||
&mut *(context.style_context.animations.sets.write()),
|
||||
&mut (context.style_context.animations.sets.write()),
|
||||
FlowRef::deref_mut(root_flow),
|
||||
);
|
||||
|
||||
|
@ -1559,7 +1558,7 @@ fn get_ua_stylesheets() -> Result<UserAgentStylesheets, &'static str> {
|
|||
)?,
|
||||
];
|
||||
|
||||
for &(ref contents, ref url) in &opts::get().user_stylesheets {
|
||||
for (contents, url) in &opts::get().user_stylesheets {
|
||||
user_or_user_agent_stylesheets.push(DocumentStyleSheet(ServoArc::new(
|
||||
Stylesheet::from_bytes(
|
||||
contents,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue