Skip to content

Commit d6c8169

Browse files
borsbors
committed
Auto merge of rust-lang#129922 - matthiaskrgr:rollup-4vqx8ct, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - rust-lang#129152 (custom/external clippy support for bootstrapping) - rust-lang#129311 (don't copy `.rustc-dev-contents` from CI rustc) - rust-lang#129800 (Move the Windows remove_dir_all impl into a module and make it more race resistant) - rust-lang#129860 (update `object` dependency to remove duplicate `wasmparser`) - rust-lang#129885 (chore: remove repetitive words) - rust-lang#129913 (Add missing read_buf stub for x86_64-unknown-l4re-uclibc) - rust-lang#129916 (process.rs: remove "Basic usage" text where not useful) - rust-lang#129917 (Fix parsing of beta version in dry-run mode) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6199b69 + 29bcf80 commit d6c8169

File tree

16 files changed

+305
-242
lines changed

16 files changed

+305
-242
lines changed

Diff for: ‎Cargo.lock

+14-23
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ version = "0.4.2"
199199
source = "registry+https://github.com/rust-lang/crates.io-index"
200200
checksum = "01667f6f40216b9a0b2945e05fed5f1ad0ab6470e69cb9378001e37b1c0668e4"
201201
dependencies = [
202-
"object 0.36.3",
202+
"object 0.36.4",
203203
]
204204

