This is the next upgrade to the Rust toolchain, from 1.75.0 to 1.76.0 (i.e. the latest) [1]. See the upgrade policy [2] and the comments on the first upgrade in commit 3ed03f4da06e ("rust: upgrade to Rust 1.68.2"). # Unstable features No unstable features that we use were stabilized in Rust 1.76.0. The only unstable features allowed to be used outside the `kernel` crate are still `new_uninit,offset_of`, though other code to be upstreamed may increase the list. Please see [3] for details. # Required changes `rustc` (and others) now warns when it cannot connect to the Make jobserver, thus mark those invocations as recursive as needed. Please see the previous commit for details. # Other changes Rust 1.76.0 does not emit the `.debug_pub{names,types}` sections anymore for DWARFv4 [4][5]. For instance, in the uncompressed debug info case, this debug information took: samples/rust/rust_minimal.o ~64 KiB (~18% of total object size) rust/kernel.o ~92 KiB (~15%) rust/core.o ~114 KiB ( ~5%) In the compressed debug info (zlib) case: samples/rust/rust_minimal.o ~11 KiB (~6%) rust/kernel.o ~17 KiB (~5%) rust/core.o ~21 KiB (~1.5%) In addition, the `rustc_codegen_gcc` backend now does not emit the `.eh_frame` section when compiling under `-Cpanic=abort` [6], thus removing the need for the patch in the CI to compile the kernel [7]. Moreover, it also now emits the `.comment` section too [6]. # `alloc` upgrade and reviewing The vast majority of changes are due to our `alloc` fork being upgraded at once. There are two kinds of changes to be aware of: the ones coming from upstream, which we should follow as closely as possible, and the updates needed in our added fallible APIs to keep them matching the newer infallible APIs coming from upstream. Instead of taking a look at the diff of this patch, an alternative approach is reviewing a diff of the changes between upstream `alloc` and the kernel's. This allows to easily inspect the kernel additions only, especially to check if the fallible methods we already have still match the infallible ones in the new version coming from upstream. Another approach is reviewing the changes introduced in the additions in the kernel fork between the two versions. This is useful to spot potentially unintended changes to our additions. To apply these approaches, one may follow steps similar to the following to generate a pair of patches that show the differences between upstream Rust and the kernel (for the subset of `alloc` we use) before and after applying this patch: # Get the difference with respect to the old version. git -C rust checkout $(linux/scripts/min-tool-version.sh rustc) git -C linux ls-tree -r --name-only HEAD -- rust/alloc | cut -d/ -f3- | grep -Fv README.md | xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH git -C linux diff --patch-with-stat --summary -R > old.patch git -C linux restore rust/alloc # Apply this patch. git -C linux am rust-upgrade.patch # Get the difference with respect to the new version. git -C rust checkout $(linux/scripts/min-tool-version.sh rustc) git -C linux ls-tree -r --name-only HEAD -- rust/alloc | cut -d/ -f3- | grep -Fv README.md | xargs -IPATH cp rust/library/alloc/src/PATH linux/rust/alloc/PATH git -C linux diff --patch-with-stat --summary -R > new.patch git -C linux restore rust/alloc Now one may check the `new.patch` to take a look at the additions (first approach) or at the difference between those two patches (second approach). For the latter, a side-by-side tool is recommended. Link: https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1760-2024-02-08 [1] Link: https://rust-for-linux.com/rust-version-policy [2] Link: https://github.com/Rust-for-Linux/linux/issues/2 [3] Link: https://github.com/rust-lang/compiler-team/issues/688 [4] Link: https://github.com/rust-lang/rust/pull/117962 [5] Link: https://github.com/rust-lang/rust/pull/118068 [6] Link: https://github.com/Rust-for-Linux/ci-rustc_codegen_gcc [7] Tested-by: Boqun Feng <boqun.feng@gmail.com> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Link: https://lore.kernel.org/r/20240217002638.57373-2-ojeda@kernel.org Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
161 lines
4.5 KiB
Rust
161 lines
4.5 KiB
Rust
// SPDX-License-Identifier: Apache-2.0 OR MIT
|
||
|
||
//! Collection types.
|
||
|
||
#![stable(feature = "rust1", since = "1.0.0")]
|
||
|
||
#[cfg(not(no_global_oom_handling))]
|
||
pub mod binary_heap;
|
||
#[cfg(not(no_global_oom_handling))]
|
||
mod btree;
|
||
#[cfg(not(no_global_oom_handling))]
|
||
pub mod linked_list;
|
||
#[cfg(not(no_global_oom_handling))]
|
||
pub mod vec_deque;
|
||
|
||
#[cfg(not(no_global_oom_handling))]
|
||
#[stable(feature = "rust1", since = "1.0.0")]
|
||
pub mod btree_map {
|
||
//! An ordered map based on a B-Tree.
|
||
#[stable(feature = "rust1", since = "1.0.0")]
|
||
pub use super::btree::map::*;
|
||
}
|
||
|
||
#[cfg(not(no_global_oom_handling))]
|
||
#[stable(feature = "rust1", since = "1.0.0")]
|
||
pub mod btree_set {
|
||
//! An ordered set based on a B-Tree.
|
||
#[stable(feature = "rust1", since = "1.0.0")]
|
||
pub use super::btree::set::*;
|
||
}
|
||
|
||
#[cfg(not(no_global_oom_handling))]
|
||
#[stable(feature = "rust1", since = "1.0.0")]
|
||
#[doc(no_inline)]
|
||
pub use binary_heap::BinaryHeap;
|
||
|
||
#[cfg(not(no_global_oom_handling))]
|
||
#[stable(feature = "rust1", since = "1.0.0")]
|
||
#[doc(no_inline)]
|
||
pub use btree_map::BTreeMap;
|
||
|
||
#[cfg(not(no_global_oom_handling))]
|
||
#[stable(feature = "rust1", since = "1.0.0")]
|
||
#[doc(no_inline)]
|
||
pub use btree_set::BTreeSet;
|
||
|
||
#[cfg(not(no_global_oom_handling))]
|
||
#[stable(feature = "rust1", since = "1.0.0")]
|
||
#[doc(no_inline)]
|
||
pub use linked_list::LinkedList;
|
||
|
||
#[cfg(not(no_global_oom_handling))]
|
||
#[stable(feature = "rust1", since = "1.0.0")]
|
||
#[doc(no_inline)]
|
||
pub use vec_deque::VecDeque;
|
||
|
||
use crate::alloc::{Layout, LayoutError};
|
||
use core::fmt::Display;
|
||
|
||
/// The error type for `try_reserve` methods.
|
||
#[derive(Clone, PartialEq, Eq, Debug)]
|
||
#[stable(feature = "try_reserve", since = "1.57.0")]
|
||
pub struct TryReserveError {
|
||
kind: TryReserveErrorKind,
|
||
}
|
||
|
||
impl TryReserveError {
|
||
/// Details about the allocation that caused the error
|
||
#[inline]
|
||
#[must_use]
|
||
#[unstable(
|
||
feature = "try_reserve_kind",
|
||
reason = "Uncertain how much info should be exposed",
|
||
issue = "48043"
|
||
)]
|
||
pub fn kind(&self) -> TryReserveErrorKind {
|
||
self.kind.clone()
|
||
}
|
||
}
|
||
|
||
/// Details of the allocation that caused a `TryReserveError`
|
||
#[derive(Clone, PartialEq, Eq, Debug)]
|
||
#[unstable(
|
||
feature = "try_reserve_kind",
|
||
reason = "Uncertain how much info should be exposed",
|
||
issue = "48043"
|
||
)]
|
||
pub enum TryReserveErrorKind {
|
||
/// Error due to the computed capacity exceeding the collection's maximum
|
||
/// (usually `isize::MAX` bytes).
|
||
CapacityOverflow,
|
||
|
||
/// The memory allocator returned an error
|
||
AllocError {
|
||
/// The layout of allocation request that failed
|
||
layout: Layout,
|
||
|
||
#[doc(hidden)]
|
||
#[unstable(
|
||
feature = "container_error_extra",
|
||
issue = "none",
|
||
reason = "\
|
||
Enable exposing the allocator’s custom error value \
|
||
if an associated type is added in the future: \
|
||
https://github.com/rust-lang/wg-allocators/issues/23"
|
||
)]
|
||
non_exhaustive: (),
|
||
},
|
||
}
|
||
|
||
#[unstable(
|
||
feature = "try_reserve_kind",
|
||
reason = "Uncertain how much info should be exposed",
|
||
issue = "48043"
|
||
)]
|
||
impl From<TryReserveErrorKind> for TryReserveError {
|
||
#[inline]
|
||
fn from(kind: TryReserveErrorKind) -> Self {
|
||
Self { kind }
|
||
}
|
||
}
|
||
|
||
#[unstable(feature = "try_reserve_kind", reason = "new API", issue = "48043")]
|
||
impl From<LayoutError> for TryReserveErrorKind {
|
||
/// Always evaluates to [`TryReserveErrorKind::CapacityOverflow`].
|
||
#[inline]
|
||
fn from(_: LayoutError) -> Self {
|
||
TryReserveErrorKind::CapacityOverflow
|
||
}
|
||
}
|
||
|
||
#[stable(feature = "try_reserve", since = "1.57.0")]
|
||
impl Display for TryReserveError {
|
||
fn fmt(
|
||
&self,
|
||
fmt: &mut core::fmt::Formatter<'_>,
|
||
) -> core::result::Result<(), core::fmt::Error> {
|
||
fmt.write_str("memory allocation failed")?;
|
||
let reason = match self.kind {
|
||
TryReserveErrorKind::CapacityOverflow => {
|
||
" because the computed capacity exceeded the collection's maximum"
|
||
}
|
||
TryReserveErrorKind::AllocError { .. } => {
|
||
" because the memory allocator returned an error"
|
||
}
|
||
};
|
||
fmt.write_str(reason)
|
||
}
|
||
}
|
||
|
||
/// An intermediate trait for specialization of `Extend`.
|
||
#[doc(hidden)]
|
||
#[cfg(not(no_global_oom_handling))]
|
||
trait SpecExtend<I: IntoIterator> {
|
||
/// Extends `self` with the contents of the given iterator.
|
||
fn spec_extend(&mut self, iter: I);
|
||
}
|
||
|
||
#[stable(feature = "try_reserve", since = "1.57.0")]
|
||
impl core::error::Error for TryReserveError {}
|