Skip to content

Commit

Permalink
Auto merge of rust-lang#132581 - workingjubilee:rollup-4wj318p, r=wor…
Browse files Browse the repository at this point in the history
…kingjubilee

Rollup of 6 pull requests

Successful merges:

 - rust-lang#126136 (Call the target libdir target libdir)
 - rust-lang#132516 (Add bad-reg inline assembly ui test for RISC-V and s390x)
 - rust-lang#132521 (replace manual time convertions with std ones, comptime time format parsing)
 - rust-lang#132560 (Remove outdated tidy license fixmes)
 - rust-lang#132563 (Modify `NonZero` documentation to reference the underlying integer type)
 - rust-lang#132574 (compiler: Directly use rustc_abi almost everywhere)

r? `@ghost`
`@rustbot` modify labels: rollup
  • Loading branch information
bors committed Nov 4, 2024
2 parents 4390c35 + 699702f commit 2bb8ea3
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion core/src/num/nonzero.rs
Original file line number Diff line number Diff line change
Expand Up @@ -472,7 +472,15 @@ macro_rules! nonzero_integer {
reversed = $reversed:literal,
leading_zeros_test = $leading_zeros_test:expr,
) => {
/// An integer that is known not to equal zero.
#[doc = sign_dependent_expr!{
$signedness ?
if signed {
concat!("An [`", stringify!($Int), "`] that is known not to equal zero.")
}
if unsigned {
concat!("A [`", stringify!($Int), "`] that is known not to equal zero.")
}
}]
///
/// This enables some memory layout optimization.
#[doc = concat!("For example, `Option<", stringify!($Ty), ">` is the same size as `", stringify!($Int), "`:")]
Expand Down

0 comments on commit 2bb8ea3

Please sign in to comment.