Skip to content

Conversation

matthiaskrgr
Copy link
Member

Changes:

Use the same index location on nightly as beta
relax deprecated diagnostic message check
Don't print to raw stderr in test
Emit the `test` field in cargo metadata

r? @ehuss

Trying to get the fix to the registry-index-hash upstream soonish.

Changes:
````
Use the same index location on nightly as beta
relax deprecated diagnostic message check
Don't print to raw stderr in test
Emit the `test` field in cargo metadata
````
@rust-highfive
Copy link
Contributor

Updates src/tools/cargo.

cc @ehuss

@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 31, 2020
@ehuss
Copy link
Contributor

ehuss commented Aug 1, 2020

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 1, 2020

📌 Commit 21cab87 has been approved by ehuss

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 1, 2020
@ehuss
Copy link
Contributor

ehuss commented Aug 1, 2020

@bors p=1
Fixing nightly regression.

bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 1, 2020
…arth

Rollup of 6 pull requests

Successful merges:

 - rust-lang#74977 (Clean up E0741 error explanation)
 - rust-lang#74981 (Some fixes for `plugin.md` in unstable-book)
 - rust-lang#74983 (Replace a recursive algorithm with an iterative one and a stack.)
 - rust-lang#74995 (Update the WASI libc build to LLVM 10.)
 - rust-lang#74996 (submodules: update cargo from 974eb438d to 2d5c2381e)
 - rust-lang#75007 (Clean up E0743 explanation)

Failed merges:

r? @ghost
@bors
Copy link
Collaborator

bors commented Aug 1, 2020

⌛ Testing commit 21cab87 with merge de10abf...

@bors bors merged commit 302dfbc into rust-lang:master Aug 1, 2020
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
@matthiaskrgr matthiaskrgr deleted the submodule_upd branch January 25, 2025 09:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants