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

Update cargo #61771

Merged
merged 3 commits into from Jun 18, 2019

Conversation

Projects
None yet
8 participants
@ehuss
Copy link
Contributor

commented Jun 12, 2019

Update cargo

19 commits in 545f354259be4e9745ea00a524c0e4c51df01aa6..807429e1b6da4e2ec52488ef2f59e77068c31e1f
2019-05-23 17:45:30 +0000 to 2019-06-11 14:06:10 +0000

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Jun 12, 2019

r? @nikomatsakis

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

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Jun 12, 2019

⚠️ Warning ⚠️

  • These commits modify submodules.
@ehuss

This comment has been minimized.

Copy link
Contributor Author

commented Jun 12, 2019

@alexcrichton

This comment has been minimized.

Copy link
Member

commented Jun 12, 2019

@bors: r+

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 12, 2019

📌 Commit 11024fa has been approved by alexcrichton

Centril added a commit to Centril/rust that referenced this pull request Jun 12, 2019

Rollup merge of rust-lang#61771 - ehuss:update-cargo, r=alexcrichton
Update cargo

Update cargo

19 commits in 545f354259be4e9745ea00a524c0e4c51df01aa6..807429e1b6da4e2ec52488ef2f59e77068c31e1f
2019-05-23 17:45:30 +0000 to 2019-06-11 14:06:10 +0000
- Stabilize publish-lockfile. (rust-lang/cargo#7026)
- change package cache lock message (rust-lang/cargo#7029)
- Fix documenting an example. (rust-lang/cargo#7023)
- Fix nonconcurrent tests (rust-lang/cargo#6900)
- Update git2 crates for libgit2 0.28 (rust-lang/cargo#7018)
- fix bunch of clippy warnings (rust-lang/cargo#7019)
- Ignore remap-path-prefix in metadata hash. (rust-lang/cargo#6966)
- Don't synthesize feature diretives for non-optional deps (rust-lang/cargo#7010)
- Handle pipelined tests of libraries (rust-lang/cargo#7008)
- Import the cargo-vendor subcommand into Cargo (rust-lang/cargo#6869)
- Remove unnecessary outlives bounds (rust-lang/cargo#7000)
- Catch filename output collisions in rustdoc. (rust-lang/cargo#6998)
- the testing SAT solver was messed up by a refactor (rust-lang/cargo#6995)
- Add some hints to the docs for `cfg()` targets (rust-lang/cargo#6990)
- Test the Resolver against the varisat Library (rust-lang/cargo#6980)
- Update changelog. (rust-lang/cargo#6984)
- Update cache-messages tracking issue. (rust-lang/cargo#6987)
- zsh: Add --all-targets option to cargo-check and cargo-build (rust-lang/cargo#6985)
- Fix typo (rust-lang/cargo#6982)

bors added a commit that referenced this pull request Jun 12, 2019

Auto merge of #61783 - Centril:rollup-r5u53z7, r=Centril
Rollup of 10 pull requests

Successful merges:

 - #60376 (Stabilize Option::xor)
 - #61398 (Stabilize copy_within)
 - #61629 (Hygienize macros in the standard library)
 - #61675 (Include frame pointer for bare metal RISC-V targets)
 - #61750 (Fix x.py install)
 - #61757 (Deprecate ONCE_INIT)
 - #61762 (rustbuild: fix libtest_stamp)
 - #61763 (ci: fix ci stats upload condition)
 - #61771 (Update cargo)
 - #61776 (Fix typos in error_codes)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 13, 2019

☔️ The latest upstream changes (presumably #61597) made this pull request unmergeable. Please resolve the merge conflicts.

@ehuss ehuss force-pushed the ehuss:update-cargo branch from 11024fa to de90dd7 Jun 13, 2019

@ehuss

This comment has been minimized.

Copy link
Contributor Author

commented Jun 13, 2019

@bors r=alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 13, 2019

📌 Commit de90dd7 has been approved by alexcrichton

@alexcrichton

This comment has been minimized.

Copy link
Member

commented Jun 14, 2019

@bors: p=1

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 14, 2019

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout update-cargo (switch to your branch)
  2. git fetch upstream master (retrieve the latest master)
  3. git rebase upstream/master -p (rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self update-cargo --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@ehuss ehuss force-pushed the ehuss:update-cargo branch from de90dd7 to d2e03b8 Jun 14, 2019

@ehuss

This comment has been minimized.

Copy link
Contributor Author

commented Jun 14, 2019

@bors r=alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 14, 2019

📌 Commit d2e03b8 has been approved by alexcrichton

ehuss added some commits Jun 14, 2019

Add `syn` to workspace hack.
Cargo's syn now has the `full` feature, so add it here to keep it in sync.

@ehuss ehuss force-pushed the ehuss:update-cargo branch from d516c21 to afa4827 Jun 17, 2019

@ehuss

This comment has been minimized.

Copy link
Contributor Author

commented Jun 17, 2019

Thanks Alex, you are a wizard. I tested locally on i686-pc-windows-gnu and it worked.

@bors r=alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 17, 2019

📌 Commit afa4827 has been approved by alexcrichton

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 17, 2019

⌛️ Testing commit afa4827 with merge 7978ef9...

bors added a commit that referenced this pull request Jun 17, 2019

Auto merge of #61771 - ehuss:update-cargo, r=alexcrichton
Update cargo

Update cargo

19 commits in 545f354259be4e9745ea00a524c0e4c51df01aa6..807429e1b6da4e2ec52488ef2f59e77068c31e1f
2019-05-23 17:45:30 +0000 to 2019-06-11 14:06:10 +0000
- Stabilize publish-lockfile. (rust-lang/cargo#7026)
- change package cache lock message (rust-lang/cargo#7029)
- Fix documenting an example. (rust-lang/cargo#7023)
- Fix nonconcurrent tests (rust-lang/cargo#6900)
- Update git2 crates for libgit2 0.28 (rust-lang/cargo#7018)
- fix bunch of clippy warnings (rust-lang/cargo#7019)
- Ignore remap-path-prefix in metadata hash. (rust-lang/cargo#6966)
- Don't synthesize feature diretives for non-optional deps (rust-lang/cargo#7010)
- Handle pipelined tests of libraries (rust-lang/cargo#7008)
- Import the cargo-vendor subcommand into Cargo (rust-lang/cargo#6869)
- Remove unnecessary outlives bounds (rust-lang/cargo#7000)
- Catch filename output collisions in rustdoc. (rust-lang/cargo#6998)
- the testing SAT solver was messed up by a refactor (rust-lang/cargo#6995)
- Add some hints to the docs for `cfg()` targets (rust-lang/cargo#6990)
- Test the Resolver against the varisat Library (rust-lang/cargo#6980)
- Update changelog. (rust-lang/cargo#6984)
- Update cache-messages tracking issue. (rust-lang/cargo#6987)
- zsh: Add --all-targets option to cargo-check and cargo-build (rust-lang/cargo#6985)
- Fix typo (rust-lang/cargo#6982)
@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 17, 2019

💔 Test failed - status-appveyor

@alexcrichton

This comment has been minimized.

Copy link
Member

commented Jun 17, 2019

@bors: retry

Looks like an appveyor issue

@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 18, 2019

⌛️ Testing commit afa4827 with merge 704ab2b...

bors added a commit that referenced this pull request Jun 18, 2019

Auto merge of #61771 - ehuss:update-cargo, r=alexcrichton
Update cargo

Update cargo

19 commits in 545f354259be4e9745ea00a524c0e4c51df01aa6..807429e1b6da4e2ec52488ef2f59e77068c31e1f
2019-05-23 17:45:30 +0000 to 2019-06-11 14:06:10 +0000
- Stabilize publish-lockfile. (rust-lang/cargo#7026)
- change package cache lock message (rust-lang/cargo#7029)
- Fix documenting an example. (rust-lang/cargo#7023)
- Fix nonconcurrent tests (rust-lang/cargo#6900)
- Update git2 crates for libgit2 0.28 (rust-lang/cargo#7018)
- fix bunch of clippy warnings (rust-lang/cargo#7019)
- Ignore remap-path-prefix in metadata hash. (rust-lang/cargo#6966)
- Don't synthesize feature diretives for non-optional deps (rust-lang/cargo#7010)
- Handle pipelined tests of libraries (rust-lang/cargo#7008)
- Import the cargo-vendor subcommand into Cargo (rust-lang/cargo#6869)
- Remove unnecessary outlives bounds (rust-lang/cargo#7000)
- Catch filename output collisions in rustdoc. (rust-lang/cargo#6998)
- the testing SAT solver was messed up by a refactor (rust-lang/cargo#6995)
- Add some hints to the docs for `cfg()` targets (rust-lang/cargo#6990)
- Test the Resolver against the varisat Library (rust-lang/cargo#6980)
- Update changelog. (rust-lang/cargo#6984)
- Update cache-messages tracking issue. (rust-lang/cargo#6987)
- zsh: Add --all-targets option to cargo-check and cargo-build (rust-lang/cargo#6985)
- Fix typo (rust-lang/cargo#6982)
@bors

This comment has been minimized.

Copy link
Contributor

commented Jun 18, 2019

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

@bors bors added the merged-by-bors label Jun 18, 2019

@bors bors merged commit afa4827 into rust-lang:master Jun 18, 2019

3 checks passed

Travis CI - Pull Request Build Passed
Details
homu Test successful
Details
pr Build #20190617.32 succeeded
Details
@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Jun 18, 2019

📣 Toolstate changed by #61771!

Tested on commit 704ab2b.
Direct link to PR: #61771

💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 18, 2019

📣 Toolstate changed by rust-lang/rust#61771!
Tested on commit rust-lang/rust@704ab2b.
Direct link to PR: <rust-lang/rust#61771>

💔 rls on linux: test-pass → test-fail (cc @Xanewok, @rust-lang/infra).
@RalfJung

This comment has been minimized.

Copy link
Member

commented Jun 20, 2019

So does that mean the mention of cargo install cargo-vendor in the README, and src/bootstrap/dist.rs, can be removed?

@ehuss

This comment has been minimized.

Copy link
Contributor Author

commented Jun 20, 2019

So does that mean the mention of cargo install cargo-vendor in the README, and src/bootstrap/dist.rs, can be removed?

Not until this version of cargo becomes the bootstrap version (when 1.37 becomes beta and stage0.txt is updated).

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.