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.

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

Make cargo-the-binary version the same as the Rust version #5083

Merged
merged 1 commit into from
Feb 26, 2018

Conversation

matklad
Copy link
Member

@matklad matklad commented Feb 26, 2018

Closes #4211 which seems stuck :-)

Soooo, this is the simplest possible fix to this problem:

~/projects/cargo Cargo-the-tool-1.0
λ rustc --version
rustc 1.24.0 (4d90ac38c 2018-02-12)

~/projects/cargo Cargo-the-tool-1.0
λ cargo --version
cargo 0.25.0 (8c93e0895 2018-02-01)

It makes cargo --version to print the corresponding Rust version (with possibly cargo-specific patch number), while keeping the library version the same as today.

On the one hand, this is horrible. On the other hand, it seems to do the job? In the long term, it would be cool skip one version bump for the library, so that 0.x corresponds to 1.x.

cc @rust-lang/cargo

I am not sure that this is good idea, the implementation certainly feels horrible :)

@rust-highfive
Copy link

r? @alexcrichton

(rust_highfive has picked a reviewer for you, use r? to override)

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Collaborator

bors commented Feb 26, 2018

📌 Commit cc971ee has been approved by alexcrichton

@matklad matklad added the relnotes Release-note worthy label Feb 26, 2018
@bors
Copy link
Collaborator

bors commented Feb 26, 2018

⌛ Testing commit cc971ee with merge cd2ae96...

bors added a commit that referenced this pull request Feb 26, 2018
Make cargo-the-binary version the same as the Rust version

Closes #4211 which seems stuck :-)

Soooo, this is the simplest possible fix to this problem:

```
~/projects/cargo Cargo-the-tool-1.0
λ rustc --version
rustc 1.24.0 (4d90ac38c 2018-02-12)

~/projects/cargo Cargo-the-tool-1.0
λ cargo --version
cargo 0.25.0 (8c93e08 2018-02-01)
```

It makes `cargo --version` to print the corresponding Rust version (with possibly cargo-specific patch number), while keeping the library version the same as today.

On the one hand, this is horrible. On the other hand, it seems to do the job? In the long term, it would be cool skip one version bump for the library, so that `0.x` corresponds to `1.x`.

cc @rust-lang/cargo

I am not sure that this is good idea, the implementation certainly feels horrible :)
@bors
Copy link
Collaborator

bors commented Feb 26, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing cd2ae96 to master...

@bors bors merged commit cc971ee into rust-lang:master Feb 26, 2018
@matklad matklad deleted the Cargo-the-tool-1.0 branch February 26, 2018 23:32
bors added a commit to rust-lang/rust that referenced this pull request Jul 27, 2018
…acrum

[beta] Bump bootstrap compiler to 1.27.2

This PR bumps the beta bootstrap compiler to 1.27.2.

* The original cargo version was wrong: the current one is not `0.28.0`, but `1.27.0` (since rust-lang/cargo#5083). [Should the forge be updated?](https://forge.rust-lang.org/release-process.html)
* The updated `date` is the correct one for rustc, but the wrong one for cargo. *I think* that shouldn't cause any problem, but it's better to ask.

r? @Mark-Simulacrum
moshg pushed a commit to moshg/rust-std-ja that referenced this pull request Apr 4, 2020
…acrum

[beta] Bump bootstrap compiler to 1.27.2

This PR bumps the beta bootstrap compiler to 1.27.2.

* The original cargo version was wrong: the current one is not `0.28.0`, but `1.27.0` (since rust-lang/cargo#5083). [Should the forge be updated?](https://forge.rust-lang.org/release-process.html)
* The updated `date` is the correct one for rustc, but the wrong one for cargo. *I think* that shouldn't cause any problem, but it's better to ask.

r? @Mark-Simulacrum
@ehuss ehuss added this to the 1.26.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
relnotes Release-note worthy
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Release Cargo 1.0
5 participants