auto merge of #12272 : alexcrichton/rust/snapshot, r=kballard

This notably contains the `extern mod` => `extern crate` change.

Closes #9880

2 files changed, 0 insertions, 14 deletions

diff --git a/src/libstd/rt/env.rs b/src/libstd/rt/env.rs
index 571ed77592f..94f56d42613 100644
--- a/src/libstd/rt/env.rs
+++ b/src/libstd/rt/env.rs
@@ -10,8 +10,6 @@
 
 //! Runtime environment settings
 
-// NOTE: remove `POISON_ON_FREE` after a snapshot
-
 use from_str::from_str;
 use option::{Some, None};
 use os;
@@ -23,7 +21,6 @@ static mut MIN_STACK: uint = 2 * 1024 * 1024;
 /// This default corresponds to 20M of cache per scheduler (at the default size).
 static mut MAX_CACHED_STACKS: uint = 10;
 static mut DEBUG_BORROW: bool = false;
-static mut POISON_ON_FREE: bool = false;
 
 pub fn init() {
     unsafe {
@@ -43,10 +40,6 @@ pub fn init() {
             Some(_) => DEBUG_BORROW = true,
             None => ()
         }
-        match os::getenv("RUST_POISON_ON_FREE") {
-            Some(_) => POISON_ON_FREE = true,
-            None => ()
-        }
     }
 }
 
@@ -61,7 +54,3 @@ pub fn max_cached_stacks() -> uint {
 pub fn debug_borrow() -> bool {
     unsafe { DEBUG_BORROW }
 }
-
-pub fn poison_on_free() -> bool {
-    unsafe { POISON_ON_FREE }
-}
diff --git a/src/libstd/rt/local_heap.rs b/src/libstd/rt/local_heap.rs
index 7acce2ecb5b..f3474b9401e 100644
--- a/src/libstd/rt/local_heap.rs
+++ b/src/libstd/rt/local_heap.rs
@@ -17,7 +17,6 @@ use ops::Drop;
 use option::{Option, None, Some};
 use ptr;
 use ptr::RawPtr;
-use rt::env;
 use rt::global_heap;
 use rt::local::Local;
 use rt::task::Task;
@@ -41,7 +40,6 @@ pub struct MemoryRegion {
 pub struct LocalHeap {
     priv memory_region: MemoryRegion,
 
-    priv poison_on_free: bool,
     priv live_allocs: *mut raw::Box<()>,
 }
 
@@ -54,7 +52,6 @@ impl LocalHeap {
         };
         LocalHeap {
             memory_region: region,
-            poison_on_free: env::poison_on_free(),
             live_allocs: ptr::mut_null(),
         }
     }