Skip to content
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

Sync cargo-the-cli version with rustc. #10178

Merged
merged 3 commits into from
Dec 13, 2021
Merged

Sync cargo-the-cli version with rustc. #10178

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6758105
Move cargo's self-version code to a dedicated module.
ehuss Dec 6, 2021
f5cb79e
Remove pre_release in version info.
ehuss Dec 6, 2021
a58725a
Use version from rustbuild.
ehuss Dec 7, 2021
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
Prev Previous commit
Next Next commit
Remove pre_release in version info. 
This field is no longer being used, as pre-release versions have
not been used in cargo for quite some time, and I don't anticipate
them ever returning.
  • Loading branch information
@ehuss
ehuss committed Dec 6, 2021
commit f5cb79e85b918717f372c93ba1e8e312df1470cb
5 changes: 0 additions & 5 deletions src/cargo/version.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ pub struct VersionInfo {
pub major: u8,
pub minor: u8,
pub patch: u8,
pub pre_release: Option<String>,
/// Information that's only available when we were built with
/// rustbuild, rather than Cargo itself.
pub cfg_info: Option<CfgInfo>,
Expand All @@ -34,8 +33,6 @@ impl fmt::Display for VersionInfo {
if let Some(channel) = self.cfg_info.as_ref().map(|ci| &ci.release_channel) {
if channel != "stable" {
write!(f, "-{}", channel)?;
let empty = String::new();
write!(f, "{}", self.pre_release.as_ref().unwrap_or(&empty))?;
}
};

Expand Down Expand Up @@ -86,7 +83,6 @@ pub fn version() -> VersionInfo {
major,
minor,
patch,
pre_release: option_env_str!("CARGO_PKG_VERSION_PRE"),
cfg_info: Some(CfgInfo {
release_channel: option_env_str!("CFG_RELEASE_CHANNEL").unwrap(),
commit_info,
Expand All @@ -98,7 +94,6 @@ pub fn version() -> VersionInfo {
major,
minor,
patch,
pre_release: option_env_str!("CARGO_PKG_VERSION_PRE"),
cfg_info: None,
},
}
Expand Down