Skip to content

Commit

Permalink
Auto merge of #50696 - ehuss:cargo-update, r=alexcrichton
Browse files Browse the repository at this point in the history 
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.
  • Loading branch information
@bors
bors committed May 16, 2018
2 parents 2f2a11d + a233268 commit 4208bd5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions src/Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 31 files
+6 −1 ARCHITECTURE.md
+2 −2 Cargo.toml
+10 −0 src/bin/cargo/command_prelude.rs
+1 −0 src/bin/cargo/commands/build.rs
+3 −0 src/cargo/core/compiler/build_config.rs
+12 −0 src/cargo/core/compiler/build_context/mod.rs
+159 −0 src/cargo/core/compiler/build_plan.rs
+12 −12 src/cargo/core/compiler/context/compilation_files.rs
+35 −6 src/cargo/core/compiler/context/mod.rs
+35 −1 src/cargo/core/compiler/context/unit_dependencies.rs
+61 −52 src/cargo/core/compiler/custom_build.rs
+34 −23 src/cargo/core/compiler/job_queue.rs
+31 −12 src/cargo/core/compiler/mod.rs
+1 −10 src/cargo/core/interning.rs
+1 −1 src/cargo/core/package_id_spec.rs
+18 −30 src/cargo/core/resolver/context.rs
+6 −9 src/cargo/core/resolver/types.rs
+1 −1 src/cargo/core/summary.rs
+1 −14 src/cargo/ops/cargo_compile.rs
+10 −2 src/cargo/ops/registry.rs
+1 −1 src/crates-io/Cargo.toml
+5 −0 src/doc/src/reference/source-replacement.md
+37 −0 tests/testsuite/bad_config.rs
+0 −25 tests/testsuite/build.rs
+207 −0 tests/testsuite/build_plan.rs
+65 −4 tests/testsuite/check.rs
+1 −0 tests/testsuite/main.rs
+6 −3 tests/testsuite/path.rs
+33 −33 tests/testsuite/profile_targets.rs
+38 −1 tests/testsuite/rustc.rs
+3 −3 tests/testsuite/test.rs

0 comments on commit 4208bd5

Please sign in to comment.