Update Cargo#50696

ehuss · 2018-05-12T20:09:49Z

Unblocking PRs:

Ignore <tab> in libtest output. cargo#5535 - Ignore tab in libtest output. (unblocks Remove leftover tab in libtest outputs #50387)
Remove -Zno-trans test. cargo#5537 - Remove -Zno-trans test. (unblocks Rename trans to codegen everywhere. #50615)
Fix tests when CARGO_TARGET_DIR is set. cargo#5540 - Fix tests when CARGO_TARGET_DIR is set. (unblocks self)

Regression fixes:

Fix cargo rustc for test with implicit binary. cargo#5503 - cargo rustc broken for tests in project with bins
Fix mode generated in maybe_lib cargo#5520 - shared proc-macro dependency built incorrectly

Changes:

Point Source Replacement to the Overriding Dependencies section cargo#5527 - Point Source Replacement to the Overriding Dependencies section
Detail how to run locally-built nightly cargo cargo#5533 - Detail how to run locally-built nightly cargo
Add option to set user-agent cargo#5522 - Add option to set user-agent
NFC: fix a couple of typos, found by codespell. cargo#5519 - NFC: fix a couple of typos, found by codespell.
Fix panic for binaries built during tests. cargo#5513 - Fix panic for binaries built during tests.
simplify build_requirements cargo#5512 - simplify build_requirements
Add --build-plan for 'cargo build' cargo#5301 - Add --build-plan for 'cargo build'
Be more conservative about which files are linked to the output dir. cargo#5460 - Be more conservative about which files are linked to the output dir.
Use the new stable cargo#5509 - Use the new stable
Does not print seconds fraction with minutes cargo#5507 - Does not print seconds fraction with minutes
Bump to 0.29.0 cargo#5498 - Bump to 0.29.0
Mention +nightly in ARCHITECTURE.md cargo#5497 - Mention +nightly in ARCHITECTURE.md

The PR fixes #50640.

rust-highfive · 2018-05-12T20:09:59Z

r? @nikomatsakis

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

rust-highfive · 2018-05-12T20:10:00Z

Warning

These commits modify submodules.

alexcrichton · 2018-05-13T04:01:53Z

@bors: r+

bors · 2018-05-13T04:01:54Z

📌 Commit e0717e1 has been approved by alexcrichton

kennytm · 2018-05-13T09:23:31Z

src/Cargo.lock

Is this expected?

No, sorry, thanks for catching that. I have pushed an update. I'm really curious how that happened, since that isn't even in cargo's hierarchy.

alexcrichton · 2018-05-13T15:02:19Z

@bors: r+

bors · 2018-05-13T15:02:19Z

📌 Commit 245f016 has been approved by alexcrichton

bors · 2018-05-14T07:28:43Z

🔒 Merge conflict

ehuss · 2018-05-14T13:31:09Z

Hm, I'm curious. I didn't get any merge conflicts when I rebased. Does Homu maybe use a different git merge strategy?

kennytm · 2018-05-14T13:54:11Z

@bors r=alexcrichton

@ehuss We treat Cargo.lock like a binary file and will not automatically merge this file if your branch and master diverged. See #46539 for rationale.

bors · 2018-05-14T13:54:13Z

📌 Commit af2af4a has been approved by alexcrichton

Update Cargo Regression fixes: - rust-lang/cargo#5503 - cargo rustc broken for tests in project with bins - rust-lang/cargo#5520 - (rust-lang#50640) shared proc-macro dependency built incorrectly Changes: - rust-lang/cargo#5522 - Add option to set user-agent - rust-lang/cargo#5519 - NFC: fix a couple of typos, found by codespell. - rust-lang/cargo#5513 - Fix `panic` for binaries built during tests. - rust-lang/cargo#5512 - simplify build_requirements - rust-lang/cargo#5301 - Add --build-plan for 'cargo build' - rust-lang/cargo#5460 - Be more conservative about which files are linked to the output dir. - rust-lang/cargo#5509 - Use the new stable - rust-lang/cargo#5507 - Does not print seconds fraction with minutes - rust-lang/cargo#5498 - Bump to 0.29.0 - rust-lang/cargo#5497 - Mention +nightly in ARCHITECTURE.md

kennytm · 2018-05-16T08:13:28Z

@bors r=alexcrichton

bors · 2018-05-16T08:13:29Z

📌 Commit 49b74f0 has been approved by alexcrichton

bors · 2018-05-16T09:03:33Z

🔒 Merge conflict

Unblocking PRs: - rust-lang/cargo#5535 - Ignore <tab> in libtest output. (unblocks rust-lang#50387) - rust-lang/cargo#5537 - Remove -Zno-trans test. (unblocks rust-lang#50615) - rust-lang/cargo#5540 - Fix tests when CARGO_TARGET_DIR is set. (unblocks self) Regression fixes: - rust-lang/cargo#5503 - cargo rustc broken for tests in project with bins - rust-lang/cargo#5520 - (rust-lang#50640) shared proc-macro dependency built incorrectly Changes: - rust-lang/cargo#5527 - Point Source Replacement to the Overriding Dependencies section - rust-lang/cargo#5533 - Detail how to run locally-built nightly cargo - rust-lang/cargo#5522 - Add option to set user-agent - rust-lang/cargo#5519 - NFC: fix a couple of typos, found by codespell. - rust-lang/cargo#5513 - Fix `panic` for binaries built during tests. - rust-lang/cargo#5512 - simplify build_requirements - rust-lang/cargo#5301 - Add --build-plan for 'cargo build' - rust-lang/cargo#5460 - Be more conservative about which files are linked to the output dir. - rust-lang/cargo#5509 - Use the new stable - rust-lang/cargo#5507 - Does not print seconds fraction with minutes - rust-lang/cargo#5498 - Bump to 0.29.0 - rust-lang/cargo#5497 - Mention +nightly in ARCHITECTURE.md

