Commit d28f037
authored
Rollup merge of rust-lang#112986 - weihanglo:update-cargo, r=weihanglo
Update cargo
8 commits in 4cebd130ebca3bc219180a54f3e26cc1b14a91de..03bc66b55c290324bd46eb22e369c8fae1908f91
2023-06-21 18:59:29 +0000 to 2023-06-23 23:27:46 +0000
- fix(script): Be quiet on programmatic output (rust-lang/cargo#12305)
- docs(unstable): Update script documentation (rust-lang/cargo#12308)
- cargo script example needs nightly -Zscript feature (rust-lang/cargo#12287)
- fix(script): Process config relative to script, not CWD (rust-lang/cargo#12303)
- -Znext-lockfile-bump: Don't suggest using -Z on stable (rust-lang/cargo#12302)
- build(deps): bump openssl from 0.10.54 to 0.10.55 (rust-lang/cargo#12300)
- Add `.toml` file extension restriction for `-Zconfig-include` (rust-lang/cargo#12298)
- docs(unstable): Point stable-unstable docs to nightly docs (rust-lang/cargo#12299)
r? `@ghost`1 file changed
+1
-1
lines changed- Cargo.lock+4-4
- Cargo.toml+1-1
- src/bin/cargo/cli.rs+72-46
- src/bin/cargo/commands/mod.rs+3-1
- src/bin/cargo/commands/run.rs+9-1
- src/cargo/core/resolver/encode.rs+2-2
- src/cargo/util/config/mod.rs+10
- src/doc/src/reference/unstable.md+34-24
- tests/testsuite/config_include.rs+77-35
- tests/testsuite/lockfile_compat.rs+15
- tests/testsuite/script.rs+109-26
0 commit comments