Skip to content

Commit 7b7c985

Browse files
committed
---
yaml --- r: 83164 b: refs/heads/auto c: d8f82c8 h: refs/heads/master v: v3
1 parent 4f1c432 commit 7b7c985

File tree

5 files changed

+8
-107
lines changed

5 files changed

+8
-107
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 88acb73ce5a98e707ce68f5c0579641de38b5955
16+
refs/heads/auto: d8f82c8e431472e9a1742a6923790b1f32e6e248
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/mk/target.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ export CFG_COMPILER_TRIPLE
1515

1616
# The standard libraries should be held up to a higher standard than any old
1717
# code, make sure that these common warnings are denied by default. These can
18-
# be overridden during development temporarily. For stage0, we allow warnings
19-
# which may be bugs in stage0 (should be fixed in stage1+)
20-
WFLAGS_ST0 = -W warnings
18+
# be overridden during development temporarily. For stage0, we allow all these
19+
# to suppress warnings which may be bugs in stage0 (should be fixed in stage1+)
20+
WFLAGS_ST0 = -A warnings
2121
WFLAGS_ST1 = -D warnings
2222
WFLAGS_ST2 = -D warnings
2323

branches/auto/src/libextra/uuid.rs

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,6 @@ use std::rand::Rng;
6666
use std::cmp::Eq;
6767
use std::cast::{transmute,transmute_copy};
6868

69-
use serialize::{Encoder, Encodable, Decoder, Decodable};
70-
7169
/// A 128-bit (16 byte) buffer containing the ID
7270
pub type UuidBytes = [u8, ..16];
7371

@@ -488,21 +486,6 @@ impl TotalEq for Uuid {
488486
}
489487
}
490488

491-
// FIXME #9845: Test these more thoroughly
492-
impl<T: Encoder> Encodable<T> for Uuid {
493-
/// Encode a UUID as a hypenated string
494-
fn encode(&self, e: &mut T) {
495-
e.emit_str(self.to_hyphenated_str());
496-
}
497-
}
498-
499-
impl<T: Decoder> Decodable<T> for Uuid {
500-
/// Decode a UUID from a string
501-
fn decode(d: &mut T) -> Uuid {
502-
from_str(d.read_str()).unwrap()
503-
}
504-
}
505-
506489
/// Generates a random instance of UUID (V4 conformant)
507490
impl rand::Rand for Uuid {
508491
#[inline]
@@ -787,20 +770,6 @@ mod test {
787770
assert!(ub.len() == 16);
788771
assert!(! ub.iter().all(|&b| b == 0));
789772
}
790-
791-
#[test]
792-
fn test_serialize_round_trip() {
793-
use std;
794-
use ebml;
795-
use serialize::{Encodable, Decodable};
796-
797-
let u = Uuid::new_v4();
798-
let bytes = do std::io::with_bytes_writer |wr| {
799-
u.encode(&mut ebml::writer::Encoder(wr));
800-
};
801-
let u2 = Decodable::decode(&mut ebml::reader::Decoder(ebml::reader::Doc(@bytes)));
802-
assert_eq!(u, u2);
803-
}
804773
}
805774

806775
#[cfg(test)]

branches/auto/src/libstd/num/num.rs

Lines changed: 2 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -42,26 +42,21 @@ pub trait Orderable: Ord {
4242
fn clamp(&self, mn: &Self, mx: &Self) -> Self;
4343
}
4444

45-
/// Return the smaller number.
4645
#[inline(always)] pub fn min<T: Orderable>(x: T, y: T) -> T { x.min(&y) }
47-
/// Return the larger number.
4846
#[inline(always)] pub fn max<T: Orderable>(x: T, y: T) -> T { x.max(&y) }
49-
/// Returns the number constrained within the range `mn <= self <= mx`.
5047
#[inline(always)] pub fn clamp<T: Orderable>(value: T, mn: T, mx: T) -> T { value.clamp(&mn, &mx) }
5148

5249
pub trait Zero {
5350
fn zero() -> Self; // FIXME (#5527): This should be an associated constant
5451
fn is_zero(&self) -> bool;
5552
}
5653

57-
/// Returns `0` of appropriate type.
5854
#[inline(always)] pub fn zero<T: Zero>() -> T { Zero::zero() }
5955

6056
pub trait One {
6157
fn one() -> Self; // FIXME (#5527): This should be an associated constant
6258
}
6359

64-
/// Returns `1` of appropriate type.
6560
#[inline(always)] pub fn one<T: One>() -> T { One::one() }
6661

6762
pub trait Signed: Num
@@ -74,26 +69,8 @@ pub trait Signed: Num
7469
fn is_negative(&self) -> bool;
7570
}
7671

