mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Auto merge of #121265 - klensy:bump-18-02-24, r=Mark-Simulacrum

Browse source 
bump some deps

First commit dedupes darling* crates and remove one more syn 1.* dep
Second one bumps windows crate to 0.52
This commit is contained in:
bors 2024-02-18 16:54:15 +00:00
commit c9c83cca51
13 changed files with 37 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
Cargo.lock
View file

@ -931,43 +931,19 @@ dependencies = [
[[package]] [[package]]
name = "darling" name = "darling"
version = "0.14.4" version = "0.20.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850" checksum = "c376d08ea6aa96aafe61237c7200d1241cb177b7d3a542d791f2d118e9cbb955"
dependencies = [ dependencies = [
"darling_core 0.14.4", "darling_core",
"darling_macro 0.14.4", "darling_macro",
]
[[package]]
name = "darling"
version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc5d6b04b3fd0ba9926f945895de7d806260a2d7431ba82e7edaecb043c4c6b8"
dependencies = [
"darling_core 0.20.5",
"darling_macro 0.20.5",
] ]
[[package]] [[package]]
name = "darling_core" name = "darling_core"
version = "0.14.4" version = "0.20.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0" checksum = "33043dcd19068b8192064c704b3f83eb464f91f1ff527b44a4e2b08d9cdb8855"
dependencies = [
"fnv",
"ident_case",
"proc-macro2",
"quote",
"strsim 0.10.0",
"syn 1.0.109",
]
[[package]]
name = "darling_core"
version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04e48a959bcd5c761246f5d090ebc2fbf7b9cd527a492b07a67510c108f1e7e3"
dependencies = [ dependencies = [
"fnv", "fnv",
"ident_case", "ident_case",
@ -979,22 +955,11 @@ dependencies = [
[[package]] [[package]]
name = "darling_macro" name = "darling_macro"
version = "0.14.4" version = "0.20.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e" checksum = "c5a91391accf613803c2a9bf9abccdbaa07c54b4244a5b64883f9c3c137c86be"
dependencies = [ dependencies = [
"darling_core 0.14.4", "darling_core",
"quote",
"syn 1.0.109",
]
[[package]]
name = "darling_macro"
version = "0.20.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d1545d67a2149e1d93b7e5c7752dce5a7426eb5d1357ddcfd89336b94444f77"
dependencies = [
"darling_core 0.20.5",
"quote", "quote",
"syn 2.0.48", "syn 2.0.48",
] ]
@ -1036,33 +1001,33 @@ dependencies = [
[[package]] [[package]]
name = "derive_builder" name = "derive_builder"
version = "0.12.0" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d67778784b508018359cbc8696edb3db78160bab2c2a28ba7f56ef6932997f8" checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
dependencies = [ dependencies = [
"derive_builder_macro", "derive_builder_macro",
] ]
[[package]] [[package]]
name = "derive_builder_core" name = "derive_builder_core"
version = "0.12.0" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c11bdc11a0c47bc7d37d582b5285da6849c96681023680b906673c5707af7b0f" checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
dependencies = [ dependencies = [
"darling 0.14.4", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 1.0.109", "syn 2.0.48",
] ]
[[package]] [[package]]
name = "derive_builder_macro" name = "derive_builder_macro"
version = "0.12.0" version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ebcda35c7a396850a55ffeac740804b40ffec779b98fffbb1738f4033f0ee79e" checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
dependencies = [ dependencies = [
"derive_builder_core", "derive_builder_core",
"syn 1.0.109", "syn 2.0.48",
] ]
[[package]] [[package]]
@ -1084,7 +1049,7 @@ version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d" checksum = "4e8ef033054e131169b8f0f9a7af8f5533a9436fadf3c500ed547f730f07090d"
dependencies = [ dependencies = [
"darling 0.20.5", "darling",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.48", "syn 2.0.48",
@ -6206,11 +6171,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]] [[package]]
name = "windows" name = "windows"
version = "0.48.0" version = "0.52.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
dependencies = [ dependencies = [
"windows-targets 0.48.5", "windows-core",
"windows-targets 0.52.0",
] ]
[[package]] [[package]]

2
compiler/rustc_codegen_ssa/Cargo.toml
View file

@ -51,5 +51,5 @@ default-features = false
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write"] features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write"]
[target.'cfg(windows)'.dependencies.windows] [target.'cfg(windows)'.dependencies.windows]
version = "0.48.0" version = "0.52.0"
features = ["Win32_Globalization"] features = ["Win32_Globalization"]

2
compiler/rustc_data_structures/Cargo.toml
View file

@ -33,7 +33,7 @@ tracing = "0.1"
version = "0.12" version = "0.12"
[target.'cfg(windows)'.dependencies.windows] [target.'cfg(windows)'.dependencies.windows]
version = "0.48.0" version = "0.52.0"
features = [ features = [
"Win32_Foundation", "Win32_Foundation",
"Win32_Storage_FileSystem", "Win32_Storage_FileSystem",

1
compiler/rustc_data_structures/src/flock/windows.rs
View file

@ -69,7 +69,6 @@ impl Lock {
&mut overlapped, &mut overlapped,
) )
} }
.ok()
.map_err(|e| { .map_err(|e| {
let err = io::Error::from_raw_os_error(e.code().0); let err = io::Error::from_raw_os_error(e.code().0);
debug!("failed acquiring file lock: {}", err); debug!("failed acquiring file lock: {}", err);

6
compiler/rustc_data_structures/src/profiling.rs
View file

@ -866,16 +866,14 @@ cfg_match! {
use std::mem; use std::mem;
use windows::{ use windows::{
// FIXME: change back to K32GetProcessMemoryInfo when windows crate Win32::System::ProcessStatus::{K32GetProcessMemoryInfo, PROCESS_MEMORY_COUNTERS},
// updated to 0.49.0+ to drop dependency on psapi.dll
Win32::System::ProcessStatus::{GetProcessMemoryInfo, PROCESS_MEMORY_COUNTERS},
Win32::System::Threading::GetCurrentProcess, Win32::System::Threading::GetCurrentProcess,
}; };
let mut pmc = PROCESS_MEMORY_COUNTERS::default(); let mut pmc = PROCESS_MEMORY_COUNTERS::default();
let pmc_size = mem::size_of_val(&pmc); let pmc_size = mem::size_of_val(&pmc);
unsafe { unsafe {
GetProcessMemoryInfo( K32GetProcessMemoryInfo(
GetCurrentProcess(), GetCurrentProcess(),
&mut pmc, &mut pmc,
pmc_size as u32, pmc_size as u32,

2
compiler/rustc_driver_impl/Cargo.toml
View file

@ -60,7 +60,7 @@ libc = "0.2"
# tidy-alphabetical-end # tidy-alphabetical-end
[target.'cfg(windows)'.dependencies.windows] [target.'cfg(windows)'.dependencies.windows]
version = "0.48.0" version = "0.52.0"
features = [ features = [
"Win32_System_Diagnostics_Debug", "Win32_System_Diagnostics_Debug",
] ]

2
compiler/rustc_errors/Cargo.toml
View file

@ -30,7 +30,7 @@ unicode-width = "0.1.4"
# tidy-alphabetical-end # tidy-alphabetical-end
[target.'cfg(windows)'.dependencies.windows] [target.'cfg(windows)'.dependencies.windows]
version = "0.48.0" version = "0.52.0"
features = [ features = [
"Win32_Foundation", "Win32_Foundation",
"Win32_Security", "Win32_Security",

6
compiler/rustc_errors/src/lock.rs
View file

@ -27,7 +27,8 @@ pub fn acquire_global_lock(name: &str) -> Box<dyn Any> {
impl Drop for Handle { impl Drop for Handle {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
CloseHandle(self.0); // FIXME can panic here
CloseHandle(self.0).unwrap();
} }
} }
} }
@ -37,7 +38,8 @@ pub fn acquire_global_lock(name: &str) -> Box<dyn Any> {
impl Drop for Guard { impl Drop for Guard {
fn drop(&mut self) { fn drop(&mut self) {
unsafe { unsafe {
ReleaseMutex((self.0).0); // FIXME can panic here
ReleaseMutex((self.0).0).unwrap();
} }
} }
} }

2
compiler/rustc_session/Cargo.toml
View file

@ -30,7 +30,7 @@ libc = "0.2"
# tidy-alphabetical-end # tidy-alphabetical-end
[target.'cfg(windows)'.dependencies.windows] [target.'cfg(windows)'.dependencies.windows]
version = "0.48.0" version = "0.52.0"
features = [ features = [
"Win32_Foundation", "Win32_Foundation",
"Win32_System_LibraryLoader", "Win32_System_LibraryLoader",

1
compiler/rustc_session/src/filesearch.rs
View file

@ -143,7 +143,6 @@ fn current_dll_path() -> Result<PathBuf, String> {
&mut module, &mut module,
) )
} }
.ok()
.map_err(|e| e.to_string())?; .map_err(|e| e.to_string())?;
let mut filename = vec![0; 1024]; let mut filename = vec![0; 1024];

2
src/tools/compiletest/Cargo.toml
View file

@ -34,7 +34,7 @@ libc = "0.2"
miow = "0.6" miow = "0.6"
[target.'cfg(windows)'.dependencies.windows] [target.'cfg(windows)'.dependencies.windows]
version = "0.48.0" version = "0.52.0"
features = [ features = [
"Win32_Foundation", "Win32_Foundation",
"Win32_System_Diagnostics_Debug", "Win32_System_Diagnostics_Debug",

2
src/tools/opt-dist/Cargo.toml
View file

@ -21,6 +21,6 @@ serde = { version = "1", features = ["derive"] }
serde_json = "1" serde_json = "1"
glob = "0.3" glob = "0.3"
tempfile = "3.5" tempfile = "3.5"
derive_builder = "0.12" derive_builder = "0.20"
clap = { version = "4", features = ["derive"] } clap = { version = "4", features = ["derive"] }
tabled = { version = "0.13", default-features = false, features = ["std"] } tabled = { version = "0.13", default-features = false, features = ["std"] }

1
src/tools/tidy/src/deps.rs
View file

@ -384,6 +384,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"winapi-util", "winapi-util",
"winapi-x86_64-pc-windows-gnu", "winapi-x86_64-pc-windows-gnu",
"windows", "windows",
"windows-core",
"windows-sys", "windows-sys",
"windows-targets", "windows-targets",
"windows_aarch64_gnullvm", "windows_aarch64_gnullvm",