mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-16 03:11:11 -04:00
rust: move static_assert into build_assert
Conceptually, `static_assert` is also a build-time assertion that occurs earlier in the pipeline. Consolidate the implementation so that we can use this as the canonical place to add more useful build-time assertions. Reviewed-by: Yury Norov <ynorov@nvidia.com> Signed-off-by: Gary Guo <gary@garyguo.net> Reviewed-by: Alice Ryhl <aliceryhl@google.com> Reviewed-by: Danilo Krummrich <dakr@kernel.org> Link: https://patch.msgid.link/20260319121653.2975748-2-gary@kernel.org [ Used kernel vertical style. - Miguel ] Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
@@ -1,10 +1,46 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
//! Build-time assert.
|
||||
//! Various assertions that happen during build-time.
|
||||
|
||||
#[doc(hidden)]
|
||||
pub use build_error::build_error;
|
||||
|
||||
/// Static assert (i.e. compile-time assert).
|
||||
///
|
||||
/// Similar to C11 [`_Static_assert`] and C++11 [`static_assert`].
|
||||
///
|
||||
/// An optional panic message can be supplied after the expression.
|
||||
/// Currently only a string literal without formatting is supported
|
||||
/// due to constness limitations of the [`assert!`] macro.
|
||||
///
|
||||
/// The feature may be added to Rust in the future: see [RFC 2790].
|
||||
///
|
||||
/// [`_Static_assert`]: https://en.cppreference.com/w/c/language/_Static_assert
|
||||
/// [`static_assert`]: https://en.cppreference.com/w/cpp/language/static_assert
|
||||
/// [RFC 2790]: https://github.com/rust-lang/rfcs/issues/2790
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// static_assert!(42 > 24);
|
||||
/// static_assert!(core::mem::size_of::<u8>() == 1);
|
||||
///
|
||||
/// const X: &[u8] = b"bar";
|
||||
/// static_assert!(X[1] == b'a');
|
||||
///
|
||||
/// const fn f(x: i32) -> i32 {
|
||||
/// x + 2
|
||||
/// }
|
||||
/// static_assert!(f(40) == 42);
|
||||
/// static_assert!(f(40) == 42, "f(x) must add 2 to the given input.");
|
||||
/// ```
|
||||
#[macro_export]
|
||||
macro_rules! static_assert {
|
||||
($condition:expr $(,$arg:literal)?) => {
|
||||
const _: () = ::core::assert!($condition $(,$arg)?);
|
||||
};
|
||||
}
|
||||
|
||||
/// Fails the build if the code path calling `build_error!` can possibly be executed.
|
||||
///
|
||||
/// If the macro is executed in const context, `build_error!` will panic.
|
||||
@@ -74,8 +110,6 @@ macro_rules! build_error {
|
||||
/// assert!(n > 1); // Run-time check
|
||||
/// }
|
||||
/// ```
|
||||
///
|
||||
/// [`static_assert!`]: crate::static_assert!
|
||||
#[macro_export]
|
||||
macro_rules! build_assert {
|
||||
($cond:expr $(,)?) => {{
|
||||
|
||||
@@ -144,7 +144,6 @@
|
||||
pub mod slice;
|
||||
#[cfg(CONFIG_SOC_BUS)]
|
||||
pub mod soc;
|
||||
mod static_assert;
|
||||
#[doc(hidden)]
|
||||
pub mod std_vendor;
|
||||
pub mod str;
|
||||
|
||||
@@ -29,7 +29,11 @@
|
||||
|
||||
pub use pin_init::{init, pin_data, pin_init, pinned_drop, InPlaceWrite, Init, PinInit, Zeroable};
|
||||
|
||||
pub use super::{build_assert, build_error};
|
||||
pub use super::{
|
||||
build_assert,
|
||||
build_error,
|
||||
static_assert, //
|
||||
};
|
||||
|
||||
// `super::std_vendor` is hidden, which makes the macro inline for some reason.
|
||||
#[doc(no_inline)]
|
||||
@@ -39,8 +43,6 @@
|
||||
|
||||
pub use super::{try_init, try_pin_init};
|
||||
|
||||
pub use super::static_assert;
|
||||
|
||||
pub use super::error::{code::*, Error, Result};
|
||||
|
||||
pub use super::{str::CStrExt as _, ThisModule};
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
|
||||
//! Static assert.
|
||||
|
||||
/// Static assert (i.e. compile-time assert).
|
||||
///
|
||||
/// Similar to C11 [`_Static_assert`] and C++11 [`static_assert`].
|
||||
///
|
||||
/// An optional panic message can be supplied after the expression.
|
||||
/// Currently only a string literal without formatting is supported
|
||||
/// due to constness limitations of the [`assert!`] macro.
|
||||
///
|
||||
/// The feature may be added to Rust in the future: see [RFC 2790].
|
||||
///
|
||||
/// [`_Static_assert`]: https://en.cppreference.com/w/c/language/_Static_assert
|
||||
/// [`static_assert`]: https://en.cppreference.com/w/cpp/language/static_assert
|
||||
/// [RFC 2790]: https://github.com/rust-lang/rfcs/issues/2790
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```
|
||||
/// static_assert!(42 > 24);
|
||||
/// static_assert!(core::mem::size_of::<u8>() == 1);
|
||||
///
|
||||
/// const X: &[u8] = b"bar";
|
||||
/// static_assert!(X[1] == b'a');
|
||||
///
|
||||
/// const fn f(x: i32) -> i32 {
|
||||
/// x + 2
|
||||
/// }
|
||||
/// static_assert!(f(40) == 42);
|
||||
/// static_assert!(f(40) == 42, "f(x) must add 2 to the given input.");
|
||||
/// ```
|
||||
#[macro_export]
|
||||
macro_rules! static_assert {
|
||||
($condition:expr $(,$arg:literal)?) => {
|
||||
const _: () = ::core::assert!($condition $(,$arg)?);
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user