Skip to content

Commit

Permalink
Merge pull request #1125 from mattheww/2022-01_default_edition
Browse files Browse the repository at this point in the history
Switch the default edition for examples to 2021
  • Loading branch information
ehuss authored Jan 3, 2022
2 parents 58a301e + 4006537 commit f8ba2f1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Install mdbook
run: |
mkdir bin
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
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
echo "$(pwd)/bin" >> $GITHUB_PATH
- name: Report versions
run: |
Expand Down
2 changes: 1 addition & 1 deletion STYLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ See https://highlightjs.org/ for a list of supported languages.

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

* `edition2018` — If it is edition-specific.
* `edition2015` or `edition2018` — If it is edition-specific (see `book.toml` for the default).
* `no_run` — The example should compile successfully, but should not be executed.
* `should_panic` — The example should compile and run, but produce a panic.
* `compile_fail` — The example is expected to fail to compile.
Expand Down
2 changes: 1 addition & 1 deletion book.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ git-repository-url = "https://github.com/rust-lang/reference/"
"/expressions/enum-variant-expr.html" = "struct-expr.html"

[rust]
edition = "2018"
edition = "2021"

0 comments on commit f8ba2f1

Please sign in to comment.