Skip to content

Commit

Permalink
Auto merge of rust-lang#112421 - weihanglo:update-beta-cargo, r=weiha…
Browse files Browse the repository at this point in the history 
…nglo

[beta-1.71] cargo backport

1 commits in 64fb38c97ac4d3a327fc9032c862dd28c8833b17..cfd3bbd8fe4fd92074dfad04b7eb9a923646839f
2023-05-23 18:53:23 +0000 to 2023-06-08 08:44:47 +0000
- [beta-1.70] backport rust-lang/cargo#12234 (rust-lang/cargo#12242)

r? `@ghost`
  • Loading branch information
@bors
bors committed Jun 8, 2023
2 parents 4e8c9e8 + 27a6bdd commit 78a6ac0
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 6 files
+0 −4 src/bin/cargo/main.rs
+11 −41 src/cargo/ops/registry.rs
+79 −2 src/cargo/util/config/mod.rs
+1 −0 src/cargo/util/network/mod.rs
+42 −0 src/cargo/util/network/proxy.rs
+1 −1 tests/testsuite/git.rs

0 comments on commit 78a6ac0

Please sign in to comment.