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/inline.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/inline.rs')
| -rw-r--r-- | components/layout/inline.rs | 2 |
1 files changed, 1 insertions, 1 deletions
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) } |