eddyb · 2018-05-16T15:16:30Z

@bors r=alexcrichton

bors · 2018-05-16T15:16:31Z

📌 Commit a233268 has been approved by alexcrichton

…xcrichton GitHub: Stop treating Cargo.lock as a generated file. We do want to inspect the changes to Cargo.lock, hiding the diff by default would make it easier to miss important details like rust-lang#50629 (comment) and rust-lang#50696 (review)

kennytm · 2018-05-16T21:27:42Z

@bors p=25

bors · 2018-05-16T23:46:26Z

⌛ Testing commit a233268 with merge 4208bd5...

Update Cargo Unblocking PRs: - rust-lang/cargo#5535 - Ignore tab in libtest output. (unblocks #50387) - rust-lang/cargo#5537 - Remove -Zno-trans test. (unblocks #50615) - rust-lang/cargo#5540 - Fix tests when CARGO_TARGET_DIR is set. (unblocks self) Regression fixes: - rust-lang/cargo#5503 - cargo rustc broken for tests in project with bins - rust-lang/cargo#5520 - shared proc-macro dependency built incorrectly Changes: - rust-lang/cargo#5527 - Point Source Replacement to the Overriding Dependencies section - rust-lang/cargo#5533 - Detail how to run locally-built nightly cargo - rust-lang/cargo#5522 - Add option to set user-agent - rust-lang/cargo#5519 - NFC: fix a couple of typos, found by codespell. - rust-lang/cargo#5513 - Fix `panic` for binaries built during tests. - rust-lang/cargo#5512 - simplify build_requirements - rust-lang/cargo#5301 - Add --build-plan for 'cargo build' - rust-lang/cargo#5460 - Be more conservative about which files are linked to the output dir. - rust-lang/cargo#5509 - Use the new stable - rust-lang/cargo#5507 - Does not print seconds fraction with minutes - rust-lang/cargo#5498 - Bump to 0.29.0 - rust-lang/cargo#5497 - Mention +nightly in ARCHITECTURE.md The PR fixes #50640.

bors · 2018-05-17T02:05:33Z

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

rust-highfive assigned nikomatsakis May 12, 2018

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 12, 2018

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 May 13, 2018

kennytm mentioned this pull request May 13, 2018

Rollup of 8 pull requests #50704

Merged

kennytm reviewed May 13, 2018

View reviewed changes

ehuss force-pushed the cargo-update branch 2 times, most recently from 6be6eaa to 245f016 Compare May 13, 2018 15:01

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 14, 2018

ehuss force-pushed the cargo-update branch from 245f016 to af2af4a Compare May 14, 2018 13:24

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 14, 2018

nikomatsakis assigned alexcrichton and unassigned nikomatsakis May 14, 2018

kennytm mentioned this pull request May 14, 2018

Rollup of 11 pull requests #50747

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 15, 2018

ehuss force-pushed the cargo-update branch from b5817dd to 49b74f0 Compare May 15, 2018 23:09

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 16, 2018

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 16, 2018

emilyalbini mentioned this pull request May 16, 2018

ICE when proc-macro crate and non proc-macro crate share Cargo project #50640

Closed

ehuss force-pushed the cargo-update branch from 49b74f0 to a233268 Compare May 16, 2018 14:35

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 16, 2018

This was referenced May 16, 2018

Rollup of 17 pull requests #50807

Merged

GitHub: Stop treating Cargo.lock as a generated file. #50809

Merged

bors merged commit a233268 into rust-lang:master May 17, 2018

bors mentioned this pull request May 17, 2018

Switch to bootstrapping from 1.27 #50629

Merged

Uh oh!

Conversation

ehuss commented May 12, 2018 • edited by emilyalbini Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented May 12, 2018

Uh oh!

rust-highfive commented May 12, 2018

Uh oh!

alexcrichton commented May 13, 2018

Uh oh!

bors commented May 13, 2018

Uh oh!

kennytm May 13, 2018

Choose a reason for hiding this comment

Uh oh!

ehuss May 13, 2018

Choose a reason for hiding this comment

Uh oh!

alexcrichton commented May 13, 2018

Uh oh!

bors commented May 13, 2018

Uh oh!

bors commented May 14, 2018

Uh oh!

ehuss commented May 14, 2018

Uh oh!

kennytm commented May 14, 2018

Uh oh!

bors commented May 14, 2018

Uh oh!

kennytm commented May 16, 2018

Uh oh!

bors commented May 16, 2018

Uh oh!

bors commented May 16, 2018

Uh oh!

eddyb commented May 16, 2018

Uh oh!

bors commented May 16, 2018

Uh oh!

kennytm commented May 16, 2018

Uh oh!

bors commented May 16, 2018

Uh oh!

bors commented May 17, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

ehuss commented May 12, 2018 •

edited by emilyalbini

Loading