From 05f2d5494355adc78ad7d17286912f0d128f503b Mon Sep 17 00:00:00 2001 From: Manish Goregaokar Date: Tue, 23 Dec 2014 20:27:50 +0530 Subject: [PATCH] Update rust to ffc111889e93bcd38222d9d74a70fdc26a78fcb5/rust-0.13.0-dev --- src/length.rs | 2 +- src/matrix.rs | 2 +- src/matrix2d.rs | 1 + src/point.rs | 2 +- src/rect.rs | 2 +- src/scale_factor.rs | 2 +- src/side_offsets.rs | 4 ++-- src/size.rs | 2 +- 8 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/length.rs b/src/length.rs index bbda7fa..4068108 100644 --- a/src/length.rs +++ b/src/length.rs @@ -24,7 +24,7 @@ use std::num::{NumCast, cast}; /// /// You can multiply a Length by a `scale_factor::ScaleFactor` to convert it from one unit to /// another. See the ScaleFactor docs for an example. -#[deriving(Decodable, Encodable, Show)] +#[deriving(Copy, Decodable, Encodable, Show)] pub struct Length(pub T); impl Length { diff --git a/src/matrix.rs b/src/matrix.rs index 9e92b15..6ccc563 100644 --- a/src/matrix.rs +++ b/src/matrix.rs @@ -27,7 +27,7 @@ pub fn Matrix4 + Clone + ApproxEq + Mul + One + Zero>( } } -#[deriving(Show)] +#[deriving(Show, Copy)] pub struct Matrix4 { pub m11: T, pub m12: T, pub m13: T, pub m14: T, pub m21: T, pub m22: T, pub m23: T, pub m24: T, diff --git a/src/matrix2d.rs b/src/matrix2d.rs index 7013a9d..779e128 100644 --- a/src/matrix2d.rs +++ b/src/matrix2d.rs @@ -9,6 +9,7 @@ use num::{One, Zero}; +#[deriving(Copy)] pub struct Matrix2D { m11: T, m12: T, m21: T, m22: T, diff --git a/src/point.rs b/src/point.rs index 434b8c1..d8bc6e0 100644 --- a/src/point.rs +++ b/src/point.rs @@ -14,7 +14,7 @@ use num::Zero; use std::fmt; use std::num::NumCast; -#[deriving(Clone, Decodable, Encodable, Eq, Hash, PartialEq)] +#[deriving(Clone, Copy, Decodable, Encodable, Eq, Hash, PartialEq)] pub struct Point2D { pub x: T, pub y: T diff --git a/src/rect.rs b/src/rect.rs index 1922d38..3990dbd 100644 --- a/src/rect.rs +++ b/src/rect.rs @@ -16,7 +16,7 @@ use std::cmp::PartialOrd; use std::fmt; use std::num::NumCast; -#[deriving(Clone, Decodable, Encodable, PartialEq)] +#[deriving(Clone, Copy, Decodable, Encodable, PartialEq)] pub struct Rect { pub origin: Point2D, pub size: Size2D, diff --git a/src/scale_factor.rs b/src/scale_factor.rs index 8b9a3f9..f3b0b0c 100644 --- a/src/scale_factor.rs +++ b/src/scale_factor.rs @@ -30,7 +30,7 @@ use std::num::{NumCast, cast}; /// let one_foot: Length = Length(12.0); /// let one_foot_in_mm: Length = one_foot * mm_per_inch; /// ``` -#[deriving(Decodable, Encodable, Show)] +#[deriving(Copy, Decodable, Encodable, Show)] pub struct ScaleFactor(pub T); impl ScaleFactor { diff --git a/src/side_offsets.rs b/src/side_offsets.rs index 28c8da6..4914f22 100644 --- a/src/side_offsets.rs +++ b/src/side_offsets.rs @@ -15,7 +15,7 @@ use std::num::Num; /// A group of side offsets, which correspond to top/left/bottom/right for borders, padding, /// and margins in CSS. -#[deriving(Clone, PartialEq)] +#[deriving(Clone, Copy, PartialEq)] pub struct SideOffsets2D { pub top: T, pub right: T, @@ -73,7 +73,7 @@ impl SideOffsets2D { } /// A SIMD enabled version of SideOffsets2D specialized for i32. -#[deriving(Clone, PartialEq, Rand)] +#[deriving(Clone, Copy, PartialEq, Rand)] #[simd] pub struct SideOffsets2DSimdI32 { pub top: i32, diff --git a/src/size.rs b/src/size.rs index 02f8809..23540a5 100644 --- a/src/size.rs +++ b/src/size.rs @@ -13,7 +13,7 @@ use num::Zero; use std::fmt; use std::num::NumCast; -#[deriving(Clone, Decodable, Encodable, PartialEq)] +#[deriving(Clone, Copy, Decodable, Encodable, PartialEq)] pub struct Size2D { pub width: T, pub height: T