about summary refs log tree commit diff
path: root/src/rt/rust_env.cpp
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-05-06 17:52:52 -0700
committerbors <bors@rust-lang.org>2013-05-06 17:52:52 -0700
commit05460fcd5a9b2be5055f55965f768b0aa37119d9 (patch)
tree88e3b561606409ab312f933eee2df96a5397e643 /src/rt/rust_env.cpp
parentbd5fd6e42a904723c99383e684ddeaf02f01d972 (diff)
parent39a119074aa27234a68bcf57899c8c4e015cd478 (diff)
downloadrust-05460fcd5a9b2be5055f55965f768b0aa37119d9.tar.gz
rust-05460fcd5a9b2be5055f55965f768b0aa37119d9.zip
auto merge of #6286 : nikomatsakis/rust/issue-5910-dyna-freeze, r=nikomatsakis
This rather sprawling branch refactors the borrow checker and much of the region code, addressing a number of outstanding issues. I will close them manually after validating that there are test cases for each one, but here is a (probably partial) list:

  - #4903: Flow sensitivity
  - #3387: Moves in overloaded operators
  - #3850: Region granularity
  - #4666: Odd loaning errors
  - #6021: borrow check errors with hashmaps
  - #5910: @mut broken

cc #5047

(take 5)
Diffstat (limited to 'src/rt/rust_env.cpp')
-rw-r--r--src/rt/rust_env.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/rt/rust_env.cpp b/src/rt/rust_env.cpp
index 041b4efac52..360d6114928 100644
--- a/src/rt/rust_env.cpp
+++ b/src/rt/rust_env.cpp
@@ -24,6 +24,7 @@
 #define RUST_SEED "RUST_SEED"
 #define RUST_POISON_ON_FREE "RUST_POISON_ON_FREE"
 #define RUST_DEBUG_MEM "RUST_DEBUG_MEM"
+#define RUST_DEBUG_BORROW "RUST_DEBUG_BORROW"
 
 #if defined(__WIN32__)
 static int
@@ -130,6 +131,7 @@ load_env(int argc, char **argv) {
     env->argc = argc;
     env->argv = argv;
     env->debug_mem = getenv(RUST_DEBUG_MEM) != NULL;
+    env->debug_borrow = getenv(RUST_DEBUG_BORROW) != NULL;
     return env;
 }