Skip to content

Commit

Permalink
Auto merge of #1121 - mikhail-m1:is_tracking, r=Diggsey
Browse files Browse the repository at this point in the history
fix ToolchainDesc is_tracking

issue #756.

I wonder, why is not ToolchainDesc.channel a enum?
  • Loading branch information
bors committed May 19, 2017
2 parents 1434889 + 96942a4 commit 0efe0bb
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/rustup-dist/src/dist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,8 @@ impl ToolchainDesc {
}

pub fn is_tracking(&self) -> bool {
self.date.is_none()
let channels = ["nightly", "beta", "stable"];
channels.iter().any(|x| *x == self.channel) && self.date.is_none()
}
}

Expand Down

0 comments on commit 0efe0bb

Please sign in to comment.