user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

review feedback: Use checked-arith instead of saturated-arith for push_unsafe! and pop_unsafe!.

Browse source
This commit is contained in:
Felix S. Klock II 2015-07-23 16:20:59 +02:00
parent 565df576e8
commit 44bb0dd4a3
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/librustc/middle/effect.rs
View file

@ -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();
}
}

4
src/librustc_typeck/check/mod.rs
View file

@ -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 =>