---

yaml
---
r: 139050
b: refs/heads/try2
c: deeeaf0
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: b53da4b9dd977fdffba3f10e570d7c025238dec3
+refs/heads/try2: deeeaf0ddbe3c5244442f3d12d0eaed512d65e75
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libcore/cleanup.rs

@@ -145,7 +145,11 @@ unsafe fn each_live_alloc(f: &fn(box: *mut BoxRepr, uniq: bool) -> bool) {
 
 #[cfg(unix)]
 fn debug_mem() -> bool {
-    ::rt::env::get().debug_mem
+    use os;
+    use libc;
+    do os::as_c_charp("RUST_DEBUG_MEM") |p| {
+        unsafe { libc::getenv(p) != null() }
+    }
 }
 
 #[cfg(windows)]

branches/try2/src/libcore/rt/env.rs

@@ -45,4 +45,3 @@ mod work_queue;
 mod stack;
 mod context;
 mod thread;
-pub mod env;

branches/try2/src/libcore/rt/mod.rs

@@ -59,7 +59,19 @@ fn is_visible(srv: astsrv::Srv, doc: doc::ItemDoc) -> bool {
     do astsrv::exec(srv) |ctxt| {
         match ctxt.ast_map.get(&id) {
             ast_map::node_item(item, _) => {
-                item.vis == ast::public
+                match item.node {
+                    ast::item_impl(_, Some(_), _, _) => {
+                        // This is a trait implementation, make it visible
+                        // NOTE: This is not quite right since this could be an impl
+                        // of a private trait. We can't know that without running
+                        // resolve though.
+                        true
+                    }
+                    _ => {
+                        // Otherwise just look at the visibility
+                        item.vis == ast::public
+                    }
+                }
             }
             _ => util::unreachable()
         }
@@ -72,6 +84,16 @@ fn should_prune_items_without_pub_modifier() {
     fail_unless!(vec::is_empty(doc.cratemod().mods()));
 }
 
+#[test]
+fn unless_they_are_trait_impls() {
+    let doc = test::mk_doc(
+        ~" \
+          trait Foo { } \
+          impl Foo for int { } \
+          ");
+    fail_unless!(!doc.cratemod().impls().is_empty());
+}
+
 #[cfg(test)]
 pub mod test {
     use astsrv;

branches/try2/src/librustdoc/prune_private_pass.rs

@@ -876,11 +876,6 @@ rust_dbg_extern_identity_u8(char u) {
     return u;
 }
 
-extern "C" rust_env*
-rust_get_rt_env() {
-    rust_task *task = rust_get_current_task();
-    return task->kernel->env;
-}
 
 //
 // Local Variables:

branches/try2/src/rt/rust_builtin.cpp

@@ -23,7 +23,6 @@
 #define DETAILED_LEAKS "DETAILED_LEAKS"
 #define RUST_SEED "RUST_SEED"
 #define RUST_POISON_ON_FREE "RUST_POISON_ON_FREE"
-#define RUST_DEBUG_MEM "RUST_DEBUG_MEM"
 
 #if defined(__WIN32__)
 static int
@@ -129,7 +128,6 @@ load_env(int argc, char **argv) {
     env->poison_on_free = getenv(RUST_POISON_ON_FREE) != NULL;
     env->argc = argc;
     env->argv = argv;
-    env->debug_mem = getenv(RUST_DEBUG_MEM) != NULL;
     return env;
 }
 

branches/try2/src/rt/rust_env.cpp

@@ -14,20 +14,16 @@
 
 #include "rust_globals.h"
 
-// Avoiding 'bool' type here since I'm not sure it has a standard size
-typedef uint8_t rust_bool;
-
 struct rust_env {
     size_t num_sched_threads;
     size_t min_stack_size;
     size_t max_stack_size;
     char* logspec;
-    rust_bool detailed_leaks;
+    bool detailed_leaks;
     char* rust_seed;
-    rust_bool poison_on_free;
+    bool poison_on_free;
     int argc;
     char **argv;
-    rust_bool debug_mem;
 };
 
 rust_env* load_env(int argc, char **argv);

branches/try2/src/rt/rust_env.h

@@ -201,4 +201,3 @@ rust_dbg_extern_identity_u64
 rust_dbg_extern_identity_TwoU64s
 rust_dbg_extern_identity_double
 rust_dbg_extern_identity_u8
-rust_get_rt_env