Skip to content

Commit

Permalink
Rollup merge of #50344 - SimonSapin:cargo, r=alexcrichton
Browse files Browse the repository at this point in the history 
Update Cargo to 2018-04-28 122fd5be5201913d42e219e132d6569493583bca
  • Loading branch information
@kennytm
kennytm authored Apr 30, 2018
2 parents 909ba8a + 21941c8 commit 6166f20
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 75 files
+4 −0 ARCHITECTURE.md
+8 −8 Cargo.toml
+18 −15 src/bin/cli.rs
+4 −0 src/bin/command_prelude.rs
+1 −0 src/bin/commands/bench.rs
+1 −0 src/bin/commands/build.rs
+1 −0 src/bin/commands/check.rs
+1 −0 src/bin/commands/clean.rs
+1 −0 src/bin/commands/doc.rs
+8 −1 src/bin/commands/fetch.rs
+1 −0 src/bin/commands/package.rs
+1 −0 src/bin/commands/publish.rs
+1 −0 src/bin/commands/run.rs
+1 −0 src/bin/commands/rustc.rs
+1 −0 src/bin/commands/rustdoc.rs
+1 −0 src/bin/commands/test.rs
+15 −8 src/cargo/core/compiler/context/compilation_files.rs
+67 −46 src/cargo/core/compiler/context/mod.rs
+185 −139 src/cargo/core/compiler/context/unit_dependencies.rs
+15 −9 src/cargo/core/compiler/custom_build.rs
+33 −29 src/cargo/core/compiler/fingerprint.rs
+30 −17 src/cargo/core/compiler/job_queue.rs
+39 −51 src/cargo/core/compiler/mod.rs
+5 −5 src/cargo/core/compiler/output_depinfo.rs
+11 −2 src/cargo/core/features.rs
+6 −166 src/cargo/core/manifest.rs
+11 −10 src/cargo/core/mod.rs
+1 −1 src/cargo/core/package_id_spec.rs
+400 −0 src/cargo/core/profiles.rs
+6 −4 src/cargo/core/resolver/context.rs
+9 −13 src/cargo/core/resolver/encode.rs
+33 −31 src/cargo/core/resolver/mod.rs
+72 −19 src/cargo/core/resolver/resolve.rs
+2 −2 src/cargo/core/resolver/types.rs
+11 −20 src/cargo/core/workspace.rs
+41 −38 src/cargo/ops/cargo_clean.rs
+430 −377 src/cargo/ops/cargo_compile.rs
+53 −3 src/cargo/ops/cargo_fetch.rs
+1 −1 src/cargo/ops/cargo_generate_lockfile.rs
+1 −1 src/cargo/ops/cargo_install.rs
+1 −1 src/cargo/ops/cargo_output_metadata.rs
+1 −1 src/cargo/ops/mod.rs
+74 −31 src/cargo/ops/resolve.rs
+18 −9 src/cargo/util/config.rs
+31 −34 src/cargo/util/graph.rs
+14 −2 src/cargo/util/machine_message.rs
+133 −127 src/cargo/util/toml/mod.rs
+227 −54 src/cargo/util/toml/targets.rs
+1 −1 src/doc/src/reference/build-scripts.md
+6 −0 src/doc/src/reference/environment-variables.md
+4 −1 src/doc/src/reference/manifest.md
+1 −1 src/doc/src/reference/specifying-dependencies.md
+35 −0 src/doc/src/reference/unstable.md
+4 −1 tests/testsuite/bad_config.rs
+81 −1 tests/testsuite/bench.rs
+91 −14 tests/testsuite/build.rs
+47 −1 tests/testsuite/build_script.rs
+62 −11 tests/testsuite/cargotest/support/mod.rs
+6 −15 tests/testsuite/check.rs
+15 −0 tests/testsuite/doc.rs
+16 −12 tests/testsuite/features.rs
+131 −1 tests/testsuite/fetch.rs
+0 −3 tests/testsuite/freshness.rs
+2 −0 tests/testsuite/main.rs
+5 −5 tests/testsuite/package.rs
+0 −4 tests/testsuite/path.rs
+0 −28 tests/testsuite/proc_macro.rs
+345 −0 tests/testsuite/profile_overrides.rs
+703 −0 tests/testsuite/profile_targets.rs
+31 −0 tests/testsuite/profiles.rs
+220 −2 tests/testsuite/rename_deps.rs
+1 −0 tests/testsuite/resolve.rs
+156 −9 tests/testsuite/run.rs
+55 −1 tests/testsuite/rustc.rs
+129 −18 tests/testsuite/test.rs

0 comments on commit 6166f20

Please sign in to comment.