---

emberian · alexcrichton · commit e79573b2fe3a · 2014-03-18T13:47:42.000-07:00
yaml --- r: 106058 b: refs/heads/auto c: f9e0baa h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 1607871dc2a5240177865210822238f66c1dfb2e
+refs/heads/auto: f9e0baa19a33c2b98f502d9604dabacd8f634965
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/libserialize/json.rs b/branches/auto/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/auto/src/libstd/str.rs b/branches/auto/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;`