Skip to content

Commit

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

5 commits in d8d30a75376f78bb0fabe3d28ee9d87aa8035309..85b500ccad8cd0b63995fd94a03ddd4b83f7905b
2022-07-19 13:59:17 +0000 to 2022-07-24 21:10:46 +0000
- Make the empty rustc-wrapper test more explicit. (rust-lang/cargo#10899)
- expand RUSTC_WRAPPER docs (rust-lang/cargo#10896)
- Stabilize Workspace Inheritance (rust-lang/cargo#10859)
- Fix typo in unstable docs: s/PROGJCT/PROJECT/ (rust-lang/cargo#10890)
- refactor(source): Open query API for adding more types of queries (rust-lang/cargo#10883)
  • Loading branch information
@bors
bors committed Jul 27, 2022
2 parents e33cc71 + 56a7738 commit ff693dc
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 62 files
+7 −3 crates/resolver-tests/src/lib.rs
+2 −2 src/cargo/core/compiler/future_incompat.rs
+1 −1 src/cargo/core/features.rs
+1 −1 src/cargo/core/mod.rs
+11 −20 src/cargo/core/registry.rs
+7 −9 src/cargo/core/resolver/dep_cache.rs
+3 −3 src/cargo/core/resolver/errors.rs
+19 −22 src/cargo/core/source/mod.rs
+5 −5 src/cargo/ops/cargo_add/mod.rs
+2 −2 src/cargo/ops/common_for_install_and_uninstall.rs
+9 −16 src/cargo/sources/directory.rs
+4 −11 src/cargo/sources/git/source.rs
+11 −14 src/cargo/sources/path.rs
+14 −13 src/cargo/sources/registry/mod.rs
+4 −19 src/cargo/sources/replaced.rs
+24 −41 src/cargo/util/toml/mod.rs
+4 −2 src/doc/src/reference/config.md
+11 −8 src/doc/src/reference/environment-variables.md
+36 −0 src/doc/src/reference/specifying-dependencies.md
+10 −2 src/doc/src/reference/unstable.md
+87 −0 src/doc/src/reference/workspaces.md
+0 −2 tests/testsuite/cargo_add/detect_workspace_inherit/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/detect_workspace_inherit/mod.rs
+0 −2 tests/testsuite/cargo_add/detect_workspace_inherit/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/detect_workspace_inherit_features/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/detect_workspace_inherit_features/mod.rs
+0 −2 tests/testsuite/cargo_add/detect_workspace_inherit_features/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/detect_workspace_inherit_optional/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/detect_workspace_inherit_optional/mod.rs
+0 −2 tests/testsuite/cargo_add/detect_workspace_inherit_optional/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/invalid_key_inherit_dependency/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/invalid_key_inherit_dependency/mod.rs
+0 −2 tests/testsuite/cargo_add/invalid_key_inherit_dependency/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/mod.rs
+0 −2 tests/testsuite/cargo_add/invalid_key_overwrite_inherit_dependency/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/mod.rs
+0 −2 tests/testsuite/cargo_add/invalid_key_rename_inherit_dependency/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/merge_activated_features/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/merge_activated_features/mod.rs
+0 −2 tests/testsuite/cargo_add/merge_activated_features/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/overwrite_inherit_features_noop/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/overwrite_inherit_features_noop/mod.rs
+0 −2 tests/testsuite/cargo_add/overwrite_inherit_features_noop/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/overwrite_inherit_noop/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/overwrite_inherit_noop/mod.rs
+0 −2 tests/testsuite/cargo_add/overwrite_inherit_noop/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/overwrite_inherit_optional_noop/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/overwrite_inherit_optional_noop/mod.rs
+0 −2 tests/testsuite/cargo_add/overwrite_inherit_optional_noop/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/overwrite_workspace_dep/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/overwrite_workspace_dep/mod.rs
+0 −2 tests/testsuite/cargo_add/overwrite_workspace_dep/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/overwrite_workspace_dep_features/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/overwrite_workspace_dep_features/mod.rs
+0 −2 tests/testsuite/cargo_add/overwrite_workspace_dep_features/out/primary/Cargo.toml
+0 −2 tests/testsuite/cargo_add/unknown_inherited_feature/in/primary/Cargo.toml
+0 −1 tests/testsuite/cargo_add/unknown_inherited_feature/mod.rs
+0 −2 tests/testsuite/cargo_add/unknown_inherited_feature/out/primary/Cargo.toml
+12 −1 tests/testsuite/check.rs
+8 −169 tests/testsuite/inheritable_workspace_fields.rs

0 comments on commit ff693dc

Please sign in to comment.