Merge pull request http-rs#14 from darayus/rustup

alexcrichton · alexcrichton · commit ec1509c8f6a5 · 2015-01-04T23:10:39.000-06:00
Update to rust master
diff --git a/src/lib.rs b/src/lib.rs
@@ -1,3 +1,4 @@
+#![feature(associated_types)]
 #[cfg(test)] extern crate test;
 
 use nfa::NFA;
@@ -75,7 +76,8 @@ impl Params {
     }
 }
 
-impl Index<&'static str, String> for Params {
+impl Index<&'static str> for Params {
+    type Output = String;
     fn index<'a>(&'a self, index: &&'static str) -> &'a String {
         match self.map.get(&index.to_string()) {
             None => panic!(format!("params[{}] did not exist", index)),

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+#![feature(associated_types)]`
`1`	`2`	`#[cfg(test)] extern crate test;`
`2`	`3`
`3`	`4`	`use nfa::NFA;`
`@@ -75,7 +76,8 @@ impl Params {`
`75`	`76`	`}`
`76`	`77`	`}`
`77`	`78`
`78`		`-impl Index<&'static str, String> for Params {`
	`79`	`+impl Index<&'static str> for Params {`
	`80`	`+ type Output = String;`
`79`	`81`	`fn index<'a>(&'a self, index: &&'static str) -> &'a String {`
`80`	`82`	`match self.map.get(&index.to_string()) {`
`81`	`83`	`None => panic!(format!("params[{}] did not exist", index)),`