squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Address some comments

Browse source
This commit is contained in:
John Kåre Alsaker 2019-01-19 04:29:26 +01:00
parent 13dc584db3
commit a5d4aeddc8
1 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/librustc_passes/ast_validation.rs
View file

@ -6,6 +6,7 @@
// This pass is supposed to perform only simple checks not requiring name resolution // This pass is supposed to perform only simple checks not requiring name resolution
// or type checking or some other kind of complex analysis. // or type checking or some other kind of complex analysis.
use std::mem;
use rustc::lint; use rustc::lint;
use rustc::session::Session; use rustc::session::Session;
use syntax::ast::*; use syntax::ast::*;
@ -32,22 +33,16 @@ struct AstValidator<'a> {
} }
impl<'a> AstValidator<'a> { impl<'a> AstValidator<'a> {
fn with_banned_impl_trait<F>(&mut self, f: F) fn with_banned_impl_trait(&mut self, f: impl FnOnce(&mut Self)) {
where F: FnOnce(&mut Self) let old = mem::replace(&mut self.is_impl_trait_banned, true);
{
let old_is_impl_trait_banned = self.is_impl_trait_banned;
self.is_impl_trait_banned = true;
f(self); f(self);
self.is_impl_trait_banned = old_is_impl_trait_banned; self.is_impl_trait_banned = old;
} }
fn with_impl_trait<F>(&mut self, outer_impl_trait: Option<Span>, f: F) fn with_impl_trait(&mut self, outer_impl_trait: Option<Span>, f: impl FnOnce(&mut Self)) {
where F: FnOnce(&mut Self) let old = mem::replace(&mut self.outer_impl_trait, outer_impl_trait);
{
let old_outer_impl_trait = self.outer_impl_trait;
self.outer_impl_trait = outer_impl_trait;
f(self); f(self);
self.outer_impl_trait = old_outer_impl_trait; self.outer_impl_trait = old;
} }
// Mirrors visit::walk_ty, but tracks relevant state // Mirrors visit::walk_ty, but tracks relevant state