---

yaml
---
r: 60323
b: refs/heads/master
c: 03f75b6
h: refs/heads/master
i:
  60321: c2b4796
  60319: 71a2d74
v: v3

Author: emberian

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: c30414f980eb3e8010640f6c83a5ef6f8e6ab047
+refs/heads/master: 03f75b629a5d1d8e0a5916abdef4499f0c7c61d6
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589

trunk/src/librustc/middle/resolve.rs

@@ -2593,7 +2593,12 @@ pub impl Resolver {
         let start_index;
         match module_prefix_result {
             Failed => {
-                self.session.span_err(span, ~"unresolved name");
+                let mpath = self.idents_to_str(module_path);
+                let idx = str::rfind(self.idents_to_str(module_path), |c| { c == ':' }).unwrap();
+                self.session.span_err(span, fmt!("unresolved import: could not find `%s` in `%s`",
+                                                 str::substr(mpath, idx, mpath.len() - idx),
+                                                 // idx - 1 to account for the extra semicolon
+                                                 str::substr(mpath, 0, idx - 1)));
                 return Failed;
             }
             Indeterminate => {

trunk/src/libstd/num/bigint.rs

@@ -17,7 +17,7 @@ A BigInt is a combination of BigUint and Sign.
 */
 
 use core::cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
-use core::num::{IntConvertible, Zero, One, ToStrRadix, FromStrRadix, Orderable};
+use core::num::{IntConvertible, Zero, One, ToStrRadix, FromStrRadix};
 
 /**
 A BigDigit is a BigUint's composing element.
@@ -144,26 +144,6 @@ impl FromStr for BigUint {
     }
 }
 
-impl Num for BigUint {}
-
-impl Orderable for BigUint {
-    #[inline(always)]
-    fn min(&self, other: &BigUint) -> BigUint {
-        if self < other { self.clone() } else { other.clone() }
-    }
-
-    #[inline(always)]
-    fn max(&self, other: &BigUint) -> BigUint {
-        if self > other { self.clone() } else { other.clone() }
-    }
-
-    #[inline(always)]
-    fn clamp(&self, mn: &BigUint, mx: &BigUint) -> BigUint {
-        if self > mx { mx.clone() } else
-        if self < mn { mn.clone() } else { self.clone() }
-    }
-}
-
 impl Shl<uint, BigUint> for BigUint {
     #[inline(always)]
     fn shl(&self, rhs: &uint) -> BigUint {
@@ -808,26 +788,6 @@ impl FromStr for BigInt {
     }
 }
 
-impl Num for BigInt {}
-
-impl Orderable for BigInt {
-    #[inline(always)]
-    fn min(&self, other: &BigInt) -> BigInt {
-        if self < other { self.clone() } else { other.clone() }
-    }
-
-    #[inline(always)]
-    fn max(&self, other: &BigInt) -> BigInt {
-        if self > other { self.clone() } else { other.clone() }
-    }
-
-    #[inline(always)]
-    fn clamp(&self, mn: &BigInt, mx: &BigInt) -> BigInt {
-        if self > mx { mx.clone() } else
-        if self < mn { mn.clone() } else { self.clone() }
-    }
-}
-
 impl Shl<uint, BigInt> for BigInt {
     #[inline(always)]
     fn shl(&self, rhs: &uint) -> BigInt {