205205
[[package]]
@@ -2453,17 +2453,17 @@ dependencies = [
24532453

24542454
[[package]]
24552455
name = "object"
2456-
version = "0.36.3"
2456+
version = "0.36.4"
24572457
source = "registry+https://github.com/rust-lang/crates.io-index"
2458-
checksum = "27b64972346851a39438c60b341ebc01bba47464ae329e55cf343eb93964efd9"
2458+
checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
24592459
dependencies = [
24602460
"crc32fast",
24612461
"flate2",
24622462
"hashbrown",
24632463
"indexmap",
24642464
"memchr",
24652465
"ruzstd 0.7.0",
2466-
"wasmparser 0.215.0",
2466+
"wasmparser",
24672467
]
24682468

24692469
[[package]]
@@ -3129,11 +3129,11 @@ dependencies = [
31293129
"build_helper",
31303130
"gimli 0.31.0",
31313131
"libc",
3132-
"object 0.36.3",
3132+
"object 0.36.4",
31333133
"regex",
31343134
"serde_json",
31353135
"similar",
3136-
"wasmparser 0.216.0",
3136+
"wasmparser",
31373137
]
31383138

31393139
[[package]]
@@ -3408,7 +3408,7 @@ dependencies = [
34083408
"itertools",
34093409
"libc",
34103410
"measureme",
3411-
"object 0.36.3",
3411+
"object 0.36.4",
34123412
"rustc-demangle",
34133413
"rustc_ast",
34143414
"rustc_attr",
@@ -3447,7 +3447,7 @@ dependencies = [
34473447
"itertools",
34483448
"jobserver",
34493449
"libc",
3450-
"object 0.36.3",
3450+
"object 0.36.4",
34513451
"pathdiff",
34523452
"regex",
34533453
"rustc_arena",
@@ -4431,7 +4431,7 @@ name = "rustc_target"
44314431
version = "0.0.0"
44324432
dependencies = [
44334433
"bitflags 2.6.0",
4434-
"object 0.36.3",
4434+
"object 0.36.4",
44354435
"rustc_abi",
44364436
"rustc_data_structures",
44374437
"rustc_feature",
@@ -5849,7 +5849,7 @@ dependencies = [
58495849
"lexopt",
58505850
"tempfile",
58515851
"wasi-preview1-component-adapter-provider",
5852-
"wasmparser 0.216.0",
5852+
"wasmparser",
58535853
"wat",
58545854
"wit-component",
58555855
"wit-parser",
@@ -5869,7 +5869,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
58695869
checksum = "04c23aebea22c8a75833ae08ed31ccc020835b12a41999e58c31464271b94a88"
58705870
dependencies = [
58715871
"leb128",
5872-
"wasmparser 0.216.0",
5872+
"wasmparser",
58735873
]
58745874

58755875
[[package]]
@@ -5885,16 +5885,7 @@ dependencies = [
58855885
"serde_json",
58865886
"spdx",
58875887
"wasm-encoder",
5888-
"wasmparser 0.216.0",
5889-
]
5890-
5891-
[[package]]
5892-
name = "wasmparser"
5893-
version = "0.215.0"
5894-
source = "registry+https://github.com/rust-lang/crates.io-index"
5895-
checksum = "53fbde0881f24199b81cf49b6ff8f9c145ac8eb1b7fc439adb5c099734f7d90e"
5896-
dependencies = [
5897-
"bitflags 2.6.0",
5888+
"wasmparser",
58985889
]
58995890

59005891
[[package]]
@@ -6228,7 +6219,7 @@ dependencies = [
62286219
"serde_json",
62296220
"wasm-encoder",
62306221
"wasm-metadata",
6231-
"wasmparser 0.216.0",
6222+
"wasmparser",
62326223
"wit-parser",
62336224
]
62346225

@@ -6247,7 +6238,7 @@ dependencies = [
62476238
"serde_derive",
62486239
"serde_json",
62496240
"unicode-xid",
6250-
"wasmparser 0.216.0",
6241+
"wasmparser",
62516242
]
62526243

62536244
[[package]]

Diff for: ‎config.example.toml

+7
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,13 @@
230230
# use this rustfmt binary instead as the stage0 snapshot rustfmt.
231231
#rustfmt = "/path/to/rustfmt"
232232

233+
# Instead of downloading the src/stage0 version of cargo-clippy specified,
234+
# use this cargo-clippy binary instead as the stage0 snapshot cargo-clippy.
235+
#
236+
# Note that this option should be used with the same toolchain as the `rustc` option above.
237+
# Otherwise, clippy is likely to fail due to a toolchain conflict.
238+
#cargo-clippy = "/path/to/cargo-clippy"
239+
233240
# Whether to build documentation by default. If false, rustdoc and
234241
# friends will still be compiled but they will not be used to generate any
235242
# documentation.

Diff for: ‎library/core/src/mem/transmutability.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ where
149149
#[derive(PartialEq, Eq, Clone, Copy, Debug)]
150150
pub struct Assume {
151151
/// When `false`, [`TransmuteFrom`] is not implemented for transmutations
152-
/// that might violate the the alignment requirements of references; e.g.:
152+
/// that might violate the alignment requirements of references; e.g.:
153153
///
154154
#[cfg_attr(bootstrap, doc = "```rust,ignore not runnable on bootstrap")]
155155
#[cfg_attr(not(bootstrap), doc = "```compile_fail,E0277")]

Diff for: ‎library/std/src/process.rs

-36
Original file line numberDiff line numberDiff line change
@@ -617,8 +617,6 @@ impl Command {
617617
///
618618
/// # Examples
619619
///
620-
/// Basic usage:
621-
///
622620
/// ```no_run
623621
/// use std::process::Command;
624622
///
@@ -699,8 +697,6 @@ impl Command {
699697
///
700698
/// # Examples
701699
///
702-
/// Basic usage:
703-
///
704700
/// ```no_run
705701
/// use std::process::Command;
706702
///
@@ -748,8 +744,6 @@ impl Command {
748744
///
749745
/// # Examples
750746
///
751-
/// Basic usage:
752-
///
753747
/// ```no_run
754748
/// use std::process::Command;
755749
///
@@ -786,8 +780,6 @@ impl Command {
786780
///
787781
/// # Examples
788782
///
789-
/// Basic usage:
790-
///
791783
/// ```no_run
792784
/// use std::process::Command;
793785
///
@@ -822,8 +814,6 @@ impl Command {
822814
///
823815
/// # Examples
824816
///
825-
/// Basic usage:
826-
///
827817
/// ```no_run
828818
/// use std::process::{Command, Stdio};
829819
/// use std::env;
@@ -870,8 +860,6 @@ impl Command {
870860
///
871861
/// # Examples
872862
///
873-
/// Basic usage:
874-
///
875863
/// ```no_run
876864
/// use std::process::Command;
877865
///
@@ -900,8 +888,6 @@ impl Command {
900888
///
901889
/// # Examples
902890
///
903-
/// Basic usage:
904-
///
905891
/// ```no_run
906892
/// use std::process::Command;
907893
///
@@ -928,8 +914,6 @@ impl Command {
928914
///
929915
/// # Examples
930916
///
931-
/// Basic usage:
932-
///
933917
/// ```no_run
934918
/// use std::process::Command;
935919
///
@@ -959,8 +943,6 @@ impl Command {
959943
///
960944
/// # Examples
961945
///
962-
/// Basic usage:
963-
///
964946
/// ```no_run
965947
/// use std::process::{Command, Stdio};
966948
///
@@ -988,8 +970,6 @@ impl Command {
988970
///
989971
/// # Examples
990972
///
991-
/// Basic usage:
992-
///
993973
/// ```no_run
994974
/// use std::process::{Command, Stdio};
995975
///
@@ -1017,8 +997,6 @@ impl Command {
1017997
///
1018998
/// # Examples
1019999
///
1020-
/// Basic usage:
1021-
///
10221000
/// ```no_run
10231001
/// use std::process::{Command, Stdio};
10241002
///
@@ -1039,8 +1017,6 @@ impl Command {
10391017
///
10401018
/// # Examples
10411019
///
1042-
/// Basic usage:
1043-
///
10441020
/// ```no_run
10451021
/// use std::process::Command;
10461022
///
@@ -2105,8 +2081,6 @@ impl Child {
21052081
///
21062082
/// # Examples
21072083
///
2108-
/// Basic usage:
2109-
///
21102084
/// ```no_run
21112085
/// use std::process::Command;
21122086
///
@@ -2129,8 +2103,6 @@ impl Child {
21292103
///
21302104
/// # Examples
21312105
///
2132-
/// Basic usage:
2133-
///
21342106
/// ```no_run
21352107
/// use std::process::Command;
21362108
///
@@ -2158,8 +2130,6 @@ impl Child {
21582130
///
21592131
/// # Examples
21602132
///
2161-
/// Basic usage:
2162-
///
21632133
/// ```no_run
21642134
/// use std::process::Command;
21652135
///
@@ -2194,8 +2164,6 @@ impl Child {
21942164
///
21952165
/// # Examples
21962166
///
2197-
/// Basic usage:
2198-
///
21992167
/// ```no_run
22002168
/// use std::process::Command;
22012169
///
@@ -2398,15 +2366,11 @@ pub fn abort() -> ! {
23982366
///
23992367
/// # Examples
24002368
///
2401-
/// Basic usage:
2402-
///
24032369
/// ```no_run
24042370
/// use std::process;
24052371
///
24062372
/// println!("My pid is {}", process::id());
24072373
/// ```
2408-
///
2409-
///
24102374
#[must_use]
24112375
#[stable(feature = "getpid", since = "1.26.0")]
24122376
pub fn id() -> u32 {

Diff for: ‎library/std/src/sync/reentrant_lock.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ cfg_if!(
136136
// match do we read out the actual TID.
137137
// Note also that we can use relaxed atomic operations here, because
138138
// we only ever read from the tid if `tls_addr` matches the current
139-
// TLS address. In that case, either the the tid has been set by
139+
// TLS address. In that case, either the tid has been set by
140140
// the current thread, or by a thread that has terminated before
141141
// the current thread was created. In either case, no further
142142
// synchronization is needed (as per <https://github.com/rust-lang/miri/issues/3450>)

Diff for: ‎library/std/src/sys/pal/unix/l4re.rs

+4
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@ pub mod net {
5454
unimpl!();
5555
}
5656

57+
pub fn read_buf(&self, _: BorrowedCursor<'_>) -> io::Result<()> {
58+
unimpl!();
59+
}
60+
5761
pub fn read_vectored(&self, _: &mut [IoSliceMut<'_>]) -> io::Result<usize> {
5862
unimpl!();
5963
}

Diff for: ‎library/std/src/sys/pal/windows/api.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ pub struct WinError {
254254
pub code: u32,
255255
}
256256
impl WinError {
257-
const fn new(code: u32) -> Self {
257+
pub const fn new(code: u32) -> Self {
258258
Self { code }
259259
}
260260
}
@@ -272,8 +272,11 @@ impl WinError {
272272
// tidy-alphabetical-start
273273
pub const ACCESS_DENIED: Self = Self::new(c::ERROR_ACCESS_DENIED);
274274
pub const ALREADY_EXISTS: Self = Self::new(c::ERROR_ALREADY_EXISTS);
275+
pub const BAD_NET_NAME: Self = Self::new(c::ERROR_BAD_NET_NAME);
276+
pub const BAD_NETPATH: Self = Self::new(c::ERROR_BAD_NETPATH);
275277
pub const CANT_ACCESS_FILE: Self = Self::new(c::ERROR_CANT_ACCESS_FILE);
276278
pub const DELETE_PENDING: Self = Self::new(c::ERROR_DELETE_PENDING);
279+
pub const DIR_NOT_EMPTY: Self = Self::new(c::ERROR_DIR_NOT_EMPTY);
277280
pub const DIRECTORY: Self = Self::new(c::ERROR_DIRECTORY);
278281
pub const FILE_NOT_FOUND: Self = Self::new(c::ERROR_FILE_NOT_FOUND);
279282
pub const INSUFFICIENT_BUFFER: Self = Self::new(c::ERROR_INSUFFICIENT_BUFFER);

Diff for: ‎library/std/src/sys/pal/windows/c/bindings.txt

+5
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ Windows.Wdk.Storage.FileSystem.FILE_WRITE_THROUGH
3434
Windows.Wdk.Storage.FileSystem.NtCreateFile
3535
Windows.Wdk.Storage.FileSystem.NTCREATEFILE_CREATE_DISPOSITION
3636
Windows.Wdk.Storage.FileSystem.NTCREATEFILE_CREATE_OPTIONS
37+
Windows.Wdk.Storage.FileSystem.NtOpenFile
3738
Windows.Wdk.Storage.FileSystem.NtReadFile
3839
Windows.Wdk.Storage.FileSystem.NtWriteFile
3940
Windows.Wdk.Storage.FileSystem.SYMLINK_FLAG_RELATIVE
@@ -1931,10 +1932,14 @@ Windows.Win32.Foundation.RtlNtStatusToDosError
19311932
Windows.Win32.Foundation.SetHandleInformation
19321933
Windows.Win32.Foundation.SetLastError
19331934
Windows.Win32.Foundation.STATUS_DELETE_PENDING
1935+
Windows.Win32.Foundation.STATUS_DIRECTORY_NOT_EMPTY
19341936
Windows.Win32.Foundation.STATUS_END_OF_FILE
1937+
Windows.Win32.Foundation.STATUS_FILE_DELETED
1938+
Windows.Win32.Foundation.STATUS_INVALID_HANDLE
19351939
Windows.Win32.Foundation.STATUS_INVALID_PARAMETER
19361940
Windows.Win32.Foundation.STATUS_NOT_IMPLEMENTED
19371941
Windows.Win32.Foundation.STATUS_PENDING
1942+
Windows.Win32.Foundation.STATUS_SHARING_VIOLATION
19381943
Windows.Win32.Foundation.STATUS_SUCCESS
19391944
Windows.Win32.Foundation.TRUE
19401945
Windows.Win32.Foundation.UNICODE_STRING

Diff for: ‎library/std/src/sys/pal/windows/c/windows_sys.rs

+5
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ windows_targets::link!("kernel32.dll" "system" fn WideCharToMultiByte(codepage :
105105
windows_targets::link!("kernel32.dll" "system" fn WriteConsoleW(hconsoleoutput : HANDLE, lpbuffer : PCWSTR, nnumberofcharstowrite : u32, lpnumberofcharswritten : *mut u32, lpreserved : *const core::ffi::c_void) -> BOOL);
106106
windows_targets::link!("kernel32.dll" "system" fn WriteFileEx(hfile : HANDLE, lpbuffer : *const u8, nnumberofbytestowrite : u32, lpoverlapped : *mut OVERLAPPED, lpcompletionroutine : LPOVERLAPPED_COMPLETION_ROUTINE) -> BOOL);
107107
windows_targets::link!("ntdll.dll" "system" fn NtCreateFile(filehandle : *mut HANDLE, desiredaccess : FILE_ACCESS_RIGHTS, objectattributes : *const OBJECT_ATTRIBUTES, iostatusblock : *mut IO_STATUS_BLOCK, allocationsize : *const i64, fileattributes : FILE_FLAGS_AND_ATTRIBUTES, shareaccess : FILE_SHARE_MODE, createdisposition : NTCREATEFILE_CREATE_DISPOSITION, createoptions : NTCREATEFILE_CREATE_OPTIONS, eabuffer : *const core::ffi::c_void, ealength : u32) -> NTSTATUS);
108+
windows_targets::link!("ntdll.dll" "system" fn NtOpenFile(filehandle : *mut HANDLE, desiredaccess : u32, objectattributes : *const OBJECT_ATTRIBUTES, iostatusblock : *mut IO_STATUS_BLOCK, shareaccess : u32, openoptions : u32) -> NTSTATUS);
108109
windows_targets::link!("ntdll.dll" "system" fn NtReadFile(filehandle : HANDLE, event : HANDLE, apcroutine : PIO_APC_ROUTINE, apccontext : *const core::ffi::c_void, iostatusblock : *mut IO_STATUS_BLOCK, buffer : *mut core::ffi::c_void, length : u32, byteoffset : *const i64, key : *const u32) -> NTSTATUS);
109110
windows_targets::link!("ntdll.dll" "system" fn NtWriteFile(filehandle : HANDLE, event : HANDLE, apcroutine : PIO_APC_ROUTINE, apccontext : *const core::ffi::c_void, iostatusblock : *mut IO_STATUS_BLOCK, buffer : *const core::ffi::c_void, length : u32, byteoffset : *const i64, key : *const u32) -> NTSTATUS);
110111
windows_targets::link!("ntdll.dll" "system" fn RtlNtStatusToDosError(status : NTSTATUS) -> u32);
@@ -2982,10 +2983,14 @@ pub struct STARTUPINFOW {
29822983
}
29832984
pub type STARTUPINFOW_FLAGS = u32;
29842985
pub const STATUS_DELETE_PENDING: NTSTATUS = 0xC0000056_u32 as _;
2986+
pub const STATUS_DIRECTORY_NOT_EMPTY: NTSTATUS = 0xC0000101_u32 as _;
29852987
pub const STATUS_END_OF_FILE: NTSTATUS = 0xC0000011_u32 as _;
2988+
pub const STATUS_FILE_DELETED: NTSTATUS = 0xC0000123_u32 as _;
2989+
pub const STATUS_INVALID_HANDLE: NTSTATUS = 0xC0000008_u32 as _;
29862990
pub const STATUS_INVALID_PARAMETER: NTSTATUS = 0xC000000D_u32 as _;
29872991
pub const STATUS_NOT_IMPLEMENTED: NTSTATUS = 0xC0000002_u32 as _;
29882992
pub const STATUS_PENDING: NTSTATUS = 0x103_u32 as _;
2993+
pub const STATUS_SHARING_VIOLATION: NTSTATUS = 0xC0000043_u32 as _;
29892994
pub const STATUS_SUCCESS: NTSTATUS = 0x0_u32 as _;
29902995
pub const STD_ERROR_HANDLE: STD_HANDLE = 4294967284u32;
29912996
pub type STD_HANDLE = u32;

0 commit comments

Comments
 (0)