Skip to content

Commit f6404f0

Browse files
committed
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.
1 parent a07c718 commit f6404f0

File tree

7 files changed

+69
-89
lines changed

7 files changed

+69
-89
lines changed

Cargo.lock

+56-76
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

components/gfx/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ libc = "0.2"
2929
log = "0.4"
3030
malloc_size_of = { path = "../malloc_size_of" }
3131
net_traits = {path = "../net_traits"}
32-
ordered-float = "0.4"
32+
new-ordered-float = "1.0"
3333
range = {path = "../range"}
3434
serde = "1.0"
3535
servo_arc = {path = "../servo_arc"}

components/gfx/font.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use app_units::Au;
66
use euclid::{Point2D, Rect, Size2D};
77
use font_context::{FontContext, FontSource};
88
use font_template::FontTemplateDescriptor;
9-
use ordered_float::NotNaN;
9+
use ordered_float::NotNan;
1010
use platform::font::{FontHandle, FontTable};
1111
use platform::font_context::FontContextHandle;
1212
pub use platform::font_list::fallback_font_families;
@@ -195,7 +195,7 @@ pub struct ShapingOptions {
195195
/// NB: You will probably want to set the `IGNORE_LIGATURES_SHAPING_FLAG` if this is non-null.
196196
pub letter_spacing: Option<Au>,
197197
/// Spacing to add between each word. Corresponds to the CSS 2.1 `word-spacing` property.
198-
pub word_spacing: (Au, NotNaN<f32>),
198+
pub word_spacing: (Au, NotNan<f32>),
199199
/// The Unicode script property of the characters in this run.
200200
pub script: Script,
201201
/// Various flags.

components/layout/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ log = "0.4"
2727
malloc_size_of = { path = "../malloc_size_of" }
2828
msg = {path = "../msg"}
2929
net_traits = {path = "../net_traits"}
30-
ordered-float = "0.4"
30+
new-ordered-float = "1.0"
3131
parking_lot = "0.5"
3232
profile_traits = {path = "../profile_traits"}
3333
range = {path = "../range"}

components/layout/text.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use gfx::text::text_run::TextRun;
1616
use gfx::text::util::{self, CompressionMode};
1717
use inline::{InlineFragmentNodeFlags, InlineFragments};
1818
use linked_list::split_off_head;
19-
use ordered_float::NotNaN;
19+
use ordered_float::NotNan;
2020
use range::Range;
2121
use servo_atoms::Atom;
2222
use std::borrow::ToOwned;
@@ -183,7 +183,7 @@ impl TextRunScanner {
183183
letter_spacing = inherited_text_style.letter_spacing;
184184
word_spacing = inherited_text_style.word_spacing.value()
185185
.map(|lop| lop.to_hash_key())
186-
.unwrap_or((Au(0), NotNaN::new(0.0).unwrap()));
186+
.unwrap_or((Au(0), NotNan::new(0.0).unwrap()));
187187
text_rendering = inherited_text_style.text_rendering;
188188
word_break = inherited_text_style.word_break;
189189
}

components/style/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ bitflags = "1.0"
3232
byteorder = "1.0"
3333
cfg-if = "0.1.0"
3434
cssparser = "0.23.0"
35-
debug_unreachable = "0.1.1"
35+
new_debug_unreachable = "1.0"
3636
encoding_rs = {version = "0.7", optional = true}
3737
euclid = "0.17"
3838
fallible = { path = "../fallible" }
@@ -49,7 +49,7 @@ matches = "0.1"
4949
num_cpus = {version = "1.1.0", optional = true}
5050
num-integer = "0.1.32"
5151
num-traits = "0.1.32"
52-
ordered-float = "0.4"
52+
new-ordered-float = "1.0"
5353
owning_ref = "0.3.3"
5454
parking_lot = "0.5"
5555
precomputed-hash = "0.1.1"

components/style/values/computed/length.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
77
use app_units::Au;
88
use logical_geometry::WritingMode;
9-
use ordered_float::NotNaN;
9+
use ordered_float::NotNan;
1010
use properties::LonghandId;
1111
use std::fmt::{self, Write};
1212
use std::ops::{Add, Neg};
@@ -391,14 +391,14 @@ impl LengthOrPercentage {
391391
// CSSFloat doesn't implement Hash, so does CSSPixelLength. Therefore, we still use Au as the
392392
// hash key.
393393
#[allow(missing_docs)]
394-
pub fn to_hash_key(&self) -> (Au, NotNaN<f32>) {
394+
pub fn to_hash_key(&self) -> (Au, NotNan<f32>) {
395395
use self::LengthOrPercentage::*;
396396
match *self {
397-
Length(l) => (Au::from(l), NotNaN::new(0.0).unwrap()),
398-
Percentage(p) => (Au(0), NotNaN::new(p.0).unwrap()),
397+
Length(l) => (Au::from(l), NotNan::new(0.0).unwrap()),
398+
Percentage(p) => (Au(0), NotNan::new(p.0).unwrap()),
399399
Calc(c) => (
400400
Au::from(c.unclamped_length()),
401-
NotNaN::new(c.percentage()).unwrap(),
401+
NotNan::new(c.percentage()).unwrap(),
402402
),
403403
}
404404
}

0 commit comments

Comments
 (0)