Avoid triggering rust-lang/rust#26709

thepowersgang · Jul 1, 2015 · 44bd884 · 44bd884
1 parent edb324e
commit 44bd884
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/Kernel/Core/lib/mem/aref.rs b/Kernel/Core/lib/mem/aref.rs
@@ -62,8 +62,12 @@ impl<T: ?Sized> ops::Deref for Aref<T>
 		&self.__inner.data
 	}
 }
-
-//impl ArefBorrow<Any>
+impl<T: ?Sized> ops::Drop for Aref<T>
+{
+	fn drop(&mut self) {
+		assert_eq!(self.__inner.count.load(Ordering::Relaxed), 0);
+	}
+}
 
 impl<T> ArefInner<T>
 {
@@ -95,12 +99,6 @@ impl<T: ?Sized> ops::Deref for ArefInner<T>
 		&self.data
 	}
 }
-impl<T: ?Sized> ops::Drop for ArefInner<T>
-{
-	fn drop(&mut self) {
-		assert_eq!(self.count.load(Ordering::Relaxed), 0);
-	}
-}
 
 
 impl<T: ?Sized> ArefBorrow<T>

diff --git a/Kernel/Makefile b/Kernel/Makefile
@@ -31,7 +31,7 @@ $(warning $(foreach m,$(MODS), $(addsuffix .o,$(call fn_moddeps,$m)) ))
 EOBJS := $(foreach m,$(MODS), $(addsuffix .o,$(call fn_moddeps,$m)) )
 OBJS += $(EOBJS)
 
-PREFIX := ../.prefix/
+PREFIX ?= ../.prefix/
 rustcmd = LD_LIBRARY_PATH=$(PREFIX)lib/ $(PREFIX)bin/$1
 RUSTC := $(call rustcmd,rustc)
 RUSTDOC := $(call rustcmd,rustdoc)
@@ -68,6 +68,7 @@ RUSTFLAGS += -C no-vectorize-slp
 RUSTFLAGS += --cfg arch__$(ARCH)
 RUSTFLAGS += -L bin/plugins/
 RUSTFLAGS += --cfg nightly --cfg no_std
+#RUSTFLAGS += -C save-temps
 ifeq ($(USE_ACPICA),1)
 	RUSTFLAGS += --cfg use_acpica
 endif