diff options
| author | bors <bors@rust-lang.org> | 2023-05-09 08:16:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-09 08:16:26 +0000 |
| commit | ecd3dbab4ed82abfa05e22069261e565239449cf (patch) | |
| tree | 03ec27f0a1765fca86fd800b41e83c39c0bd529d /library/core/src | |
| parent | 7e7483d26e3cec7a44ef00cf7ae6c9c8c918bec6 (diff) | |
| parent | 9d913eb9e4eb2a433e8755e1359c1cccb344ad3f (diff) | |
| download | rust-ecd3dbab4ed82abfa05e22069261e565239449cf.tar.gz rust-ecd3dbab4ed82abfa05e22069261e565239449cf.zip | |
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
Diffstat (limited to 'library/core/src')
| -rw-r--r-- | library/core/src/mem/mod.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/library/core/src/mem/mod.rs b/library/core/src/mem/mod.rs index 7d2f2971523..4913a6de918 100644 --- a/library/core/src/mem/mod.rs +++ b/library/core/src/mem/mod.rs @@ -1315,9 +1315,9 @@ impl<T> SizedTypeProperties for T {} /// /// assert_eq!(mem::offset_of!(NestedA, b.0), 0); /// ``` -#[unstable(feature = "offset_of", issue = "106655")] -#[rustc_builtin_macro] #[cfg(not(bootstrap))] +#[unstable(feature = "offset_of", issue = "106655")] +#[allow_internal_unstable(builtin_syntax)] pub macro offset_of($Container:ty, $($fields:tt).+ $(,)?) { - /* compiler built-in */ + builtin # offset_of($Container, $($fields).+) } |