servo: Merge #12834 - Remove #[serde(bound = "")] attributes (from dtolnay:bound); r=nox
authorDavid Tolnay <dtolnay@palantir.com>
Fri, 12 Aug 2016 19:01:28 -0500
changeset 339485 14f16d3626e039515989bb5b69d38f0403b822c7
parent 339484 794d4fbf4c1eaf935403ac31fa41eb30a36c46ba
child 339486 c867e0247b066cb67a48ad4fbfcb1fbaf06a5abf
push id31307
push usergszorc@mozilla.com
push dateSat, 04 Feb 2017 00:59:06 +0000
treeherdermozilla-central@94079d43835f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnox
servo: Merge #12834 - Remove #[serde(bound = "")] attributes (from dtolnay:bound); r=nox These were fixed in serde_codegen 0.8.0 by serde-rs/serde#456. cc @nox - [ ] `./mach build -d` does not report any errors - [ ] `./mach test-tidy` does not report any errors - [x] These changes do not require tests because: the generated code continues to compile Source-Repo: https://github.com/servo/servo Source-Revision: 11b853fbf1916fb71b49fefbf2ebeaccaec50ee2
servo/components/canvas_traits/lib.rs
servo/components/gfx/display_list/mod.rs
servo/components/script_traits/script_msg.rs
--- a/servo/components/canvas_traits/lib.rs
+++ b/servo/components/canvas_traits/lib.rs
@@ -69,17 +69,16 @@ pub struct CanvasPixelData {
 }
 
 #[derive(Clone, Deserialize, Serialize)]
 pub enum FromLayoutMsg {
     SendData(IpcSender<CanvasData>),
 }
 
 #[derive(Clone, Deserialize, Serialize)]
-#[serde(bound = "")] // Prevent serde from generating cyclic bounds.
 pub enum Canvas2dMsg {
     Arc(Point2D<f32>, f32, f32, f32, bool),
     ArcTo(Point2D<f32>, Point2D<f32>, f32),
     DrawImage(Vec<u8>, Size2D<f64>, Rect<f64>, Rect<f64>, bool),
     DrawImageSelf(Size2D<f64>, Rect<f64>, Rect<f64>, bool),
     DrawImageInOther(
         IpcSender<CanvasMsg>, Size2D<f64>, Rect<f64>, Rect<f64>, bool, IpcSender<()>),
     BeginPath,
--- a/servo/components/gfx/display_list/mod.rs
+++ b/servo/components/gfx/display_list/mod.rs
@@ -786,17 +786,16 @@ impl fmt::Debug for StackingContext {
                self.bounds,
                self.overflow,
                self.id)
     }
 }
 
 /// One drawing command in the list.
 #[derive(Clone, Deserialize, HeapSizeOf, Serialize)]
-#[serde(bound = "")] // Prevent serde from generating cyclic bounds.
 pub enum DisplayItem {
     SolidColorClass(Box<SolidColorDisplayItem>),
     TextClass(Box<TextDisplayItem>),
     ImageClass(Box<ImageDisplayItem>),
     WebGLClass(Box<WebGLDisplayItem>),
     BorderClass(Box<BorderDisplayItem>),
     GradientClass(Box<GradientDisplayItem>),
     LineClass(Box<LineDisplayItem>),
--- a/servo/components/script_traits/script_msg.rs
+++ b/servo/components/script_traits/script_msg.rs
@@ -54,17 +54,16 @@ pub enum LogEntry {
     /// Error, with a reason
     Error(String),
     /// warning, with a reason
     Warn(String)
 }
 
 /// Messages from the script to the constellation.
 #[derive(Deserialize, Serialize)]
-#[serde(bound = "")] // Prevent serde from generating cyclic bounds.
 pub enum ScriptMsg {
     /// Indicates whether this pipeline is currently running animations.
     ChangeRunningAnimationsState(PipelineId, AnimationState),
     /// Requests that a new 2D canvas thread be created. (This is done in the constellation because
     /// 2D canvases may use the GPU and we don't want to give untrusted content access to the GPU.)
     CreateCanvasPaintThread(Size2D<i32>, IpcSender<IpcSender<CanvasMsg>>),
     /// Requests that a new WebGL thread be created. (This is done in the constellation because
     /// WebGL uses the GPU and we don't want to give untrusted content access to the GPU.)