---

yaml
---
r: 153047
b: refs/heads/try2
c: 497ecd0
h: refs/heads/master
i:
  153045: 11646dc
  153043: 46adb40
  153039: 357a267
v: v3

Author: alexcrichton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 0aa23ed18a927aad6578d7a23183275239deb2be
+refs/heads/try2: 497ecd04585159bf56a6a38315e9adb3877ece04
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libnum/rational.rs

@@ -274,17 +274,12 @@ impl<T: Clone + Integer + PartialOrd>
     Num for Ratio<T> {}
 
 /* String conversions */
-impl<T: fmt::Show + Eq + One> fmt::Show for Ratio<T> {
-    /// Renders as `numer/denom`. If denom=1, renders as numer.
+impl<T: fmt::Show> fmt::Show for Ratio<T> {
+    /// Renders as `numer/denom`.
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        if self.denom == One::one() {
-            write!(f, "{}", self.numer)
-        } else {
-            write!(f, "{}/{}", self.numer, self.denom)
-        }
+        write!(f, "{}/{}", self.numer, self.denom)
     }
 }
-
 impl<T: ToStrRadix> ToStrRadix for Ratio<T> {
     /// Renders as `numer/denom` where the numbers are in base `radix`.
     fn to_str_radix(&self, radix: uint) -> String {
@@ -296,20 +291,21 @@ impl<T: ToStrRadix> ToStrRadix for Ratio<T> {
 
 impl<T: FromStr + Clone + Integer + PartialOrd>
     FromStr for Ratio<T> {
-    /// Parses `numer/denom` or just `numer`
+    /// Parses `numer/denom`.
     fn from_str(s: &str) -> Option<Ratio<T>> {
-        let mut split = s.splitn('/', 1);
-
-        let num = split.next().and_then(|n| FromStr::from_str(n));
-        let den = split.next().or(Some("1")).and_then(|d| FromStr::from_str(d));
-
-        match (num, den) {
-            (Some(n), Some(d)) => Some(Ratio::new(n, d)),
-            _ => None
+        let split: Vec<&str> = s.splitn('/', 1).collect();
+        if split.len() < 2 {
+            return None
         }
+        let a_option: Option<T> = FromStr::from_str(*split.get(0));
+        a_option.and_then(|a| {
+            let b_option: Option<T> = FromStr::from_str(*split.get(1));
+            b_option.and_then(|b| {
+                Some(Ratio::new(a.clone(), b.clone()))
+            })
+        })
     }
 }
-
 impl<T: FromStrRadix + Clone + Integer + PartialOrd>
     FromStrRadix for Ratio<T> {
     /// Parses `numer/denom` where the numbers are in base `radix`.
@@ -433,13 +429,6 @@ mod test {
         assert!(!_neg1_2.is_integer());
     }
 
-    #[test]
-    fn test_show() {
-        assert_eq!(format!("{}", _2), "2".to_string());
-        assert_eq!(format!("{}", _1_2), "1/2".to_string());
-        assert_eq!(format!("{}", _0), "0".to_string());
-        assert_eq!(format!("{}", Ratio::from_integer(-2i)), "-2".to_string());
-    }
 
     mod arith {
         use super::{_0, _1, _2, _1_2, _3_2, _neg1_2, to_big};
@@ -573,11 +562,11 @@ mod test {
             assert_eq!(FromStr::from_str(s.as_slice()), Some(r));
             assert_eq!(r.to_str(), s);
         }
-        test(_1, "1".to_string());
-        test(_0, "0".to_string());
+        test(_1, "1/1".to_string());
+        test(_0, "0/1".to_string());
         test(_1_2, "1/2".to_string());
         test(_3_2, "3/2".to_string());
-        test(_2, "2".to_string());
+        test(_2, "2/1".to_string());
         test(_neg1_2, "-1/2".to_string());
     }
     #[test]

branches/try2/src/librustc/middle/trans/callee.rs

@@ -261,7 +261,7 @@ pub fn trans_unboxing_shim(bcx: &Block,
     let function_type =
         ty::mk_bare_fn(tcx, method.fty.clone()).subst(tcx, &substs);
 
-    let function_name = tcx.map.with_path(method_id.node, |path| {
+    let function_name = ty::with_path(tcx, method_id, |path| {
         link::mangle_internal_name_by_path_and_seq(path, "unboxing_shim")
     });
     let llfn = decl_internal_rust_fn(ccx,