---

yaml
---
r: 151581
b: refs/heads/try2
c: 437338a
h: refs/heads/master
i:
  151579: 961e7af
v: v3

Author: TeXitoi

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 48beab120553b2fcdaafcc2741c796d5c5169fcf
+refs/heads/try2: 437338ab658d075b50538541541e3049a79f5911
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/test/bench/shootout-nbody.rs

@@ -70,33 +70,30 @@ struct Planet {
 
 fn advance(bodies: &mut [Planet, ..N_BODIES], dt: f64, steps: int) {
     for _ in range(0, steps) {
-        {
-            let mut b_slice = bodies.as_mut_slice();
-            loop {
-                let bi = match b_slice.mut_shift_ref() {
-                    Some(bi) => bi,
-                    None => break
-                };
-                for bj in b_slice.mut_iter() {
-                    let dx = bi.x - bj.x;
-                    let dy = bi.y - bj.y;
-                    let dz = bi.z - bj.z;
+        let mut b_slice = bodies.as_mut_slice();
+        loop {
+            let bi = match b_slice.mut_shift_ref() {
+                Some(bi) => bi,
+                None => break
+            };
+            for bj in b_slice.mut_iter() {
+                let dx = bi.x - bj.x;
+                let dy = bi.y - bj.y;
+                let dz = bi.z - bj.z;
 
-                    let d2 = dx * dx + dy * dy + dz * dz;
-                    let mag = dt / (d2 * d2.sqrt());
+                let d2 = dx * dx + dy * dy + dz * dz;
+                let mag = dt / (d2 * d2.sqrt());
 
-                    bi.vx -= dx * bj.mass * mag;
-                    bi.vy -= dy * bj.mass * mag;
-                    bi.vz -= dz * bj.mass * mag;
+                let massj_mag = bj.mass * mag;
+                bi.vx -= dx * massj_mag;
+                bi.vy -= dy * massj_mag;
+                bi.vz -= dz * massj_mag;
 
-                    bj.vx += dx * bi.mass * mag;
-                    bj.vy += dy * bi.mass * mag;
-                    bj.vz += dz * bi.mass * mag;
-                }
+                let massi_mag = bi.mass * mag;
+                bj.vx += dx * massi_mag;
+                bj.vy += dy * massi_mag;
+                bj.vz += dz * massi_mag;
             }
-        }
-
-        for bi in bodies.mut_iter() {
             bi.x += dt * bi.vx;
             bi.y += dt * bi.vy;
             bi.z += dt * bi.vz;