Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 8 pull requests #129922

Merged
merged 18 commits into from
Sep 3, 2024
+305 −242
Merged

Rollup of 8 pull requests #129922

Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
fa6d54f
don't copy `.rustc-dev-contents` from CI rustc
onur-ozkan Aug 20, 2024
9d694b5
support custom clippy
onur-ozkan Aug 26, 2024
9dcc656
document `build.cargo-clippy` option
onur-ozkan Aug 26, 2024
1a991e5
add change entry for custom clippy support
onur-ozkan Aug 26, 2024
bb9d5c4
Move remove_dir_all impl into a module
ChrisDenton Aug 31, 2024
d30b5f0
update `object` dependency to deduplicate `wasmparser`
lqd Sep 1, 2024
25c4aa8
chore: remove repetitive words
cuishuang Sep 2, 2024
fcb7d3f
Add missing read_buf stub for x86_64-unknown-l5re-uclibc
saethlin Sep 2, 2024
0a89f72
process.rs: remove "Basic usage" text where not useful
tshepang Sep 2, 2024
f1e5191
Fix parsing of beta version in dry-run mode
Kobzol Sep 2, 2024
11398ed
Rollup merge of #129152 - onur-ozkan:custom-clippy, r=Kobzol
matthiaskrgr Sep 3, 2024
44187d6
Rollup merge of #129311 - onur-ozkan:multiple-candidates-fix, r=Kobzol
matthiaskrgr Sep 3, 2024
72cc383
Rollup merge of #129800 - ChrisDenton:remove-dir-all2, r=Amanieu
matthiaskrgr Sep 3, 2024
e9cd996
Rollup merge of #129860 - lqd:remove-duplicate-deps, r=alexcrichton
matthiaskrgr Sep 3, 2024
afb9232
Rollup merge of #129885 - cuishuang:master, r=scottmcm
matthiaskrgr Sep 3, 2024
f943c53
Rollup merge of #129913 - saethlin:l4re-read-buf, r=Noratrieb
matthiaskrgr Sep 3, 2024
6e38c9b
Rollup merge of #129916 - tshepang:basic-usage, r=ChrisDenton
matthiaskrgr Sep 3, 2024
29bcf80
Rollup merge of #129917 - Kobzol:fix-beta-git, r=Mark-Simulacrum
matthiaskrgr Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 14 additions & 23 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01667f6f40216b9a0b2945e05fed5f1ad0ab6470e69cb9378001e37b1c0668e4"
dependencies = [
"object 0.36.3",
"object 0.36.4",
]

[[package]]
Expand Down Expand Up @@ -2453,17 +2453,17 @@ dependencies = [

[[package]]
name = "object"
version = "0.36.3"
version = "0.36.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
dependencies = [
"crc32fast",
"flate2",
"hashbrown",
"indexmap",
"memchr",
"ruzstd 0.7.0",
"wasmparser 0.215.0",
"wasmparser",
]

[[package]]
Expand Down Expand Up @@ -3129,11 +3129,11 @@ dependencies = [
"build_helper",
"gimli 0.31.0",
"libc",
"object 0.36.3",
"object 0.36.4",
"regex",
"serde_json",
"similar",
"wasmparser 0.216.0",
"wasmparser",
]

[[package]]
Expand Down Expand Up @@ -3408,7 +3408,7 @@ dependencies = [
"itertools",
"libc",
"measureme",
"object 0.36.3",
"object 0.36.4",
"rustc-demangle",
"rustc_ast",
"rustc_attr",
Expand Down Expand Up @@ -3447,7 +3447,7 @@ dependencies = [
"itertools",
"jobserver",
"libc",
"object 0.36.3",
"object 0.36.4",
"pathdiff",
"regex",
"rustc_arena",
Expand Down Expand Up @@ -4431,7 +4431,7 @@ name = "rustc_target"
version = "0.0.0"
dependencies = [
"bitflags 2.6.0",
"object 0.36.3",
"object 0.36.4",
"rustc_abi",
"rustc_data_structures",
"rustc_feature",
Expand Down Expand Up @@ -5849,7 +5849,7 @@ dependencies = [
"lexopt",
"tempfile",
"wasi-preview1-component-adapter-provider",
"wasmparser 0.216.0",
"wasmparser",
"wat",
"wit-component",
"wit-parser",
Expand All @@ -5869,7 +5869,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88"
dependencies = [
"leb128",
"wasmparser 0.216.0",
"wasmparser",
]

[[package]]
Expand All @@ -5885,16 +5885,7 @@ dependencies = [
"serde_json",
"spdx",
"wasm-encoder",
"wasmparser 0.216.0",
]

[[package]]
name = "wasmparser"
version = "0.215.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e"
dependencies = [
"bitflags 2.6.0",
"wasmparser",
]

[[package]]
Expand Down Expand Up @@ -6228,7 +6219,7 @@ dependencies = [
"serde_json",
"wasm-encoder",
"wasm-metadata",
"wasmparser 0.216.0",
"wasmparser",
"wit-parser",
]

Expand All @@ -6247,7 +6238,7 @@ dependencies = [
"serde_derive",
"serde_json",
"unicode-xid",
"wasmparser 0.216.0",
"wasmparser",
]

[[package]]
Expand Down