---

yaml
---
r: 224167
b: refs/heads/beta
c: d066a7b
h: refs/heads/master
i:
  224165: 85b7527
  224163: 7fa71a0
  224159: 3dca388
v: v3

Author: pnkfelix

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 2d68d09b4679018d0ba3faf41d239251991bf17b
+refs/heads/beta: d066a7b5069ff857a5bffe7cb5168fe63158144f
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 938f5d7af401e2d8238522fed4a612943b6e77fd
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/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
+    //    })
 
 }