---

yaml
---
r: 228677
b: refs/heads/try
c: 44bb0dd
h: refs/heads/master
i:
  228675: 4b39ad5
v: v3

Author: pnkfelix

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: aca2057ed5fb7af3f8905b2bc01f72fa001c35c8
 refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
-refs/heads/try: 565df576e8a450ed073e4f02f7d796f05f6ff502
+refs/heads/try: 44bb0dd4a3bdd84b81dcf537d161a9dd9e9068ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc/middle/effect.rs

@@ -124,11 +124,11 @@ impl<'a, 'tcx, 'v> Visitor<'v> for EffectCheckVisitor<'a, 'tcx> {
             }
             ast::PushUnsafeBlock(..) => {
                 self.unsafe_context.push_unsafe_count =
-                    self.unsafe_context.push_unsafe_count.saturating_add(1);
+                    self.unsafe_context.push_unsafe_count.checked_add(1).unwrap();
             }
             ast::PopUnsafeBlock(..) => {
                 self.unsafe_context.push_unsafe_count =
-                    self.unsafe_context.push_unsafe_count.saturating_sub(1);
+                    self.unsafe_context.push_unsafe_count.checked_sub(1).unwrap();
             }
         }
 

branches/try/src/librustc_typeck/check/mod.rs

@@ -251,9 +251,9 @@ impl UnsafetyState {
             unsafety => {
                 let (unsafety, def, count) = match blk.rules {
                     ast::PushUnsafeBlock(..) =>
-                        (unsafety, blk.id, self.unsafe_push_count.saturating_add(1)),
+                        (unsafety, blk.id, self.unsafe_push_count.checked_add(1).unwrap()),
                     ast::PopUnsafeBlock(..) =>
-                        (unsafety, blk.id, self.unsafe_push_count.saturating_sub(1)),
+                        (unsafety, blk.id, self.unsafe_push_count.checked_sub(1).unwrap()),
                     ast::UnsafeBlock(..) =>
                         (ast::Unsafety::Unsafe, blk.id, self.unsafe_push_count),
                     ast::DefaultBlock =>