diff options
| author | bors <bors@rust-lang.org> | 2023-03-22 19:04:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-22 19:04:49 +0000 |
| commit | a266f11990d9544ee408e213e1eec8cc9eb032b7 (patch) | |
| tree | 8047ee2a1679b107542e980b2ffb2f1f9daf91b5 /src/doc | |
| parent | 439292bc7913399e406d9bb7e8da0f70c6317c6e (diff) | |
| parent | eda88a30c767d1933aaf82a83d679a245b7d26b8 (diff) | |
| download | rust-a266f11990d9544ee408e213e1eec8cc9eb032b7.tar.gz rust-a266f11990d9544ee408e213e1eec8cc9eb032b7.zip | |
Auto merge of #109496 - Dylan-DPC:rollup-u8rsi3h, r=Dylan-DPC
Rollup of 11 pull requests Successful merges: - #100311 (Fix handling of trailing bare CR in str::lines) - #108997 (Change text -> rust highlighting in sanitizer.md) - #109179 (move Option::as_slice to intrinsic) - #109187 (Render source page layout with Askama) - #109280 (Remove `VecMap`) - #109295 (refactor `fn bootstrap::builder::Builder::compiler_for` logic) - #109312 (rustdoc: Cleanup parent module tracking for doc links) - #109317 (Update links for custom discriminants.) - #109405 (RPITITs are `DefKind::Opaque` with new lowering strategy) - #109414 (Do not consider synthesized RPITITs on missing items checks) - #109435 (Detect uninhabited types early in const eval) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/unstable-book/src/compiler-flags/sanitizer.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/unstable-book/src/compiler-flags/sanitizer.md b/src/doc/unstable-book/src/compiler-flags/sanitizer.md index 262cef3454a..f71aceff455 100644 --- a/src/doc/unstable-book/src/compiler-flags/sanitizer.md +++ b/src/doc/unstable-book/src/compiler-flags/sanitizer.md @@ -213,7 +213,7 @@ See the [Clang ControlFlowIntegrity documentation][clang-cfi] for more details. ## Example -```text +```rust,ignore #![feature(naked_functions)] use std::arch::asm; @@ -238,7 +238,7 @@ pub extern "C" fn add_two(x: i32) { nop nop nop - lea rax, [rdi+2] + lea eax, [edi+2] ret ", options(noreturn) |