---

yaml
---
r: 57315
b: refs/heads/incoming
c: 621d45b
h: refs/heads/master
i:
  57313: 5cf6898
  57311: aa197e1
v: v3

Author: zofrex

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: bf67eb2362b7d0f37012f2d6dac604c3bbacd2c6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 89676d6a5960aa51ee1e6975c423e979819a407c
+refs/heads/incoming: 621d45b341c8c4ed0708b47b5a046278dda0c5be
 refs/heads/dist-snap: 00dbbd01c2aee72982b3e0f9511ae1d4428c3ba9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial.md

@@ -747,7 +747,7 @@ fn area(sh: Shape) -> float {
 
 Tuples in Rust behave exactly like structs, except that their fields
 do not have names. Thus, you cannot access their fields with dot notation.
-Tuples can have any arity except for 0 or 1 (though you may consider
+Tuples can have any arity except for 0 (though you may consider
 unit, `()`, as the empty tuple if you like).
 
 ~~~~

branches/incoming/src/libcore/num/int-template.rs

@@ -107,15 +107,11 @@ pub fn range_step(start: T, stop: T, step: T, it: &fn(T) -> bool) {
     } else if step > 0 { // ascending
         while i < stop {
             if !it(i) { break }
-            // avoiding overflow. break if i + step > max_value
-            if i > max_value - step { break; }
             i += step;
         }
     } else { // descending
         while i > stop {
             if !it(i) { break }
-            // avoiding underflow. break if i + step < min_value
-            if i < min_value - step { break; }
             i += step;
         }
     }
@@ -425,26 +421,10 @@ pub fn test_ranges() {
     for range_step(36,30,-2) |i| {
         l.push(i);
     }
-    for range_step(max_value - 2, max_value, 2) |i| {
-        l.push(i);
-    }
-    for range_step(max_value - 3, max_value, 2) |i| {
-        l.push(i);
-    }
-    for range_step(min_value + 2, min_value, -2) |i| {
-        l.push(i);
-    }
-    for range_step(min_value + 3, min_value, -2) |i| {
-        l.push(i);
-    }
-    assert_eq!(l, ~[0,1,2,
-                    13,12,11,
-                    20,22,24,
-                    36,34,32,
-                    max_value-2,
-                    max_value-3,max_value-1,
-                    min_value+2,
-                    min_value+3,min_value+1]);
+    assert!(l == ~[0,1,2,
+                        13,12,11,
+                        20,22,24,
+                        36,34,32]);
 
     // None of the `fail`s should execute.
     for range(10,0) |_i| {

branches/incoming/src/libcore/num/uint-template.rs

@@ -78,15 +78,12 @@ pub fn range_step(start: T,
     if step >= 0 {
         while i < stop {
             if !it(i) { break }
-            // avoiding overflow. break if i + step > max_value
-            if i > max_value - (step as T) { break; }
             i += step as T;
         }
-    } else {
+    }
+    else {
         while i > stop {
             if !it(i) { break }
-            // avoiding underflow. break if i + step < min_value
-            if i < min_value + ((-step) as T) { break; }
             i -= -step as T;
         }
     }
@@ -374,27 +371,11 @@ pub fn test_ranges() {
     for range_step(36,30,-2) |i| {
         l.push(i);
     }
-    for range_step(max_value - 2, max_value, 2) |i| {
-        l.push(i);
-    }
-    for range_step(max_value - 3, max_value, 2) |i| {
-        l.push(i);
-    }
-    for range_step(min_value + 2, min_value, -2) |i| {
-        l.push(i);
-    }
-    for range_step(min_value + 3, min_value, -2) |i| {
-        l.push(i);
-    }
 
-    assert_eq!(l, ~[0,1,2,
-                    13,12,11,
-                    20,22,24,
-                    36,34,32,
-                    max_value-2,
-                    max_value-3,max_value-1,
-                    min_value+2,
-                    min_value+3,min_value+1]);
+    assert!(l == ~[0,1,2,
+                        13,12,11,
+                        20,22,24,
+                        36,34,32]);
 
     // None of the `fail`s should execute.
     for range(0,0) |_i| {