Skip to content

Commit

Permalink
Rollup merge of rust-lang#87326 - ehuss:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history 
Update cargo

6 commits in 27277d966b3cfa454d6dea7f724cb961c036251c..4e143fd131e0c16cefd008456e974236ca54e62e
2021-07-16 00:50:39 +0000 to 2021-07-20 21:55:45 +0000
- Named profile updates (rust-lang/cargo#9685)
- Inform build scripts of rustc compiler context (rust-lang/cargo#9601)
- Factor version preferences into a struct (rust-lang/cargo#9703)
- docs: Fix sentence & update link for GitLab CI docs (rust-lang/cargo#9704)
- Deduplicate compiler diagnostics. (rust-lang/cargo#9675)
- Re-enable future-incompatible tests. (rust-lang/cargo#9698)
  • Loading branch information
@ehuss
ehuss committed Jul 21, 2021
2 parents a0dad6b + f4981b4 commit b9e3f3d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 34 files
+2 −3 crates/resolver-tests/src/lib.rs
+3 −2 src/bin/cargo/commands/bench.rs
+1 −1 src/bin/cargo/commands/build.rs
+4 −13 src/bin/cargo/commands/check.rs
+1 −1 src/bin/cargo/commands/clean.rs
+1 −1 src/bin/cargo/commands/doc.rs
+4 −13 src/bin/cargo/commands/fix.rs
+2 −2 src/bin/cargo/commands/install.rs
+1 −1 src/bin/cargo/commands/run.rs
+9 −11 src/bin/cargo/commands/rustc.rs
+1 −1 src/bin/cargo/commands/rustdoc.rs
+2 −2 src/bin/cargo/commands/test.rs
+11 −1 src/cargo/core/compiler/build_context/target_info.rs
+19 −1 src/cargo/core/compiler/custom_build.rs
+4 −4 src/cargo/core/compiler/job.rs
+127 −10 src/cargo/core/compiler/job_queue.rs
+29 −20 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/manifest.rs
+0 −8 src/cargo/core/profiles.rs
+14 −37 src/cargo/core/resolver/dep_cache.rs
+7 −18 src/cargo/core/resolver/mod.rs
+181 −0 src/cargo/core/resolver/version_prefs.rs
+20 −26 src/cargo/ops/resolve.rs
+55 −39 src/cargo/util/command_prelude.rs
+82 −37 src/cargo/util/toml/mod.rs
+1 −1 src/doc/src/guide/continuous-integration.md
+17 −2 src/doc/src/reference/environment-variables.md
+0 −33 tests/testsuite/bad_config.rs
+178 −2 tests/testsuite/build_script.rs
+17 −50 tests/testsuite/cache_messages.rs
+34 −9 tests/testsuite/future_incompat_report.rs
+1 −0 tests/testsuite/main.rs
+142 −0 tests/testsuite/messages.rs
+214 −8 tests/testsuite/profile_custom.rs

0 comments on commit b9e3f3d

Please sign in to comment.