Skip to content

Commit

Permalink
Auto merge of rust-lang#103922 - Mark-Simulacrum:revert-cargo, r=Mark…
Browse files Browse the repository at this point in the history 
…-Simulacrum

Revert "Update cargo"

This reverts commit 331aa45.

This Cargo upgrade introduced a regression into dependency resolution, so reverting the upgrade until we can fix that.

cc rust-lang#103860,
https://rust-lang.zulipchat.com/#narrow/stream/247081-t-compiler.2Fperformance/topic/cargo.20and.20rustc.20benchmarks.20broken
  • Loading branch information
@bors
bors committed Nov 3, 2022
2 parents 160b194 + 634b9f8 commit 215e3cd
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1036,9 +1036,9 @@ dependencies = [

[[package]]
name = "curl"
version = "0.4.44"
version = "0.4.43"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
checksum = "37d855aeef205b43f65a5001e0997d81f8efca7badad4fad7d897aa7f0d0651f"
dependencies = [
"curl-sys",
"libc",
Expand All @@ -1051,9 +1051,9 @@ dependencies = [

[[package]]
name = "curl-sys"
version = "0.4.59+curl-7.86.0"
version = "0.4.55+curl-7.83.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407"
checksum = "23734ec77368ec583c2e61dd3f0b0e5c98b93abe6d2a004ca06b91dd7e3e2762"
dependencies = [
"cc",
"libc",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 72 files
+0 −2 CHANGELOG.md
+3 −3 Cargo.toml
+0 −1 crates/cargo-test-support/src/compare.rs
+2 −6 crates/cargo-test-support/src/lib.rs
+0 −53 src/bin/cargo/commands/remove.rs
+18 −123 src/cargo/core/compiler/job_queue.rs
+1 −16 src/cargo/core/compiler/mod.rs
+12 −8 src/cargo/core/compiler/unit_dependencies.rs
+25 −28 src/cargo/core/resolver/features.rs
+2 −46 src/cargo/ops/cargo_clean.rs
+4 −29 src/cargo/ops/cargo_package.rs
+0 −18 src/cargo/ops/registry.rs
+1 −1 src/cargo/ops/registry/auth.rs
+5 −1 src/cargo/ops/tree/graph.rs
+8 −42 src/cargo/sources/git/utils.rs
+1 −14 src/cargo/util/config/mod.rs
+0 −43 src/cargo/util/mod.rs
+1 −1 src/cargo/util/toml_mut/manifest.rs
+1 −1 src/doc/contrib/src/architecture/codebase.md
+1 −1 src/doc/src/guide/tests.md
+0 −6 src/doc/src/reference/environment-variables.md
+1 −1 src/doc/src/reference/semver.md
+1 −58 tests/testsuite/artifact_dep.rs
+5 −24 tests/testsuite/build_script.rs
+1 −14 tests/testsuite/cargo_command.rs
+0 −3 tests/testsuite/cargo_remove/mod.rs
+0 −5 tests/testsuite/cargo_remove/workspace/in/Cargo.toml
+0 −24 tests/testsuite/cargo_remove/workspace/in/my-package/Cargo.toml
+0 −1 tests/testsuite/cargo_remove/workspace/in/my-package/src/main.rs
+0 −25 tests/testsuite/cargo_remove/workspace/mod.rs
+0 −2 tests/testsuite/cargo_remove/workspace/out/Cargo.toml
+0 −21 tests/testsuite/cargo_remove/workspace/out/my-package/Cargo.toml
+0 −1 tests/testsuite/cargo_remove/workspace/out/my-package/src/main.rs
+0 −2 tests/testsuite/cargo_remove/workspace/stderr.log
+0 −0 tests/testsuite/cargo_remove/workspace/stdout.log
+0 −30 tests/testsuite/cargo_remove/workspace_non_virtual/in/Cargo.toml
+0 −6 tests/testsuite/cargo_remove/workspace_non_virtual/in/my-member/Cargo.toml
+0 −0 tests/testsuite/cargo_remove/workspace_non_virtual/in/my-member/src/main.rs
+0 −25 tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs
+0 −24 tests/testsuite/cargo_remove/workspace_non_virtual/out/Cargo.toml
+0 −6 tests/testsuite/cargo_remove/workspace_non_virtual/out/my-member/Cargo.toml
+0 −0 tests/testsuite/cargo_remove/workspace_non_virtual/out/my-member/src/main.rs
+0 −2 tests/testsuite/cargo_remove/workspace_non_virtual/stderr.log
+0 −0 tests/testsuite/cargo_remove/workspace_non_virtual/stdout.log
+0 −5 tests/testsuite/cargo_remove/workspace_preserved/in/Cargo.toml
+0 −22 tests/testsuite/cargo_remove/workspace_preserved/in/my-other-package/Cargo.toml
+0 −1 tests/testsuite/cargo_remove/workspace_preserved/in/my-other-package/src/main.rs
+0 −24 tests/testsuite/cargo_remove/workspace_preserved/in/my-package/Cargo.toml
+0 −1 tests/testsuite/cargo_remove/workspace_preserved/in/my-package/src/main.rs
+0 −25 tests/testsuite/cargo_remove/workspace_preserved/mod.rs
+0 −5 tests/testsuite/cargo_remove/workspace_preserved/out/Cargo.toml
+0 −22 tests/testsuite/cargo_remove/workspace_preserved/out/my-other-package/Cargo.toml
+0 −1 tests/testsuite/cargo_remove/workspace_preserved/out/my-other-package/src/main.rs
+0 −21 tests/testsuite/cargo_remove/workspace_preserved/out/my-package/Cargo.toml
+0 −1 tests/testsuite/cargo_remove/workspace_preserved/out/my-package/src/main.rs
+0 −2 tests/testsuite/cargo_remove/workspace_preserved/stderr.log
+0 −0 tests/testsuite/cargo_remove/workspace_preserved/stdout.log
+1 −272 tests/testsuite/check.rs
+10 −90 tests/testsuite/clean.rs
+0 −2 tests/testsuite/credential_process.rs
+0 −2 tests/testsuite/cross_publish.rs
+0 −2 tests/testsuite/features_namespaced.rs
+0 −33 tests/testsuite/git.rs
+1 −1 tests/testsuite/git_gc.rs
+0 −38 tests/testsuite/install.rs
+0 −311 tests/testsuite/package.rs
+0 −31 tests/testsuite/publish.rs
+1 −13 tests/testsuite/publish_lockfile.rs
+0 −1 tests/testsuite/registry.rs
+0 −1 tests/testsuite/source_replacement.rs
+0 −13 tests/testsuite/test.rs
+0 −1 tests/testsuite/weak_dep_features.rs

0 comments on commit 215e3cd

Please sign in to comment.