Skip to content

Commit

Permalink
Rollup merge of rust-lang#85329 - RalfJung:version, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
fix version_str comment

This version string is ultimately generated here
https://github.com/rust-lang/rust/blob/87423fbc6af5aae2b5f6d0a11f2a0c60c7c22e98/src/bootstrap/channel.rs#L72
and I don't think it includes the `rustc` prefix. That also matches its use here
https://github.com/rust-lang/rust/blob/ac923d94f86a6f7c881ecbedcd0a68d7986a35bd/compiler/rustc_driver/src/lib.rs#L758
  • Loading branch information
GuillaumeGomez authored May 15, 2021
2 parents 7a6a25e + c96d531 commit 8ea8252
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion compiler/rustc_interface/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -922,7 +922,7 @@ impl<'a> MutVisitor for ReplaceBodyWithLoop<'a, '_> {
}
}

/// Returns a version string such as "rustc 1.46.0 (04488afe3 2020-08-24)"
/// Returns a version string such as "1.46.0 (04488afe3 2020-08-24)"
pub fn version_str() -> Option<&'static str> {
option_env!("CFG_VERSION")
}
Expand Down

0 comments on commit 8ea8252

Please sign in to comment.