Skip to content

Commit

Permalink
Auto merge of rust-lang#114420 - weihanglo:update-cargo, r=weihanglo
Browse files Browse the repository at this point in the history 
Update cargo (CVE-2023-38497 fix included)

2 commits in 020651c52257052d28f6fd83fbecf5cfa1ed516c..d78bbf4bde3c6b95caca7512f537c6f9721426ff
2023-08-02 16:00:37 +0000 to 2023-08-03 12:58:25 +0000
- Fix CVE-2023-38497 for master (rust-lang/cargo#12443)
- Don't attempt to read a token from stdin if a cmdline token is provided (rust-lang/cargo#12440)

r? `@ghost`
  • Loading branch information
@bors
bors committed Aug 3, 2023
2 parents fcf3006 + 7482646 commit defed62
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 5 files
+8 −6 src/cargo/ops/registry/login.rs
+53 −11 src/cargo/sources/registry/mod.rs
+18 −0 src/cargo/util/mod.rs
+129 −3 tests/testsuite/registry.rs
+3 −2 tests/testsuite/vendor.rs

0 comments on commit defed62

Please sign in to comment.