aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorSimon Sapin <simon.sapin@exyr.org>2018-01-21 09:02:56 +0100
committerSimon Sapin <simon.sapin@exyr.org>2018-01-22 17:41:25 +0100
commit897a5b39c5d843cf0920870e8b4a01a84df236fc (patch)
tree4f39557f571e62e8b0d36db73302862dc89c88f8 /components
parent6e3fba97bd7f26cb387ed571286525402694c477 (diff)
downloadservo-897a5b39c5d843cf0920870e8b4a01a84df236fc.tar.gz
servo-897a5b39c5d843cf0920870e8b4a01a84df236fc.zip
Fix some "unnecessary parentheses" warnings
Diffstat (limited to 'components')
-rw-r--r--components/layout/model.rs2
-rw-r--r--components/layout/query.rs2
-rw-r--r--components/script/dom/cssrulelist.rs2
-rw-r--r--components/script/dom/performanceobserver.rs2
-rw-r--r--components/script/dom/screen.rs4
5 files changed, 6 insertions, 6 deletions
diff --git a/components/layout/model.rs b/components/layout/model.rs
index d5b85a7424e..5d5238ece77 100644
--- a/components/layout/model.rs
+++ b/components/layout/model.rs
@@ -548,7 +548,7 @@ impl SizeConstraint {
max_size = max_size.map(|x| max(x, min_size));
if let Some(border) = border {
- min_size = max((min_size - border), Au(0));
+ min_size = max(min_size - border, Au(0));
max_size = max_size.map(|x| max(x - border, Au(0)));
}
diff --git a/components/layout/query.rs b/components/layout/query.rs
index 36e4a9b04d3..eac23f563ac 100644
--- a/components/layout/query.rs
+++ b/components/layout/query.rs
@@ -868,7 +868,7 @@ pub fn process_node_overflow_request<N: LayoutNode>(requested_node: N) -> NodeOv
let style = &*layout_node.as_element().unwrap().resolved_style();
let style_box = style.get_box();
- NodeOverflowResponse(Some((Point2D::new(style_box.overflow_x, style_box.overflow_y))))
+ NodeOverflowResponse(Some(Point2D::new(style_box.overflow_x, style_box.overflow_y)))
}
pub fn process_margin_style_query<N: LayoutNode>(requested_node: N)
diff --git a/components/script/dom/cssrulelist.rs b/components/script/dom/cssrulelist.rs
index 1f800a6a0b4..baa685d5a72 100644
--- a/components/script/dom/cssrulelist.rs
+++ b/components/script/dom/cssrulelist.rs
@@ -103,7 +103,7 @@ impl CSSRuleList {
let parent_stylesheet = &*self.parent_stylesheet;
let dom_rule = CSSRule::new_specific(&window, parent_stylesheet, new_rule);
self.dom_rules.borrow_mut().insert(index, MutNullableDom::new(Some(&*dom_rule)));
- Ok((idx))
+ Ok(idx)
}
// In case of a keyframe rule, index must be valid.
diff --git a/components/script/dom/performanceobserver.rs b/components/script/dom/performanceobserver.rs
index 96ad99edf92..af43fe76246 100644
--- a/components/script/dom/performanceobserver.rs
+++ b/components/script/dom/performanceobserver.rs
@@ -106,7 +106,7 @@ impl PerformanceObserverMethods for PerformanceObserver {
// step 2
// There must be at least one valid entry type.
if entry_types.is_empty() {
- return Err((Error::Type("entryTypes cannot be empty".to_string())));
+ return Err(Error::Type("entryTypes cannot be empty".to_string()));
}
// step 3-4-5
diff --git a/components/script/dom/screen.rs b/components/script/dom/screen.rs
index bec082e9729..3cd54034994 100644
--- a/components/script/dom/screen.rs
+++ b/components/script/dom/screen.rs
@@ -39,14 +39,14 @@ impl Screen {
let (send, recv) = ipc::channel::<(Size2D<u32>)>().unwrap();
self.window.upcast::<GlobalScope>()
.script_to_constellation_chan().send(ScriptMsg::GetScreenSize(send)).unwrap();
- recv.recv().unwrap_or((Size2D::zero()))
+ recv.recv().unwrap_or(Size2D::zero())
}
fn screen_avail_size(&self) -> Size2D<u32> {
let (send, recv) = ipc::channel::<(Size2D<u32>)>().unwrap();
self.window.upcast::<GlobalScope>()
.script_to_constellation_chan().send(ScriptMsg::GetScreenAvailSize(send)).unwrap();
- recv.recv().unwrap_or((Size2D::zero()))
+ recv.recv().unwrap_or(Size2D::zero())
}
}