Resolve merge conflict with PR rust-lang#1643

das-sein · Feb 10, 2019 · d404eff · d404eff
1 parent 9c4de11
commit d404eff
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/rustup-cli/common.rs b/src/rustup-cli/common.rs
@@ -327,7 +327,7 @@ pub enum ComponentFilter {
     None,
 }
 
-pub fn list_components(toolchain: &Toolchain, filter: &ComponentFilter) -> Result<()> {
+pub fn list_components(toolchain: &Toolchain<'_>, filter: &ComponentFilter) -> Result<()> {
     let mut t = term2::stdout();
     let components = toolchain
         .list_components()?