diff options
author | Matt Brubeck <mbrubeck@limpet.net> | 2018-06-05 16:40:56 -0700 |
---|---|---|
committer | Matt Brubeck <mbrubeck@limpet.net> | 2018-06-06 08:54:51 -0700 |
commit | f6404f0ec2f49535bcf5c21ecddacbcdcb4964f6 (patch) | |
tree | 3f1e1a66bb940b554e893bce2dd8f133c3673b2b /components/layout | |
parent | a07c71889524f947fb39bcb65baf135bd2a04d0d (diff) | |
download | servo-f6404f0ec2f49535bcf5c21ecddacbcdcb4964f6.tar.gz servo-f6404f0ec2f49535bcf5c21ecddacbcdcb4964f6.zip |
Update dependencies to use new_debug_unrechable
Because reem/rust-debug-unreachable#6 makes `debug_unreachable` enable debug checks even in release builds since Rust 1.0.
Diffstat (limited to 'components/layout')
-rw-r--r-- | components/layout/Cargo.toml | 2 | ||||
-rw-r--r-- | components/layout/text.rs | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/components/layout/Cargo.toml b/components/layout/Cargo.toml index 10ff2070d9f..6775ac46bee 100644 --- a/components/layout/Cargo.toml +++ b/components/layout/Cargo.toml @@ -27,7 +27,7 @@ log = "0.4" malloc_size_of = { path = "../malloc_size_of" } msg = {path = "../msg"} net_traits = {path = "../net_traits"} -ordered-float = "0.4" +new-ordered-float = "1.0" parking_lot = "0.5" profile_traits = {path = "../profile_traits"} range = {path = "../range"} diff --git a/components/layout/text.rs b/components/layout/text.rs index d7763a8e570..15fecd3f7d1 100644 --- a/components/layout/text.rs +++ b/components/layout/text.rs @@ -16,7 +16,7 @@ use gfx::text::text_run::TextRun; use gfx::text::util::{self, CompressionMode}; use inline::{InlineFragmentNodeFlags, InlineFragments}; use linked_list::split_off_head; -use ordered_float::NotNaN; +use ordered_float::NotNan; use range::Range; use servo_atoms::Atom; use std::borrow::ToOwned; @@ -183,7 +183,7 @@ impl TextRunScanner { letter_spacing = inherited_text_style.letter_spacing; word_spacing = inherited_text_style.word_spacing.value() .map(|lop| lop.to_hash_key()) - .unwrap_or((Au(0), NotNaN::new(0.0).unwrap())); + .unwrap_or((Au(0), NotNan::new(0.0).unwrap())); text_rendering = inherited_text_style.text_rendering; word_break = inherited_text_style.word_break; } |