diff options
Diffstat (limited to 'components/layout')
| -rw-r--r-- | components/layout/fragment.rs | 2 | ||||
| -rw-r--r-- | components/layout/inline.rs | 2 | ||||
| -rw-r--r-- | components/layout/lib.rs | 8 |
3 files changed, 2 insertions, 10 deletions
diff --git a/components/layout/fragment.rs b/components/layout/fragment.rs index 40293bb3780..416a1502598 100644 --- a/components/layout/fragment.rs +++ b/components/layout/fragment.rs @@ -1854,7 +1854,7 @@ impl Fragment { match (&mut self.specific, &next_fragment.specific) { (&mut SpecificFragmentInfo::ScannedText(ref mut this_info), &SpecificFragmentInfo::ScannedText(ref other_info)) => { - debug_assert!(::arc_ptr_eq(&this_info.run, &other_info.run)); + debug_assert!(Arc::ptr_eq(&this_info.run, &other_info.run)); this_info.range_end_including_stripped_whitespace = other_info.range_end_including_stripped_whitespace; if other_info.requires_line_break_afterward_if_wrapping_on_newlines() { diff --git a/components/layout/inline.rs b/components/layout/inline.rs index 6e76cac5ddd..1ce18b562bb 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -401,7 +401,7 @@ impl LineBreaker { result.border_padding.inline_end == Au(0) && candidate.border_padding.inline_start == Au(0) && result_info.selected() == candidate_info.selected() && - ::arc_ptr_eq(&result_info.run, &candidate_info.run) && + Arc::ptr_eq(&result_info.run, &candidate_info.run) && inline_contexts_are_equal(&result.inline_context, &candidate.inline_context) } diff --git a/components/layout/lib.rs b/components/layout/lib.rs index de8f4755eeb..0b961550974 100644 --- a/components/layout/lib.rs +++ b/components/layout/lib.rs @@ -92,14 +92,6 @@ pub use fragment::Fragment; pub use fragment::SpecificFragmentInfo; pub use self::data::LayoutData; -/// Returns whether the two arguments point to the same value. -/// -/// FIXME: Remove this and use Arc::ptr_eq once we require Rust 1.17 -#[inline] -pub fn arc_ptr_eq<T: 'static>(a: &::std::sync::Arc<T>, b: &::std::sync::Arc<T>) -> bool { - ::style::ptr_eq::<T>(&**a, &**b) -} - // We can't use stylearc for everything in layout, because the Flow stuff uses // weak references. use style::stylearc::Arc as StyleArc; |