Skip to content

rustc_tools_util: try to handle case of not having CFG_RELEASE_CHANNEL better when getting compiler channel. #4045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2019

Conversation

matthiaskrgr
Copy link
Member

changelog: rustc_tools_util: try to handle case of not having CFG_RELEASE_CHANNEL better when getting compiler channel.

@matthiaskrgr
Copy link
Member Author

I'll do a version bump and a new crates io release soon I think

@matthiaskrgr
Copy link
Member Author

matthiaskrgr commented Apr 28, 2019

EDIT: fixed

     Running `/Users/travis/build/rust-lang/rust-clippy/target/debug/clippy_dev update_lints --check`
+++cargo +nightly fmt --all -- --check
Diff in /Users/travis/build/rust-lang/rust-clippy/rustc_tools_util/src/lib.rs at line 79:
     }
 }
 
-
 pub fn get_commit_hash() -> Option<String> {
     std::process::Command::new("git")
         .args(&["rev-parse", "--short", "HEAD"])

will fix later

@phansch
Copy link
Member

phansch commented Apr 30, 2019

Does this fix a specific bug somewhere? From reading the code it looks like it was showing nightly where it should have shown beta or stable in the version output?

In any case, this looks like an improvement, so
@bors r+

@bors
Copy link
Contributor

bors commented Apr 30, 2019

📌 Commit 8012b91 has been approved by phansch

@phansch
Copy link
Member

phansch commented Apr 30, 2019

@bors r- Let's wait until #4047 is merged before pushing things onto the bors queue

@phansch
Copy link
Member

phansch commented Apr 30, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Apr 30, 2019

📌 Commit 8012b91 has been approved by phansch

@bors
Copy link
Contributor

bors commented Apr 30, 2019

⌛ Testing commit 8012b91 with merge 86f7347...

bors added a commit that referenced this pull request Apr 30, 2019
rustc_tools_util: try to handle case of not having CFG_RELEASE_CHANNEL better when getting compiler channel.

changelog: rustc_tools_util: try to handle case of not having CFG_RELEASE_CHANNEL better when getting compiler channel.
@bors
Copy link
Contributor

bors commented Apr 30, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: phansch
Pushing 86f7347 to master...

@bors bors merged commit 8012b91 into rust-lang:master Apr 30, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants