Fallout where types must be specified.

This is due to a [breaking-change] to operators. The primary affected
code is uses of the `Rng` trait where we used to (incorrectly) infer the
right-hand-side type from the left-hand-side, in the case that the LHS
type was a scalar like `i32`. The fix is to add a type annotation like
`x + rng.gen::<i32>()`.

diff --git a/src/libcollectionstest/bench.rs b/src/libcollectionstest/bench.rs
index e883b07dc5a48fde17e02877d35858e79071c8ec..8f2e71b666c6b6dcdc1cea18da875e6123877b7d 100644 (file)
--- a/src/libcollectionstest/bench.rs
+++ b/src/libcollectionstest/bench.rs
@@ -22,13 +22,13 @@ pub fn $name(b: &mut ::test::Bencher) {
             let mut rng = rand::weak_rng();
 
             for _ in 0..n {
-                let i = rng.gen() % n;
+                let i = rng.gen::<usize>() % n;
                 map.insert(i, i);
             }
 
             // measure
             b.iter(|| {
-                let k = rng.gen() % n;
+                let k = rng.gen::<usize>() % n;
                 map.insert(k, k);
                 map.remove(&k);
             });
@@ -77,7 +77,7 @@ pub fn $name(b: &mut ::test::Bencher) {
 
             // setup
             let mut rng = rand::weak_rng();
-            let mut keys: Vec<_> = (0..n).map(|_| rng.gen() % n).collect();
+            let mut keys: Vec<_> = (0..n).map(|_| rng.gen::<usize>() % n).collect();
 
             for &k in &keys {
                 map.insert(k, k);

diff --git a/src/librand/distributions/mod.rs b/src/librand/distributions/mod.rs
index cb0829f52457e9b7698a95a0f7afbfc53c077207..62189e721e59d70f554bf6e0934a64858ad3c3d7 100644 (file)
--- a/src/librand/distributions/mod.rs
+++ b/src/librand/distributions/mod.rs
@@ -256,7 +256,7 @@ fn ziggurat<R: Rng, P, Z>(
             return zero_case(rng, u);
         }
         // algebraically equivalent to f1 + DRanU()*(f0 - f1) < 1
-        if f_tab[i + 1] + (f_tab[i] - f_tab[i + 1]) * rng.gen() < pdf(x) {
+        if f_tab[i + 1] + (f_tab[i] - f_tab[i + 1]) * rng.gen::<f64>() < pdf(x) {
             return x;
         }
     }

diff --git a/src/librand/distributions/range.rs b/src/librand/distributions/range.rs
index 0f74e67f5a7246e103a9003ee3db13482ddcb7a2..347d494259d08830fbbbf39df99764512ff68bc1 100644 (file)
--- a/src/librand/distributions/range.rs
+++ b/src/librand/distributions/range.rs
@@ -154,7 +154,7 @@ fn construct_range(low: $ty, high: $ty) -> Range<$ty> {
                 }
             }
             fn sample_range<R: Rng>(r: &Range<$ty>, rng: &mut R) -> $ty {
-                r.low + r.range * rng.gen()
+                r.low + r.range * rng.gen::<$ty>()
             }
         }
     }

diff --git a/src/test/auxiliary/lang-item-public.rs b/src/test/auxiliary/lang-item-public.rs
index 3b4547e31f5d53a6420409729133536756c5c4c6..3c416dc2ef8d1168bed446ed3af5b251840bf297 100644 (file)
--- a/src/test/auxiliary/lang-item-public.rs
+++ b/src/test/auxiliary/lang-item-public.rs
@@ -32,3 +32,21 @@ fn panic(_: &(&'static str, &'static str, usize)) -> ! { loop {} }
 pub trait Copy : PhantomFn<Self> {
     // Empty.
 }
+
+#[lang="rem"]
+pub trait Rem<RHS=Self> {
+    /// The resulting type after applying the `%` operator
+    #[stable(feature = "rust1", since = "1.0.0")]
+    type Output = Self;
+
+    /// The method for the `%` operator
+    #[stable(feature = "rust1", since = "1.0.0")]
+    fn rem(self, rhs: RHS) -> Self::Output;
+}
+
+impl Rem for i32 {
+    type Output = i32;
+
+    #[inline]
+    fn rem(self, other: i32) -> i32 { self % other }
+}

