diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-06-23 16:01:02 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-23 16:01:02 -0700 |
commit | bb9391ba2cacc2976d546c42cb339fa3e7cbf35c (patch) | |
tree | 85e441b27acb8795cf40241647736cf3f99d0c51 /components/layout/lib.rs | |
parent | e2a26e7bd0d8089a441bc3072cf15351b0ef1252 (diff) | |
parent | 096cee8ebc42d182376816a3947fa6dad6d0ba9a (diff) | |
download | servo-bb9391ba2cacc2976d546c42cb339fa3e7cbf35c.tar.gz servo-bb9391ba2cacc2976d546c42cb339fa3e7cbf35c.zip |
Auto merge of #17493 - froydnj:rust-117-fixes, r=jdm
remove various things now that Rust 1.17 is required
std::ptr::eq and Arc::ptr_eq are now usuable, and we can replace a
panic!() with abort().
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes do not require tests because they are trivial replacements.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17493)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/lib.rs')
-rw-r--r-- | components/layout/lib.rs | 8 |
1 files changed, 0 insertions, 8 deletions
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; |