Skip to content

Commit f8ba2f1

Browse files
authored
Merge pull request #1125 from mattheww/2022-01_default_edition
Switch the default edition for examples to 2021
2 parents 58a301e + 4006537 commit f8ba2f1

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Install mdbook
1818
run: |
1919
mkdir bin
20-
curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.5/mdbook-v0.4.5-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=bin
20+
curl -sSL https://github.com/rust-lang/mdBook/releases/download/v0.4.14/mdbook-v0.4.14-x86_64-unknown-linux-gnu.tar.gz | tar -xz --directory=bin
2121
echo "$(pwd)/bin" >> $GITHUB_PATH
2222
- name: Report versions
2323
run: |

STYLE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ See https://highlightjs.org/ for a list of supported languages.
4141

4242
Rust examples are tested via rustdoc, and should include the appropriate annotations when tests are expected to fail:
4343

44-
* `edition2018` — If it is edition-specific.
44+
* `edition2015` or `edition2018` — If it is edition-specific (see `book.toml` for the default).
4545
* `no_run` — The example should compile successfully, but should not be executed.
4646
* `should_panic` — The example should compile and run, but produce a panic.
4747
* `compile_fail` — The example is expected to fail to compile.

book.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ git-repository-url = "https://github.com/rust-lang/reference/"
1111
"/expressions/enum-variant-expr.html" = "struct-expr.html"
1212

1313
[rust]
14-
edition = "2018"
14+
edition = "2021"

0 commit comments

Comments
 (0)