Skip to content
Permalink
Browse files

Rollup merge of rust-lang#59997 - ehuss:update-cargo, r=alexcrichton

Update cargo

12 commits in 6f3e9c367abb497c64f360c3839dab5e74928d5c..ef0223f12597b5e0d9d2feed1b92c41306b1fc05
2019-04-04 14:11:33 +0000 to 2019-04-15 14:36:55 +0000
- Fix test include_overrides_gitignore. (rust-lang/cargo#6850)
- Clarify optional registry key behaviour (rust-lang/cargo#6851)
- Ensure Summary::checksum works for registry crates (rust-lang/cargo#6842)
- Better error if PathSource::walk can't access something. (rust-lang/cargo#6841)
- Improve warning in `cargo new` with parse error. (rust-lang/cargo#6839)
- Improve error message for `publish` key restriction. (rust-lang/cargo#6838)
- Remove `Freshness` from `DependencyQueue` (rust-lang/cargo#6832)
- testsuite: cleanup for `alternative-registries` (rust-lang/cargo#6837)
- Improve error message to rerun a test in a workspace. (rust-lang/cargo#6824)
- Fix mutable_borrow_reservation_conflict warning. (rust-lang/cargo#6829)
- Add install-upgrade. (rust-lang/cargo#6798)
- Clarify docs of install without <crate> (rust-lang/cargo#6823)
  • Loading branch information...
Centril committed Apr 15, 2019
2 parents d0f65b1 + 4eb3ac3 commit ec330807bedc404185b7b6c0f323efe6d7d07db0
Showing with 1 addition and 1 deletion.
  1. +1 −1 src/tools/cargo
Submodule cargo updated 59 files
+1 −0 src/bin/cargo/cli.rs
+13 −3 src/bin/cargo/commands/install.rs
+8 −1 src/bin/cargo/commands/owner.rs
+12 −6 src/bin/cargo/commands/test.rs
+2 −1 src/bin/cargo/commands/version.rs
+1 −3 src/cargo/core/compiler/build_context/mod.rs
+6 −1 src/cargo/core/compiler/context/compilation_files.rs
+4 −3 src/cargo/core/compiler/context/mod.rs
+80 −54 src/cargo/core/compiler/custom_build.rs
+788 −415 src/cargo/core/compiler/fingerprint.rs
+30 −10 src/cargo/core/compiler/job.rs
+18 −28 src/cargo/core/compiler/job_queue.rs
+20 −23 src/cargo/core/compiler/mod.rs
+1 −1 src/cargo/core/compiler/output_depinfo.rs
+2 −0 src/cargo/core/features.rs
+3 −4 src/cargo/core/manifest.rs
+4 −0 src/cargo/core/package.rs
+1 −1 src/cargo/core/source/mod.rs
+1 −2 src/cargo/core/summary.rs
+29 −8 src/cargo/ops/cargo_compile.rs
+151 −163 src/cargo/ops/cargo_install.rs
+2 −2 src/cargo/ops/cargo_new.rs
+1 −4 src/cargo/ops/cargo_package.rs
+1 −1 src/cargo/ops/cargo_test.rs
+50 −55 src/cargo/ops/cargo_uninstall.rs
+680 −164 src/cargo/ops/common_for_install_and_uninstall.rs
+23 −20 src/cargo/ops/registry.rs
+5 −7 src/cargo/sources/directory.rs
+2 −1 src/cargo/sources/git/utils.rs
+5 −4 src/cargo/sources/path.rs
+2 −2 src/cargo/sources/registry/index.rs
+18 −1 src/cargo/sources/registry/mod.rs
+3 −1 src/cargo/sources/replaced.rs
+2 −7 src/cargo/util/config.rs
+19 −58 src/cargo/util/dependency_queue.rs
+11 −2 src/cargo/util/errors.rs
+1 −1 src/cargo/util/hex.rs
+1 −1 src/cargo/util/mod.rs
+1 −1 src/doc/src/reference/registries.md
+32 −0 src/doc/src/reference/unstable.md
+7 −1 tests/testsuite/alt_registry.rs
+139 −1 tests/testsuite/build_script.rs
+1 −4 tests/testsuite/clean.rs
+16 −12 tests/testsuite/directory.rs
+4 −1 tests/testsuite/fix.rs
+75 −0 tests/testsuite/freshness.rs
+19 −101 tests/testsuite/git.rs
+49 −17 tests/testsuite/install.rs
+786 −0 tests/testsuite/install_upgrade.rs
+1 −0 tests/testsuite/main.rs
+8 −11 tests/testsuite/package.rs
+42 −8 tests/testsuite/publish.rs
+0 −1 tests/testsuite/rename_deps.rs
+4 −1 tests/testsuite/run.rs
+5 −1 tests/testsuite/support/mod.rs
+2 −7 tests/testsuite/support/registry.rs
+49 −15 tests/testsuite/test.rs
+12 −6 tests/testsuite/tool_paths.rs
+19 −0 tests/testsuite/workspaces.rs

0 comments on commit ec33080

Please sign in to comment.
You can’t perform that action at this time.