diff options
| author | bors <bors@rust-lang.org> | 2021-12-06 00:46:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-12-06 00:46:14 +0000 |
| commit | 09d8a50ea26df391b58373e22f5891740efdd6cc (patch) | |
| tree | 5d322dc8222d8d595114e0b8a5019b0503c437b1 /src/doc | |
| parent | e2116acae59654bfab2a9729a024f3e2fd6d4b02 (diff) | |
| parent | d056cbf8d6648ce6c94b97586df3bed8b66854ed (diff) | |
| download | rust-09d8a50ea26df391b58373e22f5891740efdd6cc.tar.gz rust-09d8a50ea26df391b58373e22f5891740efdd6cc.zip | |
Auto merge of #91573 - matthiaskrgr:rollup-wcygm2r, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #91367 (Fix ICE in `check_must_not_suspend_ty()`) - #91391 (Simplify --no-headless option for rustdoc-gui tester) - #91537 (compiler/rustc_target: make m68k-unknown-linux-gnu use the gnu base) - #91554 (Update doc about code block edition attributes) - #91563 (Bump download-ci-llvm-stamp for LLD inclusion) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/doc')
| -rw-r--r-- | src/doc/rustdoc/src/documentation-tests.md | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/doc/rustdoc/src/documentation-tests.md b/src/doc/rustdoc/src/documentation-tests.md index 6be53fb4cfe..aea55d4f4b6 100644 --- a/src/doc/rustdoc/src/documentation-tests.md +++ b/src/doc/rustdoc/src/documentation-tests.md @@ -359,9 +359,8 @@ are added. # fn foo() {} ``` -`edition2018` tells `rustdoc` that the code sample should be compiled using -the 2018 edition of Rust. Similarly, you can specify `edition2015` to compile -the code with the 2015 edition. +`edition2015`, `edition2018` and `edition2021` tell `rustdoc` +that the code sample should be compiled using the respective edition of Rust. ```rust /// Only runs on the 2018 edition. |