From 44bb0dd4a3bdd84b81dcf537d161a9dd9e9068ea Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Thu, 23 Jul 2015 16:20:59 +0200 Subject: [PATCH] review feedback: Use checked-arith instead of saturated-arith for `push_unsafe!` and `pop_unsafe!`. --- src/librustc/middle/effect.rs | 4 ++-- src/librustc_typeck/check/mod.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/librustc/middle/effect.rs b/src/librustc/middle/effect.rs index a2e42245bbef..3fe1e2f5e836 100644 --- a/src/librustc/middle/effect.rs +++ b/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(); } } diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs index 76ba89caaa07..a047092d147e 100644 --- a/src/librustc_typeck/check/mod.rs +++ b/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 =>