Update cargo#59516

ehuss · 2019-03-29T03:14:55Z

Update cargo

22 commits in 0e35bd8af0ec72d3225c4819b330b94628f0e9d0..63231f438a2b5b84ccf319a5de22343ee0316323
2019-03-13 06:52:51 +0000 to 2019-03-27 12:26:45 +0000

Code cleanup (Code cleanup cargo#6787)
Add cargo:rustc-link-arg to pass custom linker arguments (Add cargo:rustc-link-arg to pass custom linker arguments cargo#6298)
Testsuite: remove some unnecessary is_nightly checks. (Testsuite: remove some unnecessary is_nightly checks. cargo#6786)
cargo metadata: Don't show null deps. (cargo metadata: Don't show null deps. cargo#6534)
Some fingerprint cleanup. (Some fingerprint cleanup. cargo#6785)
Fix fingerprint for canceled build script. (Fix fingerprint for canceled build script. cargo#6782)
Canonicalize default target if it ends with .json (Canonicalize default target if it ends with .json cargo#6778)
Fix setting panic=unwind compiling lib a extra time. (Fix setting panic=unwind compiling lib a extra time. cargo#6781)
Always nicely show errors from crates.io if possible (Always nicely show errors from crates.io if possible cargo#6771)
Testsuite: Make cwd() relative to project root. (Testsuite: Make cwd() relative to project root. cargo#6768)
Allow cargo fix if gitignore matches root working dir. (Allow cargo fix if gitignore matches root working dir. cargo#6767)
Remove redundant imports (Remove redundant imports cargo#6763)
Handle backcompat hazard with toml crate (Handle backcompat hazard with toml crate cargo#6761)
Fix spurious error in dirty_both_lib_and_test. (Fix spurious error in dirty_both_lib_and_test. cargo#6756)
Update toml requirement from 0.4.2 to 0.5.0 (Update toml requirement from 0.4.2 to 0.5.0 cargo#6760)
Reuse std::env::consts::EXE_SUFFIX (Reuse std::env::consts::EXE_SUFFIX cargo#6758)
Proptest 0.9.1 (Proptest 0.9.1 cargo#6753)
Don't need extern crate in 2018 (Don't need extern crate in 2018 cargo#6752)
Release a jobserver token while locking a file (Release a jobserver token while locking a file cargo#6748)
Minor doc fix for publish command synopsis (Minor doc fix for publish command synopsis cargo#6749)
Stricter package change detection. (Stricter package change detection. cargo#6740)
Fix resolving yanked crates when using a local registry. (Fix resolving yanked crates when using a local registry. cargo#6742)

rust-highfive · 2019-03-29T03:15:07Z

r? @nikomatsakis

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

rust-highfive · 2019-03-29T03:15:08Z

⚠️ Warning ⚠️

These commits modify submodules.

ehuss · 2019-03-29T03:17:15Z

This will break rls. However, I cannot update rls while clippy is broken, and it looks like it will be a while before it's fixed.

r? @alexcrichton

alexcrichton · 2019-03-29T03:46:50Z

@bors: r+

bors · 2019-03-29T03:46:51Z

📌 Commit 03fcecd4cdfff1daecd50e332c8e149b3263d22f has been approved by alexcrichton

@ghost

Rollup of 9 pull requests Successful merges: - #59366 (Update books) - #59436 (Update jemalloc-sys to version 0.3.0) - #59454 (Update rustfmt to 1.2.0) - #59462 (Fix error in Rust 2018 + no_core environment) - #59467 (Better diagnostic for binary operation on BoxedValues) - #59473 (Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans) - #59480 (Update stdsimd) - #59486 (Visit `ImplItem` in `dead_code` lint) - #59510 (Rename `type_parameters` to `generics` and so on) Failed merges: - #59516 (Update cargo) r? @ghost

@ghost

Rollup of 9 pull requests Successful merges: - #59366 (Update books) - #59436 (Update jemalloc-sys to version 0.3.0) - #59454 (Update rustfmt to 1.2.0) - #59462 (Fix error in Rust 2018 + no_core environment) - #59467 (Better diagnostic for binary operation on BoxedValues) - #59473 (Do not emit incorrect borrow suggestion involving macros and fix overlapping multiline spans) - #59480 (Update stdsimd) - #59486 (Visit `ImplItem` in `dead_code` lint) - #59510 (Rename `type_parameters` to `generics` and so on) Failed merges: - #59516 (Update cargo) r? @ghost

bors · 2019-03-29T21:57:22Z

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

ehuss · 2019-03-29T22:30:57Z

rebased

alexcrichton · 2019-03-29T22:56:32Z

@bors: r+ delegate+

bors · 2019-03-29T22:56:33Z

✌️ @ehuss can now approve this pull request

bors · 2019-03-29T22:56:34Z

📌 Commit 3a0e6087512a949a2788481b43ea794387a47c31 has been approved by alexcrichton

bors · 2019-03-30T06:16:56Z

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

ehuss · 2019-03-30T17:11:31Z

@bors r=alexcrichton

bors · 2019-03-30T17:11:32Z

📌 Commit d2228ca has been approved by alexcrichton

bors · 2019-03-30T17:22:28Z

⌛ Testing commit d2228ca with merge befeeb7...

Update cargo Update cargo 22 commits in 0e35bd8af0ec72d3225c4819b330b94628f0e9d0..63231f438a2b5b84ccf319a5de22343ee0316323 2019-03-13 06:52:51 +0000 to 2019-03-27 12:26:45 +0000 - Code cleanup (rust-lang/cargo#6787) - Add cargo:rustc-link-arg to pass custom linker arguments (rust-lang/cargo#6298) - Testsuite: remove some unnecessary is_nightly checks. (rust-lang/cargo#6786) - cargo metadata: Don't show `null` deps. (rust-lang/cargo#6534) - Some fingerprint cleanup. (rust-lang/cargo#6785) - Fix fingerprint for canceled build script. (rust-lang/cargo#6782) - Canonicalize default target if it ends with `.json` (rust-lang/cargo#6778) - Fix setting `panic=unwind` compiling lib a extra time. (rust-lang/cargo#6781) - Always nicely show errors from crates.io if possible (rust-lang/cargo#6771) - Testsuite: Make `cwd()` relative to project root. (rust-lang/cargo#6768) - Allow `cargo fix` if gitignore matches root working dir. (rust-lang/cargo#6767) - Remove redundant imports (rust-lang/cargo#6763) - Handle backcompat hazard with `toml` crate (rust-lang/cargo#6761) - Fix spurious error in dirty_both_lib_and_test. (rust-lang/cargo#6756) - Update toml requirement from 0.4.2 to 0.5.0 (rust-lang/cargo#6760) - Reuse std::env::consts::EXE_SUFFIX (rust-lang/cargo#6758) - Proptest 0.9.1 (rust-lang/cargo#6753) - Don't need extern crate in 2018 (rust-lang/cargo#6752) - Release a jobserver token while locking a file (rust-lang/cargo#6748) - Minor doc fix for publish command synopsis (rust-lang/cargo#6749) - Stricter package change detection. (rust-lang/cargo#6740) - Fix resolving yanked crates when using a local registry. (rust-lang/cargo#6742)

bors · 2019-03-30T20:57:29Z

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

rust-highfive assigned nikomatsakis Mar 29, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 29, 2019

rust-highfive assigned alexcrichton and unassigned nikomatsakis Mar 29, 2019

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 Mar 29, 2019

Centril mentioned this pull request Mar 29, 2019

Rollup of 9 pull requests #59522

Merged

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 Mar 29, 2019

ehuss force-pushed the update-cargo branch from 03fcecd to 3a0e608 Compare March 29, 2019 22:30

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 Mar 29, 2019

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 Mar 30, 2019

Update cargo

d2228ca

ehuss force-pushed the update-cargo branch from 3a0e608 to d2228ca Compare March 30, 2019 17:11

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 Mar 30, 2019

mati865 mentioned this pull request Mar 30, 2019

Lint for redundant imports #58805

Merged

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 30, 2019

bors merged commit d2228ca into rust-lang:master Mar 30, 2019

Uh oh!

Conversation

ehuss commented Mar 29, 2019

Uh oh!

rust-highfive commented Mar 29, 2019

Uh oh!

rust-highfive commented Mar 29, 2019

Uh oh!

ehuss commented Mar 29, 2019

Uh oh!

alexcrichton commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

ehuss commented Mar 29, 2019

Uh oh!

alexcrichton commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

bors commented Mar 29, 2019

Uh oh!

bors commented Mar 30, 2019

Uh oh!

ehuss commented Mar 30, 2019

Uh oh!

bors commented Mar 30, 2019

Uh oh!

bors commented Mar 30, 2019

Uh oh!

bors commented Mar 30, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants