Upgrade rustc to d3c49d2140fc65e8bb7d7cf25bfe74dda6ce5ecf/rustc-1.0.0…

…-dev.

cargo-nightly-build

@@ -1 +1 @@
-2015-02-07
+2015-03-11

components/canvas/lib.rs

@@ -5,8 +5,6 @@
 #![feature(core)]
 #![feature(collections)]
 
-#![allow(missing_copy_implementations)]
-
 extern crate azure;
 extern crate cssparser;
 extern crate geom;

components/compositing/compositor.rs

@@ -208,8 +208,8 @@ impl<Window: WindowMethods> IOCompositor<Window> {
             composition_request: CompositionRequest::NoCompositingNecessary,
             pending_scroll_events: Vec::new(),
             shutdown_state: ShutdownState::NotShuttingDown,
-            page_zoom: ScaleFactor(1.0),
-            viewport_zoom: ScaleFactor(1.0),
+            page_zoom: ScaleFactor::new(1.0),
+            viewport_zoom: ScaleFactor::new(1.0),
             zoom_action: false,
             zoom_time: 0f64,
             got_load_complete_message: false,
@@ -893,7 +893,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
         match opts::get().device_pixels_per_px {
             Some(device_pixels_per_px) => device_pixels_per_px,
             None => match opts::get().output_file {
-                Some(_) => ScaleFactor(1.0),
+                Some(_) => ScaleFactor::new(1.0),
                 None => self.hidpi_factor
             }
         }
@@ -905,15 +905,15 @@ impl<Window: WindowMethods> IOCompositor<Window> {
 
     fn update_zoom_transform(&mut self) {
         let scale = self.device_pixels_per_page_px();
-        self.scene.scale = ScaleFactor(scale.get());
+        self.scene.scale = ScaleFactor::new(scale.get());
 
         // We need to set the size of the root layer again, since the window size
         // has changed in unscaled layer pixels.
         self.scene.set_root_layer_size(self.window_size.as_f32());
     }
 
     fn on_zoom_window_event(&mut self, magnification: f32) {
-        self.page_zoom = ScaleFactor((self.page_zoom.get() * magnification).max(1.0));
+        self.page_zoom = ScaleFactor::new((self.page_zoom.get() * magnification).max(1.0));
         self.update_zoom_transform();
         self.send_window_size();
     }
@@ -924,7 +924,7 @@ impl<Window: WindowMethods> IOCompositor<Window> {
         self.zoom_time = precise_time_s();
         let old_viewport_zoom = self.viewport_zoom;
 
-        self.viewport_zoom = ScaleFactor((self.viewport_zoom.get() * magnification).max(1.0));
+        self.viewport_zoom = ScaleFactor::new((self.viewport_zoom.get() * magnification).max(1.0));
         let viewport_zoom = self.viewport_zoom;
 
         self.update_zoom_transform();

components/compositing/compositor_layer.rs

@@ -307,8 +307,8 @@ impl CompositorLayer for Layer<CompositorData> {
         let min_x = (layer_size.width - content_size.width).get().min(0.0);
         let min_y = (layer_size.height - content_size.height).get().min(0.0);
         let new_offset : TypedPoint2D<LayerPixel, f32> =
-            Point2D(Length(new_offset.x.get().clamp(&min_x, &0.0)),
-                    Length(new_offset.y.get().clamp(&min_y, &0.0)));
+            Point2D(Length::new(new_offset.x.get().clamp(&min_x, &0.0)),
+                    Length::new(new_offset.y.get().clamp(&min_y, &0.0)));
 
         if self.extra_data.borrow().scroll_offset == new_offset {
             return ScrollEventResult::ScrollPositionUnchanged;

components/compositing/constellation.rs

@@ -34,6 +34,7 @@ use util::time::TimeProfilerChan;
 use std::borrow::ToOwned;
 use std::collections::{HashMap};
 use std::old_io as io;
+use std::marker::PhantomData;
 use std::mem::replace;
 use std::sync::mpsc::{Receiver, channel};
 use url::Url;
@@ -95,6 +96,8 @@ pub struct Constellation<LTF, STF> {
     /// A channel through which messages can be sent to the memory profiler.
     pub memory_profiler_chan: MemoryProfilerChan,
 
+    phantom: PhantomData<(LTF, STF)>,
+
     pub window_size: WindowSizeData,
 }
 
@@ -201,10 +204,11 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
                 time_profiler_chan: time_profiler_chan,
                 memory_profiler_chan: memory_profiler_chan,
                 window_size: WindowSizeData {
-                    visible_viewport: opts::get().initial_window_size.as_f32() * ScaleFactor(1.0),
-                    initial_viewport: opts::get().initial_window_size.as_f32() * ScaleFactor(1.0),
-                    device_pixel_ratio: ScaleFactor(1.0),
+                    visible_viewport: opts::get().initial_window_size.as_f32() * ScaleFactor::new(1.0),
+                    initial_viewport: opts::get().initial_window_size.as_f32() * ScaleFactor::new(1.0),
+                    device_pixel_ratio: ScaleFactor::new(1.0),
                 },
+                phantom: PhantomData,
             };
             constellation.run();
         });
@@ -227,7 +231,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
         self.pipeline(pipeline_id).rect.map(|rect| {
             WindowSizeData {
                 visible_viewport: rect.size,
-                initial_viewport: rect.size * ScaleFactor(1.0),
+                initial_viewport: rect.size * ScaleFactor::new(1.0),
                 device_pixel_ratio: self.window_size.device_pixel_ratio,
             }
         })
@@ -448,7 +452,7 @@ impl<LTF: LayoutTaskFactory, STF: ScriptTaskFactory> Constellation<LTF, STF> {
         let ScriptControlChan(ref script_chan) = script_chan;
         script_chan.send(ConstellationControlMsg::Resize(pipeline_id, WindowSizeData {
             visible_viewport: rect.size,
-            initial_viewport: rect.size * ScaleFactor(1.0),
+            initial_viewport: rect.size * ScaleFactor::new(1.0),
             device_pixel_ratio: self.window_size.device_pixel_ratio,
         })).unwrap();
 

components/compositing/headless.rs

@@ -59,7 +59,7 @@ impl NullCompositor {
             chan.send(ConstellationMsg::ResizedWindow(WindowSizeData {
                 initial_viewport: TypedSize2D(640_f32, 480_f32),
                 visible_viewport: TypedSize2D(640_f32, 480_f32),
-                device_pixel_ratio: ScaleFactor(1.0),
+                device_pixel_ratio: ScaleFactor::new(1.0),
             })).unwrap();
         }
 

components/devtools/Cargo.toml

@@ -18,4 +18,4 @@ path = "../util"
 
 [dependencies]
 time = "*"
-rustc-serialize = "0.2"
+rustc-serialize = "0.3"

components/devtools/lib.rs

@@ -14,7 +14,6 @@
 #![feature(collections, std_misc)]
 
 #![allow(non_snake_case)]
-#![allow(missing_copy_implementations)]
 
 #[macro_use]
 extern crate log;

components/devtools_traits/Cargo.toml

@@ -15,4 +15,4 @@ path = "../util"
 
 [dependencies]
 url = "0.2.16"
-rustc-serialize = "0.2"
+rustc-serialize = "0.3"

components/devtools_traits/lib.rs

@@ -12,7 +12,6 @@
 #![feature(int_uint)]
 
 #![allow(non_snake_case)]
-#![allow(missing_copy_implementations)]
 
 extern crate msg;
 extern crate "rustc-serialize" as rustc_serialize;

components/gfx/Cargo.toml

@@ -67,5 +67,5 @@ path = "../script_traits"
 url = "0.2.16"
 time = "0.1.12"
 bitflags = "*"
-rustc-serialize = "0.2"
+rustc-serialize = "0.3"
 libc = "*"

components/gfx/buffer_map.rs

@@ -7,7 +7,7 @@ use std::collections::hash_map::Entry::{Occupied, Vacant};
 use geom::size::Size2D;
 use layers::platform::surface::NativePaintingGraphicsContext;
 use layers::layers::LayerBuffer;
-use std::hash::{Hash, Hasher, Writer};
+use std::hash::{Hash, Hasher};
 use std::mem;
 
 /// This is a struct used to store buffers when they are not in use.
@@ -29,8 +29,8 @@ pub struct BufferMap {
 #[derive(Eq, Copy)]
 struct BufferKey([uint; 2]);
 
-impl<H: Hasher+Writer> Hash<H> for BufferKey {
-    fn hash(&self, state: &mut H) {
+impl Hash for BufferKey {
+    fn hash<H: Hasher>(&self, state: &mut H) {
         let BufferKey(ref bytes) = *self;
         bytes.as_slice().hash(state);
     }

components/gfx/lib.rs

@@ -16,7 +16,7 @@
 #![feature(unicode)]
 #![feature(unsafe_destructor)]
 
-#![allow(missing_copy_implementations)]
+#![plugin(plugins)]
 
 #[macro_use]
 extern crate log;
@@ -32,8 +32,6 @@ extern crate png;
 extern crate script_traits;
 extern crate "rustc-serialize" as rustc_serialize;
 extern crate unicode;
-#[no_link] #[plugin]
-extern crate "plugins" as servo_plugins;
 extern crate net;
 #[macro_use]
 extern crate util;

components/gfx/paint_context.rs

@@ -850,16 +850,19 @@ impl<'a> PaintContext<'a> {
         // Draw the text.
         let temporary_draw_target =
             self.create_draw_target_for_blur_if_necessary(&text.base.bounds, text.blur_radius);
-        self.font_context
-            .get_paint_font_from_template(&text.text_run.font_template,
-                                           text.text_run.actual_pt_size)
+        {
+            // FIXME(https://github.com/rust-lang/rust/issues/23338)
+            let font = self.font_context.get_paint_font_from_template(
+                &text.text_run.font_template, text.text_run.actual_pt_size);
+            font
             .borrow()
             .draw_text(&temporary_draw_target.draw_target,
                        &*text.text_run,
                        &text.range,
                        baseline_origin,
                        text.text_color,
                        opts::get().enable_text_antialiasing);
+        }
 
         // Blur, if necessary.
         self.blur_if_necessary(temporary_draw_target, text.blur_radius);

components/gfx/paint_task.rs

@@ -134,7 +134,7 @@ macro_rules! native_graphics_context(
     )
 );
 
-impl<C> PaintTask<C> where C: PaintListener + Send {
+impl<C> PaintTask<C> where C: PaintListener + Send + 'static {
     pub fn create(id: PipelineId,
                   port: Receiver<Msg>,
                   compositor: C,

components/layout/Cargo.toml

@@ -52,7 +52,7 @@ git = "https://github.com/servo/rust-geom"
 [dependencies.string_cache]
 git = "https://github.com/servo/string-cache"
 
-[dependencies.string_cache_macros]
+[dependencies.string_cache_plugin]
 git = "https://github.com/servo/string-cache"
 
 [dependencies.png]
@@ -62,5 +62,5 @@ git = "https://github.com/servo/rust-png"
 encoding = "0.2"
 url = "0.2.16"
 bitflags = "*"
-rustc-serialize = "0.2"
+rustc-serialize = "0.3"
 libc = "*"

components/layout/block.rs

@@ -1823,7 +1823,7 @@ impl Flow for BlockFlow {
                                               self.base
                                                   .absolute_position_info
                                                   .relative_containing_block_mode,
-                                              CoordinateSystem::Self);
+                                              CoordinateSystem::Own);
         let clip = self.fragment.clipping_region_for_children(&clip_in_child_coordinate_system,
                                                               &stacking_relative_border_box);