Update Rust version and patches

Author: lrettig

config.sh

@@ -2,7 +2,7 @@
 
 param1=${1:-}
 
-export RUST_COMMIT=9b00956e56009bab2aa15d7bff10916599e3d6d6
+export RUST_COMMIT=051478957371ee0084a7c0913941d2a8c4757bb9
 
 # If -rust_commit specified then only export the rust commit variable
 if [ "$param1" == "-rust_commit" ]; then

patches/rust.patch

@@ -1,36 +1,8 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 927e93f2..dfbe7db5 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -734,9 +734,8 @@ checksum = "55b672471b4e9f9e95499ea597ff64941a309b2cdbffcc46f2cc5e2d971fd335"
-
- [[package]]
- name = "compiler_builtins"
--version = "0.1.108"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d68bc55329711cd719c2687bb147bc06211b0521f97ef398280108ccb23227e9"
-+version = "0.1.105"
-+source = "git+https://github.com/rust-lang/compiler-builtins?rev=0.1.105#80ed5f8c3ddbea7986c4a8243e42b963cb954b42"
- dependencies = [
-  "cc",
-  "rustc-std-workspace-core",
-diff --git a/Cargo.toml b/Cargo.toml
-index 5dd315ef2f7..680fb821c4c 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -120,6 +120,7 @@ strip = true
- rustc-std-workspace-core = { path = 'library/rustc-std-workspace-core' }
- rustc-std-workspace-alloc = { path = 'library/rustc-std-workspace-alloc' }
- rustc-std-workspace-std = { path = 'library/rustc-std-workspace-std' }
-+compiler_builtins = { git = "https://github.com/rust-lang/compiler-builtins", rev = "0.1.105" }
-
- [patch."https://github.com/rust-lang/rust-clippy"]
- clippy_lints = { path = "src/tools/clippy/clippy_lints" }
 diff --git a/compiler/rustc_target/src/spec/mod.rs b/compiler/rustc_target/src/spec/mod.rs
-index 941d767b..1b4004c4 100644
+index fe07d1167..07e786b6c 100644
 --- a/compiler/rustc_target/src/spec/mod.rs
 +++ b/compiler/rustc_target/src/spec/mod.rs
-@@ -1618,6 +1618,7 @@ fn $module() {
+@@ -1731,6 +1731,7 @@ fn $module() {
 
      ("x86_64-unikraft-linux-musl", x86_64_unikraft_linux_musl),
 
@@ -39,25 +11,25 @@ index 941d767b..1b4004c4 100644
      ("riscv32im-risc0-zkvm-elf", riscv32im_risc0_zkvm_elf),
      ("riscv32im-unknown-none-elf", riscv32im_unknown_none_elf),
 diff --git a/src/bootstrap/src/lib.rs b/src/bootstrap/src/lib.rs
-index 5ed6b357e20..a31645ab6e7 100644
+index cde090637..07c9c5758 100644
 --- a/src/bootstrap/src/lib.rs
 +++ b/src/bootstrap/src/lib.rs
-@@ -91,6 +91,10 @@
+@@ -95,6 +95,10 @@
      /* Extra values not defined in the built-in targets yet, but used in std */
      (Some(Mode::Std), "target_env", Some(&["libnx", "p2"])),
-     // (Some(Mode::Std), "target_os", Some(&[])),
+     (Some(Mode::Std), "target_os", Some(&["visionos"])),
 +    // #[cfg(bootstrap)] zkvm
 +    (Some(Mode::Std), "target_os", Some(&["zkvm"])),
 +    // #[cfg(bootstrap)] athena
 +    (Some(Mode::Std), "target_vendor", Some(&["athena", "succinct"])),
      (Some(Mode::Std), "target_arch", Some(&["arm64ec", "spirv", "nvptx", "xtensa"])),
+     (Some(Mode::ToolStd), "target_os", Some(&["visionos"])),
      /* Extra names used by dependencies */
-     // FIXME: Used by serde_json, but we should not be triggering on external dependencies.
 diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs
-index eab9138b..60507063 100644
+index bed76263b..121843a30 100644
 --- a/src/tools/build-manifest/src/main.rs
 +++ b/src/tools/build-manifest/src/main.rs
-@@ -123,6 +123,7 @@
+@@ -125,6 +125,7 @@
      "powerpc-unknown-linux-gnu",
      "powerpc64-unknown-linux-gnu",
      "powerpc64le-unknown-linux-gnu",
@@ -115,58 +87,3 @@ index 00000000..a84f76c2
 +    }
 +}
 +
-diff --git a/library/std/src/sys/pal/zkvm/args.rs b/library/std/src/sys/pal/zkvm/args.rs
-index 7753cf63840..583c16e3a47 100644
---- a/library/std/src/sys/pal/zkvm/args.rs
-+++ b/library/std/src/sys/pal/zkvm/args.rs
-@@ -1,6 +1,7 @@
- use super::{abi, WORD_SIZE};
- use crate::ffi::OsString;
- use crate::fmt;
-+use crate::sys::os_str;
- use crate::sys_common::FromInner;
-
- pub struct Args {
-@@ -33,7 +34,7 @@ fn argv(i: usize) -> OsString {
-         // "os_str".
-         let arg_bytes: &[u8] =
-             unsafe { crate::slice::from_raw_parts(words.cast() as *const u8, arg_len) };
--        OsString::from_inner(super::os_str::Buf { inner: arg_bytes.to_vec() })
-+        OsString::from_inner(os_str::Buf { inner: arg_bytes.to_vec() })
-     }
- }
-
-diff --git a/library/std/src/sys/pal/zkvm/mod.rs b/library/std/src/sys/pal/zkvm/mod.rs
-index 228a976dbab..c5a1843d5ff 100644
---- a/library/std/src/sys/pal/zkvm/mod.rs
-+++ b/library/std/src/sys/pal/zkvm/mod.rs
-@@ -12,8 +12,6 @@
- pub mod alloc;
- #[path = "../zkvm/args.rs"]
- pub mod args;
--#[path = "../unix/cmath.rs"]
--pub mod cmath;
- pub mod env;
- #[path = "../unsupported/fs.rs"]
- pub mod fs;
-diff --git a/library/std/src/sys/pal/zkvm/os.rs b/library/std/src/sys/pal/zkvm/os.rs
-index d8739ee3824..759beb2d306 100644
---- a/library/std/src/sys/pal/zkvm/os.rs
-+++ b/library/std/src/sys/pal/zkvm/os.rs
-@@ -5,6 +5,7 @@
- use crate::io;
- use crate::marker::PhantomData;
- use crate::path::{self, PathBuf};
-+use crate::sys::os_str;
- use crate::sys_common::FromInner;
-
- pub fn errno() -> i32 {
-@@ -111,7 +112,7 @@ pub fn getenv(varname: &OsStr) -> Option<OsString> {
-     // reimplement "os_str" instead of just using the generic unix
-     // "os_str".
-     let u8s: &[u8] = unsafe { crate::slice::from_raw_parts(words.cast() as *const u8, nbytes) };
--    Some(OsString::from_inner(super::os_str::Buf { inner: u8s.to_vec() }))
-+    Some(OsString::from_inner(os_str::Buf { inner: u8s.to_vec() }))
- }
-
- pub fn setenv(_: &OsStr, _: &OsStr) -> io::Result<()> {