---

yaml
---
r: 64603
b: refs/heads/snap-stage3
c: 23b7ee2
h: refs/heads/master
i:
  64601: 47d7b81
  64599: d177051
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 6174f9a4d9dc48f9988cd252f4fea8b319020298
+refs/heads/snap-stage3: 23b7ee2bda12f6518d480c29e9673ed2c592c5f3
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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/snap-stage3/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/snap-stage3/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/snap-stage3/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/snap-stage3/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