diff --git a/Cargo.lock b/Cargo.lock index 4e0e72d34153f..787ba8acfe2e5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -507,6 +507,10 @@ name = "cfg-if" version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +dependencies = [ + "compiler_builtins", + "rustc-std-workspace-core", +] [[package]] name = "chalk-derive" @@ -4603,7 +4607,7 @@ version = "0.0.0" dependencies = [ "addr2line 0.16.0", "alloc", - "cfg-if 0.1.10", + "cfg-if 1.0.0", "compiler_builtins", "core", "dlmalloc", @@ -4627,7 +4631,7 @@ dependencies = [ name = "std_detect" version = "0.1.5" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "compiler_builtins", "libc", "rustc-std-workspace-alloc", diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml index 324ecc8047730..b8c35ecd34933 100644 --- a/library/std/Cargo.toml +++ b/library/std/Cargo.toml @@ -11,7 +11,7 @@ crate-type = ["dylib", "rlib"] [dependencies] alloc = { path = "../alloc" } -cfg-if = { version = "0.1.8", features = ['rustc-dep-of-std'] } +cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] } panic_unwind = { path = "../panic_unwind", optional = true } panic_abort = { path = "../panic_abort" } core = { path = "../core" } diff --git a/library/stdarch b/library/stdarch index 42df7394d38bc..699c093a42283 160000 --- a/library/stdarch +++ b/library/stdarch @@ -1 +1 @@ -Subproject commit 42df7394d38bc7b945116ea3ad8a7cbcd1db50a9 +Subproject commit 699c093a42283c07e9763b4c19439a900ae2d321