From 65805bffe7524a79de6e275d6d9172f6e5ff99eb Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Thu, 6 Nov 2014 13:54:32 -0800
Subject: [PATCH] Test fixes and rebase conflicts

---
 src/libstd/rand/os.rs    | 2 +-
 src/libunicode/tables.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs
index e648a61851639..6bf259d201e6c 100644
--- a/src/libstd/rand/os.rs
+++ b/src/libstd/rand/os.rs
@@ -22,7 +22,7 @@ mod imp {
     use rand::Rng;
     use rand::reader::ReaderRng;
     use result::{Ok, Err};
-    use slice::{ImmutableSlice, MutableSlice};
+    use slice::SlicePrelude;
     use mem;
     use os::errno;
 
diff --git a/src/libunicode/tables.rs b/src/libunicode/tables.rs
index c665ac3748bea..797523540492c 100644
--- a/src/libunicode/tables.rs
+++ b/src/libunicode/tables.rs
@@ -10,7 +10,7 @@
 
 // NOTE: The following code was generated by "src/etc/unicode.py", do not edit directly
 
-#![allow(missing_docs, non_uppercase_globals, non_snake_case)]
+#![allow(missing_docs, non_upper_case_globals, non_snake_case)]
 
 /// The version of [Unicode](http://www.unicode.org/)
 /// that the `UnicodeChar` and `UnicodeStrPrelude` traits are based on.