---

yaml
---
r: 5784
b: refs/heads/master
c: b9a9559
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3c68e723857dc9b3b382038ba397bcdcd71074a
+refs/heads/master: b9a9559c910823d7fe06a4d08be461de010830c5

trunk/src/comp/driver/rustc.rs

@@ -264,7 +264,7 @@ options:
     --test             build test harness
     --gc               garbage collect shared data (experimental/temporary)
     --stack-growth     perform stack checks (experimental)
-    --check-unsafe     disallow unsafe actions in non-unsafe functions (temporary option)
+    --check-unsafe     disallow unsafe actions in non-unsafe functions
 
 ");
 }

trunk/src/comp/middle/typeck.rs

@@ -1528,7 +1528,9 @@ fn require_unsafe(sess: session::session, f_purity: ast::purity, sp: span) {
         alt f_purity {
           ast::unsafe_fn. { ret; }
           _ {
-            sess.span_fatal(sp, "Found unsafe expression in safe function decl");
+            sess.span_fatal(
+                sp, 
+                "Found unsafe expression in safe function decl");
           }
         }
     }