diff --git a/src/test/bench/noise.rs b/src/test/bench/noise.rs
index ff2428286d262a2fac59fbddf6fdf0e606869081..d6577036b8ebed47d03ac9802dc8ddc03eea3022 100644 (file)
--- a/src/test/bench/noise.rs
+++ b/src/test/bench/noise.rs
@@ -29,7 +29,7 @@ fn lerp(a: f32, b: f32, v: f32) -> f32 { a * (1.0 - v) + b * v }
 fn smooth(v: f32) -> f32 { v * v * (3.0 - 2.0 * v) }
 
 fn random_gradient<R: Rng>(r: &mut R) -> Vec2 {
-    let v = PI * 2.0 * r.gen();
+    let v = PI * 2.0 * r.gen::<f32>();
     Vec2 { x: v.cos(), y: v.sin() }
 }
 

diff --git a/src/test/run-pass/dst-raw.rs b/src/test/run-pass/dst-raw.rs
index c8f8218cc28dc47ef246887a9dd2faf5cd0bda7a..5e0e5bd03fe6fa5180d10535065c4d929701c0c6 100644 (file)
--- a/src/test/run-pass/dst-raw.rs
+++ b/src/test/run-pass/dst-raw.rs
@@ -56,7 +56,7 @@ pub fn main() {
     }
 
     // raw slice with explicit cast
