Skip to content

Commit cc0b02d

Browse files
committed
Auto merge of #111380 - Dylan-DPC:rollup-xiptbhn, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #110304 (Add GNU Property Note) - #110504 (Tweak borrow suggestion span) - #110583 (tweak "make mut" spans when assigning to locals) - #110694 (Implement builtin # syntax and use it for offset_of!(...)) - #111120 (Suggest let for possible binding with ty) - #111252 (Min specialization improvements) - #111361 (Update books) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents afa2e61 + 00d1c86 commit cc0b02d

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

core/src/mem/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,9 +1315,9 @@ impl<T> SizedTypeProperties for T {}
13151315
///
13161316
/// assert_eq!(mem::offset_of!(NestedA, b.0), 0);
13171317
/// ```
1318-
#[unstable(feature = "offset_of", issue = "106655")]
1319-
#[rustc_builtin_macro]
13201318
#[cfg(not(bootstrap))]
1319+
#[unstable(feature = "offset_of", issue = "106655")]
1320+
#[allow_internal_unstable(builtin_syntax)]
13211321
pub macro offset_of($Container:ty, $($fields:tt).+ $(,)?) {
1322-
/* compiler built-in */
1322+
builtin # offset_of($Container, $($fields).+)
13231323
}

0 commit comments

Comments
 (0)