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

Projects
None yet
4 participants
@matklad
Copy link
Member

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

This comment has been minimized.

Copy link

rust-highfive commented Feb 26, 2018

r? @alexcrichton

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

@matklad matklad force-pushed the matklad:Cargo-the-tool-1.0 branch from d71da8b to cc971ee Feb 26, 2018

@alexcrichton

This comment has been minimized.

Copy link
Member

alexcrichton commented Feb 26, 2018

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 26, 2018

📌 Commit cc971ee has been approved by alexcrichton

@matklad matklad added the relnotes label Feb 26, 2018

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Feb 26, 2018

⌛️ Testing commit cc971ee with merge cd2ae96...

bors added a commit that referenced this pull request Feb 26, 2018

Auto merge of #5083 - matklad:Cargo-the-tool-1.0, r=alexcrichton
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

This comment has been minimized.

Copy link
Contributor

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

3 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details

@matklad matklad deleted the matklad:Cargo-the-tool-1.0 branch Feb 26, 2018

bors added a commit to rust-lang/rust that referenced this pull request Jul 27, 2018

Auto merge of #52776 - pietroalbini:bump-beta-bootstrap, r=Mark-Simul…
…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

bors added a commit to rust-lang/rust that referenced this pull request Jul 27, 2018

Auto merge of #52776 - pietroalbini:bump-beta-bootstrap, r=Mark-Simul…
…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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.