Skip to content

Quick addition to --version to mention rustc #2465

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.

Sign up for GitHub

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
kinnison merged 4 commits into from
Aug 27, 2020
Merged

Quick addition to --version to mention rustc #2465

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f157dc
Quick addition to `--version` to mention rustc
killercup Aug 19, 2020
d708b11
`--version`: Show current toolchain rustc version
killercup Aug 20, 2020
910b6ae
`+toolchain --version` shows correct rustc version
killercup Aug 23, 2020
fbb5765
Add test to ensure new rustup version output works
killercup Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/cli/rustup_mode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,14 @@ pub fn main() -> Result<utils::ExitCode> {
fn rustc_version() -> std::result::Result<String, Box<dyn std::error::Error>> {
let cfg = &mut common::set_globals(false, true)?;
let cwd = std::env::current_dir()?;

if let Some(t) = process().args().find(|x| x.starts_with('+')) {
debug!("Fetching rustc version from toolchain `{}`", t);
cfg.set_toolchain_override(&t[1..]);
}

let toolchain = cfg.find_or_install_override_toolchain_or_default(&cwd)?.0;

Ok(toolchain.rustc_version())
}

Expand Down
⚡