Merge pull request #13 from steveklabnik/master

fix breakage from rust-lang/rust#19891
steveklabnik · Dec 29, 2014 · c2b17d8 · c2b17d8
2 parents 7ff1a45 + f99d69e
commit c2b17d8
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/src/subcommand.rs b/src/subcommand.rs
@@ -21,8 +21,11 @@ pub trait Subcommand {
 
 /// Create a Subcommand object based on its name.
 pub fn parse_name(name: &str) -> Option<Box<Subcommand>> {
- for parser in [help::parse_cmd, build::parse_cmd,
- serve::parse_cmd, test::parse_cmd].iter() {
+ for parser in [
+ help::parse_cmd as fn(&str) -> Option<Box<Subcommand>>,
+ build::parse_cmd as fn(&str) -> Option<Box<Subcommand>>,
+ serve::parse_cmd as fn(&str) -> Option<Box<Subcommand>>,
+ test::parse_cmd as fn(&str) -> Option<Box<Subcommand>>].iter() {
  let parsed = (*parser)(name);
  if parsed.is_some() { return parsed }
  }