mirror of
https://git.yoctoproject.org/poky
synced 2026-06-01 13:09:50 +00:00
rust: Upgrade 1.72.1 -> 1.73.0
https://blog.rust-lang.org/2023/10/05/Rust-1.73.0.html (From OE-Core rev: 728c40b939c6af6358a483237298ca834cbb8993) Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
aa0b0d0cc2
commit
537ed2b654
@@ -19,10 +19,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
library/std/src/sys/unix/fs.rs | 27 ++++++++++++++++++++-------
|
||||
3 files changed, 38 insertions(+), 12 deletions(-)
|
||||
|
||||
Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
|
||||
Index: rustc-1.73.0-src/library/std/src/os/linux/fs.rs
|
||||
===================================================================
|
||||
--- rustc-1.72.0-src.orig/library/std/src/os/linux/fs.rs
|
||||
+++ rustc-1.72.0-src/library/std/src/os/linux/fs.rs
|
||||
--- rustc-1.73.0-src.orig/library/std/src/os/linux/fs.rs
|
||||
+++ rustc-1.73.0-src/library/std/src/os/linux/fs.rs
|
||||
@@ -329,7 +329,14 @@ pub trait MetadataExt {
|
||||
impl MetadataExt for Metadata {
|
||||
#[allow(deprecated)]
|
||||
@@ -39,10 +39,10 @@ Index: rustc-1.72.0-src/library/std/src/os/linux/fs.rs
|
||||
}
|
||||
fn st_dev(&self) -> u64 {
|
||||
self.as_inner().as_inner().st_dev as u64
|
||||
Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
|
||||
Index: rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
|
||||
===================================================================
|
||||
--- rustc-1.72.0-src.orig/library/std/src/sys/unix/fd.rs
|
||||
+++ rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
|
||||
--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fd.rs
|
||||
+++ rustc-1.73.0-src/library/std/src/sys/unix/fd.rs
|
||||
@@ -124,9 +124,12 @@ impl FileDesc {
|
||||
}
|
||||
|
||||
@@ -73,11 +73,11 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fd.rs
|
||||
use libc::pwrite64;
|
||||
|
||||
unsafe {
|
||||
Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
|
||||
Index: rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
|
||||
===================================================================
|
||||
--- rustc-1.72.0-src.orig/library/std/src/sys/unix/fs.rs
|
||||
+++ rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
|
||||
@@ -50,9 +50,13 @@ use libc::{c_int, mode_t};
|
||||
--- rustc-1.73.0-src.orig/library/std/src/sys/unix/fs.rs
|
||||
+++ rustc-1.73.0-src/library/std/src/sys/unix/fs.rs
|
||||
@@ -39,9 +39,13 @@ use libc::{c_int, mode_t};
|
||||
all(target_os = "linux", target_env = "gnu")
|
||||
))]
|
||||
use libc::c_char;
|
||||
@@ -93,7 +93,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
|
||||
use libc::fstatat64;
|
||||
#[cfg(any(
|
||||
target_os = "android",
|
||||
@@ -64,7 +68,7 @@ use libc::fstatat64;
|
||||
@@ -53,7 +57,7 @@ use libc::fstatat64;
|
||||
target_os = "vita",
|
||||
))]
|
||||
use libc::readdir as readdir64;
|
||||
@@ -102,7 +102,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
|
||||
use libc::readdir64;
|
||||
#[cfg(any(target_os = "emscripten", target_os = "l4re"))]
|
||||
use libc::readdir64_r;
|
||||
@@ -79,6 +83,7 @@ use libc::readdir64_r;
|
||||
@@ -68,6 +72,7 @@ use libc::readdir64_r;
|
||||
target_os = "redox",
|
||||
target_os = "nto",
|
||||
target_os = "vita",
|
||||
@@ -110,7 +110,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
|
||||
)))]
|
||||
use libc::readdir_r as readdir64_r;
|
||||
#[cfg(target_os = "android")]
|
||||
@@ -86,7 +91,13 @@ use libc::{
|
||||
@@ -75,7 +80,13 @@ use libc::{
|
||||
dirent as dirent64, fstat as fstat64, fstatat as fstatat64, ftruncate64, lseek64,
|
||||
lstat as lstat64, off64_t, open as open64, stat as stat64,
|
||||
};
|
||||
@@ -124,7 +124,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
|
||||
target_os = "linux",
|
||||
target_os = "emscripten",
|
||||
target_os = "l4re",
|
||||
@@ -96,7 +107,7 @@ use libc::{
|
||||
@@ -85,7 +96,7 @@ use libc::{
|
||||
dirent as dirent64, fstat as fstat64, ftruncate as ftruncate64, lseek as lseek64,
|
||||
lstat as lstat64, off_t as off64_t, open as open64, stat as stat64,
|
||||
};
|
||||
@@ -133,7 +133,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
|
||||
use libc::{dirent64, fstat64, ftruncate64, lseek64, lstat64, off64_t, open64, stat64};
|
||||
|
||||
pub use crate::sys_common::fs::try_exists;
|
||||
@@ -283,6 +294,7 @@ unsafe impl Sync for Dir {}
|
||||
@@ -272,6 +283,7 @@ unsafe impl Sync for Dir {}
|
||||
#[cfg(any(
|
||||
target_os = "android",
|
||||
target_os = "linux",
|
||||
@@ -141,7 +141,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
|
||||
target_os = "solaris",
|
||||
target_os = "illumos",
|
||||
target_os = "fuchsia",
|
||||
@@ -324,6 +336,7 @@ struct dirent64_min {
|
||||
@@ -313,6 +325,7 @@ struct dirent64_min {
|
||||
}
|
||||
|
||||
#[cfg(not(any(
|
||||
@@ -149,7 +149,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
|
||||
target_os = "android",
|
||||
target_os = "linux",
|
||||
target_os = "solaris",
|
||||
@@ -832,7 +845,7 @@ impl DirEntry {
|
||||
@@ -809,7 +822,7 @@ impl DirEntry {
|
||||
}
|
||||
|
||||
#[cfg(all(
|
||||
@@ -158,7 +158,7 @@ Index: rustc-1.72.0-src/library/std/src/sys/unix/fs.rs
|
||||
not(miri)
|
||||
))]
|
||||
pub fn metadata(&self) -> io::Result<FileAttr> {
|
||||
@@ -856,7 +869,7 @@ impl DirEntry {
|
||||
@@ -833,7 +846,7 @@ impl DirEntry {
|
||||
}
|
||||
|
||||
#[cfg(any(
|
||||
|
||||
@@ -6,9 +6,11 @@ Upstream-Status: Inappropriate [patches need rework]
|
||||
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
||||
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
|
||||
|
||||
--- rustc-1.69.0-src/compiler/rustc_codegen_llvm/src/context.rs.orig 2023-04-21 08:38:23.092458478 +0100
|
||||
+++ rustc-1.69.0-src/compiler/rustc_codegen_llvm/src/context.rs 2023-04-21 08:39:00.266819755 +0100
|
||||
@@ -156,46 +156,6 @@
|
||||
Index: rustc-1.73.0-src/compiler/rustc_codegen_llvm/src/context.rs
|
||||
===================================================================
|
||||
--- rustc-1.73.0-src.orig/compiler/rustc_codegen_llvm/src/context.rs
|
||||
+++ rustc-1.73.0-src/compiler/rustc_codegen_llvm/src/context.rs
|
||||
@@ -157,46 +157,6 @@ pub unsafe fn create_module<'ll>(
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user