about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-04-29 22:27:10 +0000
committerbors <bors@rust-lang.org>2022-04-29 22:27:10 +0000
commit05c07386b45fbc540ec8cdc1bc41ae9c062b453b (patch)
tree9026685f1048d847cd7af1f5b97cea3e33d3f5c1 /src/doc
parenta707f401074bc769bab4efb2bfdde7f6c5a4068d (diff)
parent548fca6927a644b4cde66893f5db6f4aff3f8f33 (diff)
downloadrust-05c07386b45fbc540ec8cdc1bc41ae9c062b453b.tar.gz
rust-05c07386b45fbc540ec8cdc1bc41ae9c062b453b.zip
Auto merge of #96566 - Dylan-DPC:rollup-fo7rd98, r=Dylan-DPC
Rollup of 6 pull requests

Successful merges:

 - #96390 (Switch JS code to ES6 - part 2)
 - #96527 (RustWrapper: explicitly don't handle DXILPointerTyID)
 - #96536 (rustdoc: fix missing method list for primitive deref target)
 - #96559 (Use the correct lifetime binder for elided lifetimes in path.)
 - #96560 (Remove unnecessary environment variable in cf-protection documentation)
 - #96562 (Fix duplicate directory separator in --remap-path-prefix.)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/doc')
-rw-r--r--src/doc/unstable-book/src/compiler-flags/cf-protection.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/unstable-book/src/compiler-flags/cf-protection.md b/src/doc/unstable-book/src/compiler-flags/cf-protection.md
index cc580ca9b42..ab698c82ba9 100644
--- a/src/doc/unstable-book/src/compiler-flags/cf-protection.md
+++ b/src/doc/unstable-book/src/compiler-flags/cf-protection.md
@@ -17,7 +17,7 @@ standard library does not ship with CET enabled by default, so you may need to r
 modules with a `cargo` command like:
 
 ```sh
-$ RUSTFLAGS="-Z cf-protection=full" RUSTC="rustc-custom" cargo +nightly build -Z build-std --target x86_64-unknown-linux-gnu
+$ RUSTFLAGS="-Z cf-protection=full" cargo +nightly build -Z build-std --target x86_64-unknown-linux-gnu
 ```
 
 ### Detection