77-
/// Computes the absolute value.
78-
///
79-
/// For float, f32, and f64, `NaN` will be returned if the number is `NaN`
8072
#[inline(always)] pub fn abs<T: Signed>(value: T) -> T { value.abs() }
81-
/// The positive difference of two numbers.
82-
///
83-
/// Returns `zero` if the number is less than or equal to `other`,
84-
/// otherwise the difference between `self` and `other` is returned.
8573
#[inline(always)] pub fn abs_sub<T: Signed>(x: T, y: T) -> T { x.abs_sub(&y) }
86-
/// Returns the sign of the number.
87-
///
88-
/// For float, f32, f64:
89-
/// - `1.0` if the number is positive, `+0.0` or `infinity`
90-
/// - `-1.0` if the number is negative, `-0.0` or `neg_infinity`
91-
/// - `NaN` if the number is `NaN`
92-
///
93-
/// For int:
94-
/// - `0` if the number is zero
95-
/// - `1` if the number is positive
96-
/// - `-1` if the number is negative
9774
#[inline(always)] pub fn signum<T: Signed>(value: T) -> T { value.signum() }
9875

9976
pub trait Unsigned: Num {}
@@ -129,11 +106,7 @@ pub trait Integer: Num
129106
fn is_odd(&self) -> bool;
130107
}
131108

132-
/// Calculates the Greatest Common Divisor (GCD) of the number and `other`.
133-
///
134-
/// The result is always positive.
135109
#[inline(always)] pub fn gcd<T: Integer>(x: T, y: T) -> T { x.gcd(&y) }
136-
/// Calculates the Lowest Common Multiple (LCM) of the number and `other`.
137110
#[inline(always)] pub fn lcm<T: Integer>(x: T, y: T) -> T { x.lcm(&y) }
138111

