---

yaml
---
r: 221059
b: refs/heads/auto
c: 44bb0dd
h: refs/heads/master
i:
  221057: a2f7b76
  221055: 54870d3
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: 565df576e8a450ed073e4f02f7d796f05f6ff502
+refs/heads/auto: 44bb0dd4a3bdd84b81dcf537d161a9dd9e9068ea
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/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/auto/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 =>