---

emberian · alexcrichton · commit 0db1f02c5767 · 2014-03-18T13:47:42.000-07:00
yaml --- r: 150058 b: refs/heads/try2 c: f9e0baa h: refs/heads/master v: v3
diff --git a/[refs] b/[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: 1607871dc2a5240177865210822238f66c1dfb2e
+refs/heads/try2: f9e0baa19a33c2b98f502d9604dabacd8f634965
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
diff --git a/branches/try2/src/libserialize/json.rs b/branches/try2/src/libserialize/json.rs
@@ -1312,7 +1312,7 @@ impl ::Decoder for Decoder {
             value => self.expected("number", &value)
         }
     }
-    fn read_f32(&mut self) -> f32 { self.read_f64() as f32 }
+
     fn read_f32(&mut self) -> f32 { self.read_f64() as f32 }
 
     fn read_char(&mut self) -> char {
diff --git a/branches/try2/src/libstd/str.rs b/branches/try2/src/libstd/str.rs
@@ -2664,9 +2664,6 @@ impl<'a> StrSlice<'a> for &'a str {
         return multibyte_char_range_at(*self, i);
     }
 
-    #[inline]
-    fn char_at(&self, i: uint) -> char { self.char_range_at(i).ch }
-
     #[inline]
     fn char_range_at_reverse(&self, start: uint) -> CharRange {
         let mut prev = start;

Original file line number	Diff line number	Diff line change
`@@ -1312,7 +1312,7 @@ impl ::Decoder for Decoder {`
`1312`	`1312`	`value => self.expected("number", &value)`
`1313`	`1313`	`}`
`1314`	`1314`	`}`
`1315`		`- fn read_f32(&mut self) -> f32 { self.read_f64() as f32 }`
	`1315`	`+`
`1316`	`1316`	`fn read_f32(&mut self) -> f32 { self.read_f64() as f32 }`
`1317`	`1317`
`1318`	`1318`	`fn read_char(&mut self) -> char {`
Original file line number	Diff line number	Diff line change
`@@ -2664,9 +2664,6 @@ impl<'a> StrSlice<'a> for &'a str {`
`2664`	`2664`	`return multibyte_char_range_at(*self, i);`
`2665`	`2665`	`}`
`2666`	`2666`
`2667`		`- #[inline]`
`2668`		`- fn char_at(&self, i: uint) -> char { self.char_range_at(i).ch }`
`2669`		`-`
`2670`	`2667`	`#[inline]`
`2671`	`2668`	`fn char_range_at_reverse(&self, start: uint) -> CharRange {`
`2672`	`2669`	`let mut prev = start;`