---

yaml
---
r: 69230
b: refs/heads/auto
c: 23b7ee2
h: refs/heads/master
v: v3

Author: brson

[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: 6174f9a4d9dc48f9988cd252f4fea8b319020298
+refs/heads/auto: 23b7ee2bda12f6518d480c29e9673ed2c592c5f3
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/src/libstd/unstable/global.rs

@@ -20,7 +20,6 @@ pub mod at_exit;
 
 pub mod dynamic_lib;
 
-pub mod global;
 pub mod finally;
 pub mod intrinsics;
 pub mod simd;

branches/auto/src/libstd/unstable/mod.rs

@@ -763,12 +763,6 @@ rust_register_exit_function(spawn_fn runner, fn_env_pair *f) {
     task->kernel->register_exit_function(runner, f);
 }
 
-extern "C" intptr_t*
-rust_get_global_data_ptr() {
-    rust_task *task = rust_get_current_task();
-    return &task->kernel->global_data;
-}
-
 #ifndef _WIN32
 #include <sys/types.h>
 #include <dirent.h>

branches/auto/src/rt/rust_builtin.cpp

@@ -33,8 +33,7 @@ rust_kernel::rust_kernel(rust_env *env) :
     non_weak_tasks(0),
     at_exit_runner(NULL),
     at_exit_started(false),
-    env(env),
-    global_data(0)
+    env(env)
 {
     // Create the single threaded scheduler that will run on the platform's
     // main thread

branches/auto/src/rt/rust_kernel.cpp

@@ -124,7 +124,6 @@ class rust_kernel {
 
 public:
     struct rust_env *env;
-    intptr_t global_data;
 
     rust_kernel(rust_env *env);
 

branches/auto/src/rt/rust_kernel.h

@@ -215,7 +215,6 @@ linenoiseHistoryLoad
 rust_raw_thread_start
 rust_raw_thread_join_delete
 rust_register_exit_function
-rust_get_global_data_ptr
 rust_get_rt_tls_key
 swap_registers
 rust_readdir