---

dwrensha · dwrensha · commit 19a593896074 · 2013-10-05T20:28:09.000-04:00
yaml --- r: 82939 b: refs/heads/auto c: 3b26bb9 h: refs/heads/master i: 82937: 2f9d27d 82935: 3c40d16 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: 549f70989e3423642bacc41bb6c58ed81d591c03
+refs/heads/auto: 3b26bb9022e057084f357bafbcda39cab4cda55f
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
diff --git a/branches/auto/src/libextra/time.rs b/branches/auto/src/libextra/time.rs
@@ -600,6 +600,8 @@ pub fn strptime(s: &str, format: &str) -> Result<Tm, ~str> {
               None => Err(~"Invalid day of week")
             }
           }
+          //'X' {}
+          //'x' {}
           'Y' => {
             match match_digits(s, pos, 4u, false) {
               Some(item) => {
diff --git a/branches/auto/src/librustc/middle/typeck/check/regionmanip.rs b/branches/auto/src/librustc/middle/typeck/check/regionmanip.rs
@@ -32,10 +32,6 @@ pub fn replace_bound_regions_in_fn_sig(
 {
     let mut all_tys = ty::tys_in_fn_sig(fn_sig);
 
-    for &self_ty in opt_self_ty.iter() {
-        all_tys.push(self_ty);
-    }
-
     for &t in opt_self_ty.iter() { all_tys.push(t) }
 
     debug2!("replace_bound_regions_in_fn_sig(self_ty={:?}, fn_sig={}, \

Original file line number	Diff line number	Diff line change
`@@ -600,6 +600,8 @@ pub fn strptime(s: &str, format: &str) -> Result<Tm, ~str> {`
`600`	`600`	`None => Err(~"Invalid day of week")`
`601`	`601`	`}`
`602`	`602`	`}`
	`603`	`+ //'X' {}`
	`604`	`+ //'x' {}`
`603`	`605`	`'Y' => {`
`604`	`606`	`match match_digits(s, pos, 4u, false) {`
`605`	`607`	`Some(item) => {`
Original file line number	Diff line number	Diff line change
`@@ -32,10 +32,6 @@ pub fn replace_bound_regions_in_fn_sig(`
`32`	`32`	`{`
`33`	`33`	`let mut all_tys = ty::tys_in_fn_sig(fn_sig);`
`34`	`34`
`35`		`- for &self_ty in opt_self_ty.iter() {`
`36`		`- all_tys.push(self_ty);`
`37`		`- }`
`38`		`-`
`39`	`35`	`for &t in opt_self_ty.iter() { all_tys.push(t) }`
`40`	`36`
`41`	`37`	`debug2!("replace_bound_regions_in_fn_sig(self_ty={:?}, fn_sig={}, \`