---

dwrensha · dwrensha · commit 2226bd9ccbec · 2013-10-05T20:28:09.000-04:00
yaml --- r: 83729 b: refs/heads/try c: 3b26bb9 h: refs/heads/master i: 83727: 7669aa7 v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 0e4d1fc8cae42e15e00f71d9f439b01bb25a86ae
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
-refs/heads/try: 549f70989e3423642bacc41bb6c58ed81d591c03
+refs/heads/try: 3b26bb9022e057084f357bafbcda39cab4cda55f
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
diff --git a/branches/try/src/libextra/time.rs b/branches/try/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/try/src/librustc/middle/typeck/check/regionmanip.rs b/branches/try/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={}, \`