diff options
| -rw-r--r-- | src/librustc/middle/effect.rs | 6 | ||||
| -rw-r--r-- | src/librustc/middle/lint.rs | 4 | ||||
| -rw-r--r-- | src/librustc/middle/typeck/check/mod.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/ast.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/parser.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 2 |
6 files changed, 11 insertions, 7 deletions
diff --git a/src/librustc/middle/effect.rs b/src/librustc/middle/effect.rs index 160b03132e0..9c02f544fba 100644 --- a/src/librustc/middle/effect.rs +++ b/src/librustc/middle/effect.rs @@ -102,8 +102,10 @@ impl Visitor<()> for EffectCheckVisitor { fn visit_block(&mut self, block:&Block, _:()) { let old_unsafe_context = self.context.unsafe_context; - if block.rules == ast::UnsafeBlock && - self.context.unsafe_context == SafeContext { + let is_unsafe = match block.rules { + ast::UnsafeBlock(*) => true, ast::DefaultBlock => false + }; + if is_unsafe && self.context.unsafe_context == SafeContext { self.context.unsafe_context = UnsafeBlock(block.id) } diff --git a/src/librustc/middle/lint.rs b/src/librustc/middle/lint.rs index 6f4d94e2a64..a4b64f5a1d8 100644 --- a/src/librustc/middle/lint.rs +++ b/src/librustc/middle/lint.rs @@ -1131,7 +1131,9 @@ impl Visitor<@mut Context> for UnusedUnsafeLintVisitor { fn visit_expr(&mut self, e:@ast::Expr, cx:@mut Context) { match e.node { - ast::ExprBlock(ref blk) if blk.rules == ast::UnsafeBlock => { + // Don't warn about generated blocks, that'll just pollute the + // output. + ast::ExprBlock(ref blk) if blk.rules == ast::UnsafeBlock(false) => { if !cx.tcx.used_unsafe.contains(&blk.id) { cx.span_lint(unused_unsafe, blk.span, "unnecessary `unsafe` block"); diff --git a/src/librustc/middle/typeck/check/mod.rs b/src/librustc/middle/typeck/check/mod.rs index b6e0fd93fa9..0c0326e9317 100644 --- a/src/librustc/middle/typeck/check/mod.rs +++ b/src/librustc/middle/typeck/check/mod.rs @@ -200,7 +200,7 @@ impl PurityState { purity => { let (purity, def) = match blk.rules { - ast::UnsafeBlock => (ast::unsafe_fn, blk.id), + ast::UnsafeBlock(*) => (ast::unsafe_fn, blk.id), ast::DefaultBlock => (purity, self.def), }; PurityState{ def: def, diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 8d557125d37..63a6e936550 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -479,7 +479,7 @@ pub struct Field { #[deriving(Clone, Eq, Encodable, Decodable, IterBytes)] pub enum BlockCheckMode { DefaultBlock, - UnsafeBlock, + UnsafeBlock(/* generated internally */ bool), } #[deriving(Clone, Eq, Encodable, Decodable,IterBytes)] diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 4adc34d75a7..b0bcc91f962 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1792,7 +1792,7 @@ impl Parser { } else if self.eat_keyword(keywords::Match) { return self.parse_match_expr(); } else if self.eat_keyword(keywords::Unsafe) { - return self.parse_block_expr(lo, UnsafeBlock); + return self.parse_block_expr(lo, UnsafeBlock(false)); } else if *self.token == token::LBRACKET { self.bump(); let mutbl = self.parse_mutability(); diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 55f052d769d..9b9b157c9d8 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -951,7 +951,7 @@ pub fn print_possibly_embedded_block_(s: @ps, attrs: &[ast::Attribute], close_box: bool) { match blk.rules { - ast::UnsafeBlock => word_space(s, "unsafe"), + ast::UnsafeBlock(*) => word_space(s, "unsafe"), ast::DefaultBlock => () } maybe_print_comment(s, blk.span.lo); |