about summary refs log tree commit diff
path: root/src/rustc/middle/borrowck.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/rustc/middle/borrowck.rs')
-rw-r--r--src/rustc/middle/borrowck.rs9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/rustc/middle/borrowck.rs b/src/rustc/middle/borrowck.rs
index 43ad0c89367..63c0b7003c2 100644
--- a/src/rustc/middle/borrowck.rs
+++ b/src/rustc/middle/borrowck.rs
@@ -20,9 +20,12 @@ fn check_crate(tcx: ty::ctxt,
                crate: @ast::crate) -> (root_map, mutbl_map) {
 
     // big hack to keep this off except when I want it on
-    let msg_level = alt os::getenv("RUST_BORROWCK") {
-      none {tcx.sess.opts.borrowck}
-      some(v) {option::get(uint::from_str(v))}
+    let msg_level = if tcx.sess.opts.borrowck != 0u {
+        tcx.sess.opts.borrowck
+    } else {
+        os::getenv("RUST_BORROWCK").map_default(0u) { |v|
+            option::get(uint::from_str(v))
+        }
     };
 
     let bccx = @{tcx: tcx,