-    let a = &[1, 2, 3] as *const [_];
+    let a = &[1, 2, 3] as *const [i32];
     unsafe {
         let b = (*a)[2];
         assert!(b == 3);
@@ -96,7 +96,7 @@ pub fn main() {
         assert!(len == 3);
     }
 
-    let a = &mut [1, 2, 3] as *mut [_];
+    let a = &mut [1, 2, 3] as *mut [i32];
     unsafe {
         let b = (*a)[2];
         assert!(b == 3);

diff --git a/src/test/run-pass/early-ret-binop-add.rs b/src/test/run-pass/early-ret-binop-add.rs
index b01d6523bf01e3f8af6636715a0b048a97554522..7bd292e66f2585975499986084be4eb6fd63132d 100644 (file)
--- a/src/test/run-pass/early-ret-binop-add.rs
+++ b/src/test/run-pass/early-ret-binop-add.rs
@@ -10,5 +10,8 @@
 
 // pretty-expanded FIXME #23616
 
-fn wsucc(n: isize) -> isize { 0 + { return n + 1 } }
+use std::num::Int;
+
+fn wsucc<T:Int>(n: T) -> T { n + { return n } }
+
 pub fn main() { }

diff --git a/src/test/run-pass/issue-1460.rs b/src/test/run-pass/issue-1460.rs
index 6d2d02d2b8b63ae9d4fd00a5089d8045fc6ce9cb..6e1cfc7186299e0eabc40c9c20ed32e5ce8e380a 100644 (file)
--- a/src/test/run-pass/issue-1460.rs
+++ b/src/test/run-pass/issue-1460.rs
@@ -12,5 +12,5 @@
 // pretty-expanded FIXME #23616
 
 pub fn main() {
-    {|i| if 1 == i { }};
+    {|i: u32| if 1 == i { }};
 }

diff --git a/src/test/run-pass/issue-16560.rs b/src/test/run-pass/issue-16560.rs
index 15a5080f5a242c09c2e43743a7c7af96c4fd83cf..33842fab6989cecf2df6720b630aadb74599b6bf 100644 (file)
--- a/src/test/run-pass/issue-16560.rs
+++ b/src/test/run-pass/issue-16560.rs
@@ -17,7 +17,7 @@
 
 fn main() {
     let y = 0u8;
-    let closure = move |x| y + x;
+    let closure = move |x: u8| y + x;
 
     // Check that both closures are capturing by value
     assert_eq!(1, mem::size_of_val(&closure));

diff --git a/src/test/run-pass/issue-21634.rs b/src/test/run-pass/issue-21634.rs
index 53297d0a8f3b96867c097366bc7fbb35fba3d5b0..fe540e1aabef8b6a4582d9c13025901fac25ea41 100644 (file)
--- a/src/test/run-pass/issue-21634.rs
+++ b/src/test/run-pass/issue-21634.rs
@@ -12,13 +12,13 @@
 // pretty-expanded FIXME #23616
 
 fn main() {
-    if let Ok(x) = "3.1415".parse() {
+    if let Ok(x) = "3.1415".parse::<f64>() {
         assert_eq!(false, x <= 0.0);
     }
-    if let Ok(x) = "3.1415".parse() {
+    if let Ok(x) = "3.1415".parse::<f64>() {
         assert_eq!(3.1415, x + 0.0);
     }
-    if let Ok(mut x) = "3.1415".parse() {
+    if let Ok(mut x) = "3.1415".parse::<f64>() {
         assert_eq!(8.1415, { x += 5.0; x });
     }
 }

diff --git a/src/test/run-pass/issue-8460.rs b/src/test/run-pass/issue-8460.rs
index 0ef668794ec0df00489f09c214a4a79122ac12a8..7d8c4ab210d002e1d09d60564f4d41e565aed1f7 100644 (file)
--- a/src/test/run-pass/issue-8460.rs
+++ b/src/test/run-pass/issue-8460.rs
@@ -25,19 +25,19 @@ fn main() {
     assert!(thread::spawn(move|| { min_val::<i16>() / -1; }).join().is_err());
     assert!(thread::spawn(move|| { min_val::<i32>() / -1; }).join().is_err());
     assert!(thread::spawn(move|| { min_val::<i64>() / -1; }).join().is_err());
-    assert!(thread::spawn(move|| { 1isize / zero(); }).join().is_err());
-    assert!(thread::spawn(move|| { 1i8 / zero(); }).join().is_err());
-    assert!(thread::spawn(move|| { 1i16 / zero(); }).join().is_err());
-    assert!(thread::spawn(move|| { 1i32 / zero(); }).join().is_err());
-    assert!(thread::spawn(move|| { 1i64 / zero(); }).join().is_err());
+    assert!(thread::spawn(move|| { 1isize / zero::<isize>(); }).join().is_err());
+    assert!(thread::spawn(move|| { 1i8 / zero::<i8>(); }).join().is_err());
+    assert!(thread::spawn(move|| { 1i16 / zero::<i16>(); }).join().is_err());
+    assert!(thread::spawn(move|| { 1i32 / zero::<i32>(); }).join().is_err());
+    assert!(thread::spawn(move|| { 1i64 / zero::<i64>(); }).join().is_err());
     assert!(thread::spawn(move|| { min_val::<isize>() % -1; }).join().is_err());
     assert!(thread::spawn(move|| { min_val::<i8>() % -1; }).join().is_err());
     assert!(thread::spawn(move|| { min_val::<i16>() % -1; }).join().is_err());
     assert!(thread::spawn(move|| { min_val::<i32>() % -1; }).join().is_err());
     assert!(thread::spawn(move|| { min_val::<i64>() % -1; }).join().is_err());
-    assert!(thread::spawn(move|| { 1isize % zero(); }).join().is_err());
-    assert!(thread::spawn(move|| { 1i8 % zero(); }).join().is_err());
-    assert!(thread::spawn(move|| { 1i16 % zero(); }).join().is_err());
-    assert!(thread::spawn(move|| { 1i32 % zero(); }).join().is_err());
-    assert!(thread::spawn(move|| { 1i64 % zero(); }).join().is_err());
+    assert!(thread::spawn(move|| { 1isize % zero::<isize>(); }).join().is_err());
+    assert!(thread::spawn(move|| { 1i8 % zero::<i8>(); }).join().is_err());
+    assert!(thread::spawn(move|| { 1i16 % zero::<i16>(); }).join().is_err());
+    assert!(thread::spawn(move|| { 1i32 % zero::<i32>(); }).join().is_err());
+    assert!(thread::spawn(move|| { 1i64 % zero::<i64>(); }).join().is_err());
 }

diff --git a/src/test/run-pass/reexported-static-methods-cross-crate.rs b/src/test/run-pass/reexported-static-methods-cross-crate.rs
index 374d0d8d9b961d724db512750c8bd41ce3d8a8ff..3efd913cf543c935789d7a69a52dfc0723895fb5 100644 (file)
--- a/src/test/run-pass/reexported-static-methods-cross-crate.rs
+++ b/src/test/run-pass/reexported-static-methods-cross-crate.rs
@@ -19,8 +19,8 @@
 use reexported_static_methods::Bort;
 
 pub fn main() {
-    assert_eq!(42, Foo::foo());
-    assert_eq!(84, Baz::bar());
+    assert_eq!(42_isize, Foo::foo());
+    assert_eq!(84_isize, Baz::bar());
     assert!(Boz::boz(1));
     assert_eq!("bort()".to_string(), Bort::bort());
 }