about summary refs log tree commit diff
path: root/src/libstd/util.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-01-03 12:16:48 -0800
committerbors <bors@rust-lang.org>2014-01-03 12:16:48 -0800
commit08321f1c49d75e60a2c56320a3f1483e7bf79a91 (patch)
treefd429cf0c3cd63379bef08c36fd9acf0f3e0d82a /src/libstd/util.rs
parent11ce6b709ace233e473eddb26e3e23c2c4c16cdd (diff)
parent4bea679dbe3ba98049ac700d84ad48271753ce40 (diff)
auto merge of #11149 : alexcrichton/rust/remove-either, r=brson
Had to change some stuff in typeck to bootstrap (getting methods in fmt off of Either), but other than that not so painful.

Closes #9157
Diffstat (limited to 'src/libstd/util.rs')
-rw-r--r--src/libstd/util.rs10
1 files changed, 0 insertions, 10 deletions
diff --git a/src/libstd/util.rs b/src/libstd/util.rs
index d12d61ed46c..6c0424b50e1 100644
--- a/src/libstd/util.rs
+++ b/src/libstd/util.rs
@@ -82,7 +82,6 @@ mod tests {
     use clone::Clone;
     use ops::Drop;
     use option::{None, Some};
-    use either::{Either, Left, Right};
     use mem::size_of;
 
     #[test]
@@ -112,15 +111,6 @@ mod tests {
     }
 
     #[test]
-    fn test_uninhabited() {
-        let could_only_be_coin : Either <Void, ()> = Right (());
-        match could_only_be_coin {
-            Right (coin) => coin,
-            Left (is_void) => is_void.uninhabited ()
-        }
-    }
-
-    #[test]
     fn test_noncopyable() {
         assert_eq!(size_of::<NonCopyable>(), 0);