---

yaml
---
r: 221061
b: refs/heads/auto
c: d066a7b
h: refs/heads/master
i:
  221059: 79f8be6
v: v3

Author: pnkfelix

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 2d68d09b4679018d0ba3faf41d239251991bf17b
+refs/heads/auto: d066a7b5069ff857a5bffe7cb5168fe63158144f
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/test/compile-fail/pushpop-unsafe-rejects.rs

@@ -45,29 +45,30 @@ fn main() {
     });
 
 
-    // Note: For implementation simplicity I have chosen to just have
-    // the stack do "saturated pop", but perhaps we would prefer to
-    // have cases like these two here be errors:
-
-    pop_unsafe!{ g() };
-
-    push_unsafe!({
-        pop_unsafe!(pop_unsafe!{ g() })
-    });
-
-
-    // Okay, back to examples that do error, even in the presence of
-    // "saturated pop"
-
-    push_unsafe!({
-        g();
-        pop_unsafe!(pop_unsafe!({
-            f() //~ ERROR: call to unsafe function
-        }))
-    });
-
-    pop_unsafe!({
-        f(); //~ ERROR: call to unsafe function
-    })
+    // Note: For implementation simplicity the compiler just
+    // ICE's if you underflow the push_unsafe stack.
+    //
+    // Thus all of the following cases cause an ICE.
+    //
+    // (The "ERROR" notes are from an earlier version
+    //  that used saturated arithmetic rather than checked
+    //  arithmetic.)
+
+    //    pop_unsafe!{ g() };
+    //
+    //    push_unsafe!({
+    //        pop_unsafe!(pop_unsafe!{ g() })
+    //    });
+    //
+    //    push_unsafe!({
+    //        g();
+    //        pop_unsafe!(pop_unsafe!({
+    //            f() // ERROR: call to unsafe function
+    //        }))
+    //    });
+    //
+    //    pop_unsafe!({
+    //        f(); // ERROR: call to unsafe function
+    //    })
 
 }