rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge commit '3ae8faff4d46ad92f194c2a4b941c3152a701b31' into clippyup

Browse Source
This commit is contained in:
flip1995
2021-06-03 08:41:37 +02:00
parent 91aa821745
commit 6c27482115
189 changed files with 2372 additions and 1310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rustc_tools_util/src/lib.rs
View File

@@ -100,9 +100,9 @@ pub fn get_commit_date() -> Option<String> {
}
#[must_use]
pub fn get_channel() -> Option<String> {
pub fn get_channel() -> String {
match env::var("CFG_RELEASE_CHANNEL") {
Ok(channel) => Some(channel),
Ok(channel) => channel,
Err(_) => {
// if that failed, try to ask rustc -V, do some parsing and find out
match std::process::Command::new("rustc")
@@ -113,16 +113,16 @@ pub fn get_channel() -> Option<String> {
{
Some(rustc_output) => {
if rustc_output.contains("beta") {
Some(String::from("beta"))
String::from("beta")
} else if rustc_output.contains("stable") {
Some(String::from("stable"))
String::from("stable")
} else {
// default to nightly if we fail to parse
Some(String::from("nightly"))
String::from("nightly")
}
},
// default to nightly
None => Some(String::from("nightly")),
None => String::from("nightly"),
}
},
}