139112
pub trait Round {
@@ -159,23 +132,10 @@ pub trait Algebraic {
159132
fn hypot(&self, other: &Self) -> Self;
160133
}
161134

162-
/// Raise a number to a power.
163-
///
164-
/// # Example
165-
///
166-
/// ```rust
167-
/// let sixteen: float = num::pow(2.0, 4.0);
168-
/// assert_eq!(sixteen, 16.0);
169-
/// ```
170135
#[inline(always)] pub fn pow<T: Algebraic>(value: T, n: T) -> T { value.pow(&n) }
171-
/// Take the squre root of a number.
172136
#[inline(always)] pub fn sqrt<T: Algebraic>(value: T) -> T { value.sqrt() }
173-
/// Take the reciprocal (inverse) square root of a number, `1/sqrt(x)`.
174137
#[inline(always)] pub fn rsqrt<T: Algebraic>(value: T) -> T { value.rsqrt() }
175-
/// Take the cubic root of a number.
176138
#[inline(always)] pub fn cbrt<T: Algebraic>(value: T) -> T { value.cbrt() }
177-
/// Calculate the length of the hypotenuse of a right-angle triangle given legs of length `x` and
178-
/// `y`.
179139
#[inline(always)] pub fn hypot<T: Algebraic>(x: T, y: T) -> T { x.hypot(&y) }
180140

181141
pub trait Trigonometric {
@@ -191,23 +151,15 @@ pub trait Trigonometric {
191151
fn sin_cos(&self) -> (Self, Self);
192152
}
193153

194-
/// Sine function.
195154
#[inline(always)] pub fn sin<T: Trigonometric>(value: T) -> T { value.sin() }
196-
/// Cosine function.
197155
#[inline(always)] pub fn cos<T: Trigonometric>(value: T) -> T { value.cos() }
198-
/// Tangent function.
199156
#[inline(always)] pub fn tan<T: Trigonometric>(value: T) -> T { value.tan() }
200157

201-
/// Compute the arcsine of the number.
202158
#[inline(always)] pub fn asin<T: Trigonometric>(value: T) -> T { value.asin() }
203-
/// Compute the arccosine of the number.
204159
#[inline(always)] pub fn acos<T: Trigonometric>(value: T) -> T { value.acos() }
205-
/// Compute the arctangent of the number.
206160
#[inline(always)] pub fn atan<T: Trigonometric>(value: T) -> T { value.atan() }
207161

208-
/// Compute the arctangent with 2 arguments.
209162
#[inline(always)] pub fn atan2<T: Trigonometric>(x: T, y: T) -> T { x.atan2(&y) }
210-
/// Simultaneously computes the sine and cosine of the number.
211163
#[inline(always)] pub fn sin_cos<T: Trigonometric>(value: T) -> (T, T) { value.sin_cos() }
212164

213165
pub trait Exponential {
@@ -220,18 +172,12 @@ pub trait Exponential {
220172
fn log10(&self) -> Self;
221173
}
222174

223-
/// Returns `e^(value)`, (the exponential function).
224175
#[inline(always)] pub fn exp<T: Exponential>(value: T) -> T { value.exp() }
225-
/// Returns 2 raised to the power of the number, `2^(value)`.
226176
#[inline(always)] pub fn exp2<T: Exponential>(value: T) -> T { value.exp2() }
227177

228-
/// Returns the natural logarithm of the number.
229178
#[inline(always)] pub fn ln<T: Exponential>(value: T) -> T { value.ln() }
230-
/// Returns the logarithm of the number with respect to an arbitrary base.
231179
#[inline(always)] pub fn log<T: Exponential>(value: T, base: T) -> T { value.log(&base) }
232-
/// Returns the base 2 logarithm of the number.
233180
#[inline(always)] pub fn log2<T: Exponential>(value: T) -> T { value.log2() }
234-
/// Returns the base 10 logarithm of the number.
235181
#[inline(always)] pub fn log10<T: Exponential>(value: T) -> T { value.log10() }
236182

237183
pub trait Hyperbolic: Exponential {
@@ -244,18 +190,12 @@ pub trait Hyperbolic: Exponential {
244190
fn atanh(&self) -> Self;
245191
}
246192

247-
/// Hyperbolic cosine function.
248193
#[inline(always)] pub fn sinh<T: Hyperbolic>(value: T) -> T { value.sinh() }
249-
/// Hyperbolic sine function.
250194
#[inline(always)] pub fn cosh<T: Hyperbolic>(value: T) -> T { value.cosh() }
251-
/// Hyperbolic tangent function.
252195
#[inline(always)] pub fn tanh<T: Hyperbolic>(value: T) -> T { value.tanh() }
253196

254-
/// Inverse hyperbolic sine function.
255197
#[inline(always)] pub fn asinh<T: Hyperbolic>(value: T) -> T { value.asinh() }
256-
/// Inverse hyperbolic cosine function.
257198
#[inline(always)] pub fn acosh<T: Hyperbolic>(value: T) -> T { value.acosh() }
258-
/// Inverse hyperbolic tangent function.
259199
#[inline(always)] pub fn atanh<T: Hyperbolic>(value: T) -> T { value.atanh() }
260200

261201
/// Defines constants and methods common to real numbers
@@ -405,16 +345,8 @@ pub trait Float: Real
405345
fn next_after(&self, other: Self) -> Self;
406346
}
407347

408-
/// Returns the exponential of the number, minus `1`, `exp(n) - 1`, in a way
409-
/// that is accurate even if the number is close to zero.
410348
#[inline(always)] pub fn exp_m1<T: Float>(value: T) -> T { value.exp_m1() }
411-
/// Returns the natural logarithm of the number plus `1`, `ln(n + 1)`, more
412-
/// accurately than if the operations were performed separately.
413349
#[inline(always)] pub fn ln_1p<T: Float>(value: T) -> T { value.ln_1p() }
414-
/// Fused multiply-add. Computes `(a * b) + c` with only one rounding error.
415-
///
416-
/// This produces a more accurate result with better performance (on some
417-
/// architectures) than a separate multiplication operation followed by an add.
418350
#[inline(always)] pub fn mul_add<T: Float>(a: T, b: T, c: T) -> T { a.mul_add(b, c) }
419351

420352
/// A generic trait for converting a value to a number.
@@ -856,7 +788,7 @@ impl_from_primitive!(u64, n.to_u64())
856788
impl_from_primitive!(f32, n.to_f32())
857789
impl_from_primitive!(f64, n.to_f64())
858790

859-
/// Cast from one machine scalar to another.
791+
/// Cast from one machine scalar to another
860792
///
861793
/// # Example
862794
///
@@ -909,7 +841,7 @@ pub trait FromStrRadix {
909841
fn from_str_radix(str: &str, radix: uint) -> Option<Self>;
910842
}
911843

912-
/// A utility function that just calls FromStrRadix::from_str_radix.
844+
/// A utility function that just calls FromStrRadix::from_str_radix
913845
pub fn from_str_radix<T: FromStrRadix>(str: &str, radix: uint) -> Option<T> {
914846
FromStrRadix::from_str_radix(str, radix)
915847
}

branches/auto/src/libstd/vec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1186,9 +1186,9 @@ impl<'self,T:Eq> ImmutableEqVector<T> for &'self [T] {
11861186
self.iter().rposition(|x| *x == *t)
11871187
}
11881188

1189+
#[inline]
11891190
fn contains(&self, x: &T) -> bool {
1190-
for elt in self.iter() { if *x == *elt { return true; } }
1191-
false
1191+
self.iter().any(|elt| *x == *elt)
11921192
}
11931193
}
11941194

0 commit comments

Comments
 (0)