---

yaml
---
r: 56381
b: refs/heads/auto
c: 8cadcc4
h: refs/heads/master
i:
  56379: 6618b48
v: v3

Author: bors

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 0290caa885ec9bdd3a6d91cbbfbfbae4ed164fd6
+refs/heads/auto: 8cadcc47ee0413bdb1b52a594fbed3a3cae75705
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/librustc/middle/lint.rs

@@ -262,7 +262,7 @@ pub fn get_lint_dict() -> LintDict {
         (~"unused_unsafe",
          LintSpec {
             lint: unused_unsafe,
-            desc: "unnecessary use of an \"unsafe\" block",
+            desc: "unnecessary use of an `unsafe` block",
             default: warn
         }),
 
@@ -949,7 +949,7 @@ fn check_item_unused_unsafe(cx: ty::ctxt, it: @ast::item) {
                 if !cx.used_unsafe.contains(&blk.node.id) {
                     cx.sess.span_lint(unused_unsafe, blk.node.id, it.id,
                                       blk.span,
-                                      ~"unnecessary \"unsafe\" block");
+                                      ~"unnecessary `unsafe` block");
                 }
             }
             _ => ()

branches/auto/src/test/compile-fail/unused-unsafe.rs

@@ -16,10 +16,10 @@ use core::libc;
 
 fn callback<T>(_f: &fn() -> T) -> T { fail!() }
 
-fn bad1() { unsafe {} }                  //~ ERROR: unnecessary "unsafe" block
-fn bad2() { unsafe { bad1() } }          //~ ERROR: unnecessary "unsafe" block
-unsafe fn bad4() { unsafe {} }           //~ ERROR: unnecessary "unsafe" block
-fn bad5() { unsafe { do callback {} } }  //~ ERROR: unnecessary "unsafe" block
+fn bad1() { unsafe {} }                  //~ ERROR: unnecessary `unsafe` block
+fn bad2() { unsafe { bad1() } }          //~ ERROR: unnecessary `unsafe` block
+unsafe fn bad4() { unsafe {} }           //~ ERROR: unnecessary `unsafe` block
+fn bad5() { unsafe { do callback {} } }  //~ ERROR: unnecessary `unsafe` block
 
 unsafe fn good0() { libc::exit(1) }
 fn good1() { unsafe { libc::exit(1) } }