Fix for language changes.

chris-morgan · chris-morgan · commit b381ace9b9aa · 2013-11-30T10:33:13.000+11:00
diff --git a/src/examples/server/request_uri/main.rs b/src/examples/server/request_uri/main.rs
@@ -66,7 +66,7 @@ impl Server for RequestUriServer {
         w.write(bytes!("<!DOCTYPE html><title>Rust HTTP server</title>"));
 
         match r.request_uri {
-            Star | Authority(*) => {
+            Star | Authority(_) => {
                 w.status = BadRequest;
                 // Actually, valid for the CONNECT method.
             },
diff --git a/src/http/client/request.rs b/src/http/client/request.rs
@@ -120,7 +120,7 @@ impl<S: Reader + Writer> RequestWriter<S> {
             let addrs = addrs.unwrap();
             let addr = addrs.move_iter().find(|&a| {
                 match a {
-                    Ipv4Addr(*) => true,
+                    Ipv4Addr(..) => true,
                     _ => false
                 }
             });
diff --git a/src/http/headers/mod.rs b/src/http/headers/mod.rs
@@ -708,17 +708,17 @@ impl HeaderConvertible for Tm {
         // XXX: %Z actually ignores any timezone other than UTC. Probably not a good idea?
         match strptime(value, "%a, %d %b %Y %T %Z") {  // RFC 822, updated by RFC 1123
             Ok(time) => return Some(time),
-            Err(*) => ()
+            Err(_) => ()
         }
 
         match strptime(value, "%A, %d-%b-%y %T %Z") {  // RFC 850, obsoleted by RFC 1036
             Ok(time) => return Some(time),
-            Err(*) => ()
+            Err(_) => ()
         }
 
         match strptime(value, "%c") {  // ANSI C's asctime() format
             Ok(time) => Some(time),
-            Err(*) => None
+            Err(_) => None
         }
     }
 
@@ -958,7 +958,7 @@ macro_rules! headers_mod {
                 fn header_name(&self) -> ~str {
                     match *self {
                         // FIXME: $output_name is "...", I want ~"..." rather than "...".to_owned()
-                        $($caps_ident(*) => $output_name.to_owned(),)*
+                        $($caps_ident(_) => $output_name.to_owned(),)*
                         ExtensionHeader(ref name, _) => name.to_owned(),
                     }
                 }
@@ -990,14 +990,14 @@ macro_rules! headers_mod {
                     }
 
                     writer.write(match *self {
-                        $($caps_ident(*) => bytes!($output_name, ": "),)*
-                        ExtensionHeader(*) => unreachable!(),  // Already returned
+                        $($caps_ident(_) => bytes!($output_name, ": "),)*
+                        ExtensionHeader(..) => unreachable!(),  // Already returned
                     });
 
                     // FIXME: all the `h` cases satisfy HeaderConvertible, can it be simplified?
                     match *self {
                         $($caps_ident(ref h) => h.to_stream(writer),)*
-                        ExtensionHeader(*) =>     unreachable!(),  // Already returned
+                        ExtensionHeader(..) => unreachable!(),  // Already returned
                     };
                     writer.write(bytes!("\r\n"));
                 }

Original file line number	Diff line number	Diff line change
`@@ -120,7 +120,7 @@ impl<S: Reader + Writer> RequestWriter<S> {`
`120`	`120`	`let addrs = addrs.unwrap();`
`121`	`121`	`let addr = addrs.move_iter().find(\|&a\| {`
`122`	`122`	`match a {`
`123`		`- Ipv4Addr(*) => true,`
	`123`	`+ Ipv4Addr(..) => true,`
`124`	`124`	`_ => false`
`125`	`125`	`}`
`126`	`126`	`});`
Original file line number	Diff line number	Diff line change
`@@ -708,17 +708,17 @@ impl HeaderConvertible for Tm {`
`708`	`708`	`// XXX: %Z actually ignores any timezone other than UTC. Probably not a good idea?`
`709`	`709`	`match strptime(value, "%a, %d %b %Y %T %Z") { // RFC 822, updated by RFC 1123`
`710`	`710`	`Ok(time) => return Some(time),`
`711`		`- Err(*) => ()`
	`711`	`+ Err(_) => ()`
`712`	`712`	`}`
`713`	`713`
`714`	`714`	`match strptime(value, "%A, %d-%b-%y %T %Z") { // RFC 850, obsoleted by RFC 1036`
`715`	`715`	`Ok(time) => return Some(time),`
`716`		`- Err(*) => ()`
	`716`	`+ Err(_) => ()`
`717`	`717`	`}`
`718`	`718`
`719`	`719`	`match strptime(value, "%c") { // ANSI C's asctime() format`
`720`	`720`	`Ok(time) => Some(time),`
`721`		`- Err(*) => None`
	`721`	`+ Err(_) => None`
`722`	`722`	`}`
`723`	`723`	`}`
`724`	`724`
`@@ -958,7 +958,7 @@ macro_rules! headers_mod {`
`958`	`958`	`fn header_name(&self) -> ~str {`
`959`	`959`	`match *self {`
`960`	`960`	`// FIXME: $output_name is "...", I want ~"..." rather than "...".to_owned()`
`961`		`- $($caps_ident() => $output_name.to_owned(),)`
	`961`	`+ $($caps_ident(_) => $output_name.to_owned(),)*`
`962`	`962`	`ExtensionHeader(ref name, _) => name.to_owned(),`
`963`	`963`	`}`
`964`	`964`	`}`
`@@ -990,14 +990,14 @@ macro_rules! headers_mod {`
`990`	`990`	`}`
`991`	`991`
`992`	`992`	`writer.write(match *self {`
`993`		`- $($caps_ident() => bytes!($output_name, ": "),)`
`994`		`- ExtensionHeader(*) => unreachable!(), // Already returned`
	`993`	`+ $($caps_ident(_) => bytes!($output_name, ": "),)*`
	`994`	`+ ExtensionHeader(..) => unreachable!(), // Already returned`
`995`	`995`	`});`
`996`	`996`
`997`	`997`	// FIXME: all the `h` cases satisfy HeaderConvertible, can it be simplified?
`998`	`998`	`match *self {`
`999`	`999`	`$($caps_ident(ref h) => h.to_stream(writer),)*`
`1000`		`- ExtensionHeader(*) => unreachable!(), // Already returned`
	`1000`	`+ ExtensionHeader(..) => unreachable!(), // Already returned`
`1001`	`1001`	`};`
`1002`	`1002`	`writer.write(bytes!("\r\n"));`
`1003`	`1003`	`}`