Commit 94015d3
committed
Auto merge of rust-lang#139926 - weihanglo:update-cargo, r=weihanglo
Update cargo
4 commits in 864f74d4eadcaea3eeda37a2e7f4d34de233d51e..d811228b14ae2707323f37346aee3f4147e247e6
2025-04-11 20:37:27 +0000 to 2025-04-15 15:18:42 +0000
- use `zlib-rs` for gzip compression in rust code (rust-lang/cargo#15417)
- test(rustfix): Use `snapbox` for snapshot testing (rust-lang/cargo#15429)
- chore(deps): update rust crate gix to 0.71.0 [security] (rust-lang/cargo#15391)
- Make sure search paths inside OUT_DIR precede external paths (rust-lang/cargo#15221)
Also,
* The license exception of sha1_smol with BSD-3-Clause is no longer needed, as `gix-*` doesn't depend on it.
* Cargo depends on zlib-rs, which is distributed under Zlib license
r? ghost2 files changed
+3
-2
lines changed- Cargo.lock+138-135
- Cargo.toml+6-2
- README.md+1-1
- crates/rustfix/Cargo.toml+2-1
- crates/rustfix/tests/everything/multiple-solutions.fixed.rs
- crates/rustfix/tests/everything/multiple-solutions.json
- crates/rustfix/tests/everything/multiple-solutions.rs
- crates/rustfix/tests/parse_and_replace.rs+76-162
- src/cargo/core/compiler/build_runner/mod.rs+3-1
- src/cargo/core/compiler/custom_build.rs+76-5
- src/cargo/core/compiler/mod.rs+37-10
- src/cargo/sources/path.rs+2-2
- src/cargo/util/context/target.rs+9-5
- src/doc/src/reference/features.md+1-1
- tests/testsuite/build_script.rs+87
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
132 | 132 | | |
133 | 133 | | |
134 | 134 | | |
| 135 | + | |
135 | 136 | | |
136 | 137 | | |
137 | 138 | | |
138 | | - | |
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
143 | 143 | | |
| 144 | + | |
144 | 145 | | |
145 | 146 | | |
146 | 147 | | |
| |||
0 commit comments