aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/inline.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2014-12-18 04:42:50 -0700
committerbors-servo <metajack+bors@gmail.com>2014-12-18 04:42:50 -0700
commiteea49ee1d986c306a8eec32b64be9b10cb2278fc (patch)
tree5c9555bd62fbb7375fab1561cb62660ea1022b7d /components/layout/inline.rs
parentd7b3900431598883212162460254c846bf5f8b52 (diff)
parentbf4480bb791cd918a00fb4bdea234fde676b28e0 (diff)
downloadservo-eea49ee1d986c306a8eec32b64be9b10cb2278fc.tar.gz
servo-eea49ee1d986c306a8eec32b64be9b10cb2278fc.zip
auto merge of #4420 : servo/servo/fix-warnings, r=Ms2ger
Diffstat (limited to 'components/layout/inline.rs')
-rw-r--r--components/layout/inline.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index 70b933dcacf..c3c531fcfdf 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -28,12 +28,11 @@ use gfx::text::glyph::CharIndex;
use servo_util::geometry::Au;
use servo_util::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
use servo_util::opts;
-use servo_util::range::{IntRangeIndex, Range, RangeIndex};
+use servo_util::range::{Range, RangeIndex};
use servo_util::arc_ptr_eq;
use std::cmp::max;
use std::fmt;
use std::mem;
-use std::num;
use std::u16;
use style::computed_values::{text_align, vertical_align, white_space};
use style::ComputedValues;
@@ -211,7 +210,7 @@ impl LineBreaker {
/// Reinitializes the pending line to blank data.
fn reset_line(&mut self) {
- self.pending_line.range.reset(num::zero(), num::zero());
+ self.pending_line.range.reset(FragmentIndex(0), FragmentIndex(0));
self.pending_line.bounds = LogicalRect::new(self.floats.writing_mode,
Au(0),
self.cur_b,
@@ -632,7 +631,7 @@ impl LineBreaker {
if self.pending_line_is_empty() {
assert!(self.new_fragments.len() <= (u16::MAX as uint));
self.pending_line.range.reset(FragmentIndex(self.new_fragments.len() as int),
- num::zero());
+ FragmentIndex(0));
}
self.pending_line.range.extend_by(FragmentIndex(1));
@@ -655,7 +654,7 @@ impl LineBreaker {
/// Returns true if the pending line is empty and false otherwise.
fn pending_line_is_empty(&self) -> bool {
- self.pending_line.range.length() == num::zero()
+ self.pending_line.range.length() == FragmentIndex(0)
}
}