diff options
| author | codehorseman <cricis@yeah.net> | 2022-03-16 20:12:30 +0800 |
|---|---|---|
| committer | codehorseman <cricis@yeah.net> | 2022-03-16 20:12:30 +0800 |
| commit | 01dbfb3eb264135c432cef223848416f90dac290 (patch) | |
| tree | 67e0a6d5e9a26aa88fe06b38651fe030d994f508 /src/doc/unstable-book | |
| parent | d8e564715e0eb17130e99e8fcc92a36fce7feaf5 (diff) | |
| download | rust-01dbfb3eb264135c432cef223848416f90dac290.tar.gz rust-01dbfb3eb264135c432cef223848416f90dac290.zip | |
resolve the conflict in compiler/rustc_session/src/parse.rs
Signed-off-by: codehorseman <cricis@yeah.net>
Diffstat (limited to 'src/doc/unstable-book')
| -rw-r--r-- | src/doc/unstable-book/src/compiler-flags/sanitizer.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/unstable-book/src/compiler-flags/sanitizer.md b/src/doc/unstable-book/src/compiler-flags/sanitizer.md index 735521e667c..3f60caffef5 100644 --- a/src/doc/unstable-book/src/compiler-flags/sanitizer.md +++ b/src/doc/unstable-book/src/compiler-flags/sanitizer.md @@ -212,7 +212,7 @@ fn add_one(x: i32) -> i32 { #[naked] pub extern "C" fn add_two(x: i32) { - // x + 2 preceeded by a landing pad/nop block + // x + 2 preceded by a landing pad/nop block unsafe { asm!( " |