diff options
| author | bors <bors@rust-lang.org> | 2024-01-20 09:23:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-20 09:23:09 +0000 |
| commit | 314384b5fb21f3c163f2b871ddceabdd88319958 (patch) | |
| tree | f84abd66003884096b2174877c4cc544e1b09062 /compiler/rustc_error_codes/src | |
| parent | 5378c1cf0713ab224eb6431327c28522182feb69 (diff) | |
| parent | bb816e67b46fe5f1c520a6ecfadfc6a393b5f84f (diff) | |
| download | rust-314384b5fb21f3c163f2b871ddceabdd88319958.tar.gz rust-314384b5fb21f3c163f2b871ddceabdd88319958.zip | |
Auto merge of #120157 - matthiaskrgr:rollup-f0p3wkk, r=matthiaskrgr
Rollup of 10 pull requests Successful merges: - #103730 (Added NonZeroXxx::from_mut(_unchecked)?) - #113142 (optimize EscapeAscii's Display and CStr's Debug) - #118799 (Stabilize single-field offset_of) - #119613 (Expose Obligations created during type inference.) - #119752 (Avoid ICEs in trait names without `dyn`) - #120132 (Teach tidy about line/col information for malformed features) - #120135 (SMIR: Make the remaining "private" fields actually private) - #120148 (`single_use_lifetimes`: Don't suggest deleting lifetimes with bounds) - #120150 (Stabilize `round_ties_even`) - #120155 (Don't use `ReErased` to detect type test promotion failed) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_error_codes/src')
| -rw-r--r-- | compiler/rustc_error_codes/src/error_codes/E0795.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_error_codes/src/error_codes/E0795.md b/compiler/rustc_error_codes/src/error_codes/E0795.md index 20f51441c29..ad77d72c913 100644 --- a/compiler/rustc_error_codes/src/error_codes/E0795.md +++ b/compiler/rustc_error_codes/src/error_codes/E0795.md @@ -3,7 +3,7 @@ Invalid argument for the `offset_of!` macro. Erroneous code example: ```compile_fail,E0795 -#![feature(offset_of, offset_of_enum)] +#![feature(offset_of_enum, offset_of_nested)] let x = std::mem::offset_of!(Option<u8>, Some); ``` @@ -16,7 +16,7 @@ The offset of the contained `u8` in the `Option<u8>` can be found by specifying the field name `0`: ``` -#![feature(offset_of, offset_of_enum)] +#![feature(offset_of_enum, offset_of_nested)] let x: usize = std::mem::offset_of!(Option<u8>, Some.0); ``` |