mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
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().
This commit is contained in:
parent
567f5e8985
commit
096cee8ebc
6 changed files with 7 additions and 26 deletions
|
@ -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() {
|
||||
|
|
|
@ -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)
|
||||
}
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue