Do not treat cargo-metadata features as exclusive

This tracks a patch in cargo-metadata that lets us call features()
more than once to express more complex feature configurations.
We introduced the change in cargo-metadata 0.10.1, but this commit
jumps us to 0.11.

Author: mciantyre

Cargo.toml

@@ -15,7 +15,7 @@ repository = "https://github.com/rust-embedded/cargo-binutils/"
 version = "0.3.0"
 
 [dependencies]
-cargo_metadata = "0.10"
+cargo_metadata = "0.11"
 clap = "2.33"
 regex = "1.3"
 rustc-cfg = "0.4"

src/lib.rs

@@ -280,9 +280,11 @@ pub fn run(tool: Tool, matches: ArgMatches) -> Result<i32> {
         metadata_command.features(CargoOpt::SomeFeatures(
             features.map(|s| s.to_owned()).collect(),
         ));
-    } else if matches.is_present("no-default-features") {
+    }
+    if matches.is_present("no-default-features") {
         metadata_command.features(CargoOpt::NoDefaultFeatures);
-    } else if matches.is_present("all-features") {
+    }
+    if matches.is_present("all-features") {
         metadata_command.features(CargoOpt::AllFeatures);
     }
     let metadata = metadata_command.exec()?;