rollup merge of #17355 : gamazeps/issue17210

[rust.git] / src / test / bench / noise.rs

diff --git a/src/test/bench/noise.rs b/src/test/bench/noise.rs
index 27540cc5bbf945baecb2d3409d9d49baa7700337..19ccf1b6caf721f47c84f2672077fdf1a739e20b 100644 (file)
--- a/src/test/bench/noise.rs
+++ b/src/test/bench/noise.rs
@@ -10,11 +10,10 @@
 
 // Multi-language Perlin noise benchmark.
 // See https://github.com/nsf/pnoise for timings and alternative implementations.
-
-extern crate rand;
+// ignore-lexer-test FIXME #15679
 
 use std::f32::consts::PI;
-use rand::{Rng, StdRng};
+use std::rand::{Rng, StdRng};
 
 struct Vec2 {
     x: f32,
@@ -44,12 +43,12 @@ fn new() -> Noise2DContext {
         let mut rng = StdRng::new().unwrap();
 
         let mut rgradients = [Vec2 { x: 0.0, y: 0.0 }, ..256];
-        for x in rgradients.mut_iter() {
+        for x in rgradients.iter_mut() {
             *x = random_gradient(&mut rng);
         }
 
         let mut permutations = [0i32, ..256];
-        for (i, x) in permutations.mut_iter().enumerate() {
+        for (i, x) in permutations.iter_mut().enumerate() {
             *x = i as i32;
         }
         rng.shuffle(permutations);
@@ -103,7 +102,7 @@ fn main() {
     let mut pixels = [0f32, ..256*256];
     let n2d = Noise2DContext::new();
 
-    for _ in range(0, 100) {
+    for _ in range(0u, 100) {
         for y in range(0u, 256) {
             for x in range(0u, 256) {
                 let v = n2d.get(x as f32 * 0.1, y as f32 * 0.1);