Skip to content

Commit feaf1d2

Browse files
author
bors-servo
committed
Auto merge of #138 - servo:stabilize, r=asajeffrey
Update for stabilized features. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/euclid/138) <!-- Reviewable:end -->
2 parents fc3ba61 + 66c8252 commit feaf1d2

File tree

3 files changed

+2
-8
lines changed

3 files changed

+2
-8
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "euclid"
3-
version = "0.6.6"
3+
version = "0.6.7"
44
authors = ["The Servo Project Developers"]
55
description = "Geometry primitives"
66
documentation = "http://doc.servo.org/euclid/"

src/length.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ use num_traits::NumCast;
1616
use serde::{Deserialize, Deserializer, Serialize, Serializer};
1717
use std::cmp::Ordering;
1818
use std::ops::{Add, Sub, Mul, Div, Neg};
19-
#[cfg(feature = "unstable")]
2019
use std::ops::{AddAssign, SubAssign};
2120
use std::marker::PhantomData;
2221

@@ -73,7 +72,6 @@ impl<U, T: Clone + Add<T, Output=T>> Add for Length<U, T> {
7372
}
7473

7574
// length += length
76-
#[cfg(feature = "unstable")]
7775
impl<U, T: Clone + AddAssign<T>> AddAssign for Length<U, T> {
7876
fn add_assign(&mut self, other: Length<U, T>) {
7977
self.0 += other.get();
@@ -89,7 +87,6 @@ impl<U, T: Clone + Sub<T, Output=T>> Sub<Length<U, T>> for Length<U, T> {
8987
}
9088

9189
// length -= length
92-
#[cfg(feature = "unstable")]
9390
impl<U, T: Clone + SubAssign<T>> SubAssign for Length<U, T> {
9491
fn sub_assign(&mut self, other: Length<U, T>) {
9592
self.0 -= other.get();
@@ -227,7 +224,6 @@ mod tests {
227224
assert_eq!(negative_zero_feet.get(), 0.0);
228225
}
229226

230-
#[cfg(feature = "unstable")]
231227
#[test]
232228
fn test_addassign() {
233229
let one_cm: Length<Mm, f32> = Length::new(10.0);
@@ -238,7 +234,6 @@ mod tests {
238234
assert_eq!(measurement.get(), 15.0);
239235
}
240236

241-
#[cfg(feature = "unstable")]
242237
#[test]
243238
fn test_subassign() {
244239
let one_cm: Length<Mm, f32> = Length::new(10.0);

src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@
77
// option. This file may not be copied, modified, or distributed
88
// except according to those terms.
99

10-
#![cfg_attr(feature = "unstable", feature(asm, repr_simd, test, augmented_assignments, op_assign_traits))]
11-
#![cfg_attr(feature = "unstable", feature(deprecated))]
10+
#![cfg_attr(feature = "unstable", feature(asm, repr_simd, test))]
1211

1312
#![cfg_attr(feature = "plugins", feature(custom_derive, plugin))]
1413
#![cfg_attr(feature = "plugins", plugin(heapsize_plugin))]

0 commit comments

Comments
 (0)