diff options
| author | bors <bors@rust-lang.org> | 2020-04-28 15:56:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-28 15:56:45 +0000 |
| commit | db98d32ea04438cf759b749d5cbeba4f77222664 (patch) | |
| tree | ab4353a17ab024e87815a1936b07c3391295c734 /src/doc | |
| parent | b7bd7c1024a1449449c3ae7b4b4c63a904a620e6 (diff) | |
| parent | b17ef8669e4a2d3fdd1b9a67cb7a8be18a47c07b (diff) | |
| download | rust-db98d32ea04438cf759b749d5cbeba4f77222664.tar.gz rust-db98d32ea04438cf759b749d5cbeba4f77222664.zip | |
Auto merge of #71644 - Dylan-DPC:rollup-cq7plwa, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #71340 (Moving more build-pass tests to check-pass) - #71456 (Use lib crate type for SGX in `fn build_auxiliary`) - #71615 (share some common code for compile-time miri instances) - #71637 (Minor formatting changes in `cfg-sanitize.md`) - #71641 (Update books) Failed merges: r? @ghost
Diffstat (limited to 'src/doc')
| m--------- | src/doc/book | 0 | ||||
| m--------- | src/doc/embedded-book | 0 | ||||
| m--------- | src/doc/nomicon | 0 | ||||
| m--------- | src/doc/reference | 0 | ||||
| m--------- | src/doc/rust-by-example | 0 | ||||
| -rw-r--r-- | src/doc/unstable-book/src/language-features/cfg-sanitize.md | 18 |
6 files changed, 8 insertions, 10 deletions
diff --git a/src/doc/book b/src/doc/book -Subproject f5db319e0b19c22964398d56bc63103d669e1bb +Subproject e37c0e84e2ef73d3a4ebffda8011db6814a3b02 diff --git a/src/doc/embedded-book b/src/doc/embedded-book -Subproject 668fb07b6160b9c468f598e839c1e044db65de3 +Subproject 40beccdf1bb8eb9184a2e3b42db8b8c6e394247 diff --git a/src/doc/nomicon b/src/doc/nomicon -Subproject 6eb24d6e9c0773d4aee68ed5fca121ce3cdf676 +Subproject 4d2d275997746d35eabfc4d992dfbdcce2f626e diff --git a/src/doc/reference b/src/doc/reference -Subproject 3ce94caed4cf967106c51ae86be5e098f7875f1 +Subproject ed22e6fbfcb6ce436e9ea3b4bb4a55b2fb50a57 diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example -Subproject c106d1683c3a2b0960f0f0fb01728cbb1980733 +Subproject ffc99581689fe2455908aaef5f5cf50dd03bb8f diff --git a/src/doc/unstable-book/src/language-features/cfg-sanitize.md b/src/doc/unstable-book/src/language-features/cfg-sanitize.md index 949f24ab9c1..3442abf46df 100644 --- a/src/doc/unstable-book/src/language-features/cfg-sanitize.md +++ b/src/doc/unstable-book/src/language-features/cfg-sanitize.md @@ -11,26 +11,24 @@ depending on whether a particular sanitizer is enabled or not. ## Examples -``` rust +```rust #![feature(cfg_sanitize)] #[cfg(sanitize = "thread")] fn a() { - // ... + // ... } #[cfg(not(sanitize = "thread"))] fn a() { - // ... + // ... } fn b() { - if cfg!(sanitize = "leak") { - // ... - } else { - // ... - } + if cfg!(sanitize = "leak") { + // ... + } else { + // ... + } } - ``` - |
