---

yaml
---
r: 166523
b: refs/heads/snap-stage3
c: 5b0c8ac
h: refs/heads/master
i:
  166521: 61cea80
  166519: ddaa866
v: v3

Author: Jorge Aparicio

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 18842f89f084c52588fe7cffe07f87bf6e90796a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 4a4c89c7a4a763c253a97ff04647f52aca6a5490
+refs/heads/snap-stage3: 5b0c8acd69ba3e9e8bc84161f89f716b01e7c523
 refs/heads/try: f5d619caf9f32458680fae55526b99582ca682dd
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/mk/rt.mk

@@ -180,7 +180,7 @@ $$(JEMALLOC_LOCAL_$(1)): $$(JEMALLOC_DEPS) $$(MKFILE_DEPS)
 		AR="$$(AR_$(1))" \
 		RANLIB="$$(AR_$(1)) s" \
 		CPPFLAGS="-I $(S)src/rt/" \
-		EXTRA_CFLAGS="-g1 -ffunction-sections -fdata-sections"
+		EXTRA_CFLAGS="-g1"
 	$$(Q)$$(MAKE) -C "$$(JEMALLOC_BUILD_DIR_$(1))" build_lib_static
 
 ifeq ($$(CFG_DISABLE_JEMALLOC),)

branches/snap-stage3/src/liballoc/arc.rs

@@ -117,10 +117,6 @@ pub struct Arc<T> {
     _ptr: *mut ArcInner<T>,
 }
 
-unsafe impl<T: Sync + Send> Send for Arc<T> { }
-unsafe impl<T: Sync + Send> Sync for Arc<T> { }
-
-
 /// A weak pointer to an `Arc`.
 ///
 /// Weak pointers will not keep the data inside of the `Arc` alive, and can be used to break cycles
@@ -133,19 +129,13 @@ pub struct Weak<T> {
     _ptr: *mut ArcInner<T>,
 }
 
-unsafe impl<T: Sync + Send> Send for Weak<T> { }
-unsafe impl<T: Sync + Send> Sync for Weak<T> { }
-
 struct ArcInner<T> {
     strong: atomic::AtomicUint,
     weak: atomic::AtomicUint,
     data: T,
 }
 
-unsafe impl<T: Sync + Send> Send for ArcInner<T> {}
-unsafe impl<T: Sync + Send> Sync for ArcInner<T> {}
-
-impl<T> Arc<T> {
+impl<T: Sync + Send> Arc<T> {
     /// Constructs a new `Arc<T>`.
     ///
     /// # Examples
@@ -597,7 +587,6 @@ mod tests {
     use std::str::Str;
     use std::sync::atomic;
     use std::task;
-    use std::kinds::Send;
     use std::vec::Vec;
     use super::{Arc, Weak, weak_count, strong_count};
     use std::sync::Mutex;

branches/snap-stage3/src/liballoc/boxed.rs

@@ -19,7 +19,6 @@ use core::hash::{mod, Hash};
 use core::kinds::Sized;
 use core::mem;
 use core::option::Option;
-use core::ptr::Unique;
 use core::raw::TraitObject;
 use core::result::Result;
 use core::result::Result::{Ok, Err};
@@ -45,7 +44,7 @@ pub static HEAP: () = ();
 /// A type that represents a uniquely-owned value.
 #[lang = "owned_box"]
 #[unstable = "custom allocators will add an additional type parameter (with default)"]
-pub struct Box<T>(Unique<T>);
+pub struct Box<T>(*mut T);
 
 #[stable]
 impl<T: Default> Default for Box<T> {