diff options
| -rw-r--r-- | components/layout/model.rs | 2 | ||||
| -rw-r--r-- | components/layout/query.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/cssrulelist.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/performanceobserver.rs | 2 | ||||
| -rw-r--r-- | components/script/dom/screen.rs | 4 | ||||
| -rw-r--r-- | ports/cef/eutil.rs | 2 | ||||
| -rw-r--r-- | ports/cef/wrappers.rs | 2 | ||||
| -rw-r--r-- | ports/geckolib/glue.rs | 2 |
8 files changed, 9 insertions, 9 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()) } } diff --git a/ports/cef/eutil.rs b/ports/cef/eutil.rs index 03d98d31e1c..06591618332 100644 --- a/ports/cef/eutil.rs +++ b/ports/cef/eutil.rs @@ -30,7 +30,7 @@ pub fn slice_to_str<F>(s: *const u8, l: usize, f: F) -> c_int where F: FnOnce(&s /// All fields are initialized to zero. It is the caller's responsibility to ensure that the given /// type is a CEF type with `cef_base_t` as its first member. pub unsafe fn create_cef_object<Base,Extra>(size: size_t) -> *mut Base { - let object = libc::calloc(1, (mem::size_of::<Base>() + mem::size_of::<Extra>())) as + let object = libc::calloc(1, mem::size_of::<Base>() + mem::size_of::<Extra>()) as *mut cef_base_t; (*object).size = size; (*object).add_ref = Some(servo_add_ref as extern "C" fn(*mut cef_base_t) -> c_int); diff --git a/ports/cef/wrappers.rs b/ports/cef/wrappers.rs index 16beca788f9..707ad0e2355 100644 --- a/ports/cef/wrappers.rs +++ b/ports/cef/wrappers.rs @@ -199,7 +199,7 @@ cef_unimplemented_wrapper!(cef_string_t, String); impl<'a> CefWrap<*const cef_string_t> for &'a [u16] { fn to_c(buffer: &'a [u16]) -> *const cef_string_t { unsafe { - let ptr = libc::malloc(((buffer.len() + 1) * 2)) as *mut c_ushort; + let ptr = libc::malloc((buffer.len() + 1) * 2) as *mut c_ushort; ptr::copy(buffer.as_ptr(), ptr, buffer.len()); *ptr.offset(buffer.len() as isize) = 0; diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index 2ee79abc56c..f155903ac5e 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -4396,7 +4396,7 @@ pub extern "C" fn Servo_GetCustomPropertyValue( None => return false, }; - let name = unsafe { Atom::from((&*name)) }; + let name = unsafe { Atom::from(&*name) }; let computed_value = match custom_properties.get(&name) { Some(v) => v, None => return false, |