aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/model.rs
diff options
context:
space:
mode:
authorKeegan McAllister <mcallister.keegan@gmail.com>2014-09-20 15:35:08 -0700
committerKeegan McAllister <mcallister.keegan@gmail.com>2014-09-20 15:35:08 -0700
commit045328c8e94f5bdfcd67105c5dfa9209f4cd501c (patch)
tree1d5f8d958e12ae59e0ac720a7873e3c3b08cb1e8 /components/layout/model.rs
parentd6ba37c68c34a3748a789caeca225083275757e5 (diff)
parenta40b94d7f946d75e1a66af206efda9879b89c707 (diff)
downloadservo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.tar.gz
servo-045328c8e94f5bdfcd67105c5dfa9209f4cd501c.zip
Merge pull request #3438 from servo/rustup
Upgrade Rust
Diffstat (limited to 'components/layout/model.rs')
-rw-r--r--components/layout/model.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/components/layout/model.rs b/components/layout/model.rs
index 1642f0e7ee1..34cb231ba51 100644
--- a/components/layout/model.rs
+++ b/components/layout/model.rs
@@ -8,7 +8,7 @@
use fragment::Fragment;
-use computed = style::computed_values;
+use style::computed_values as computed;
use geom::SideOffsets2D;
use style::computed_values::{LPA_Auto, LPA_Length, LPA_Percentage, LP_Length, LP_Percentage};
use style::ComputedValues;