Skip to content

Commit 34c91b9

Browse files
committed
Minimize the Edition Guide
Change the chapter organization and remove some pages by following this pull-request in the English version: rust-lang/edition-guide#232
1 parent c5c9f8c commit 34c91b9

File tree

105 files changed

+1396
-3275
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+1396
-3275
lines changed

LICENSE-APACHE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ APPENDIX: How to apply the Apache License to your work.
186186
same "printed page" as the copyright notice for easier
187187
identification within third-party archives.
188188

189-
Copyright [yyyy] [name of copyright owner]
189+
Copyright 2018 - 2021 The Rust Project Developers
190190

191191
Licensed under the Apache License, Version 2.0 (the "License");
192192
you may not use this file except in compliance with the License.

LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2018 The Rust Project Developers
1+
Copyright (c) 2018 - 2021 The Rust Project Developers
22

33
Permission is hereby granted, free of charge, to any
44
person obtaining a copy of this software and associated

README.md

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ This book explains the concept of "editions", major new eras in [Rust]'s
88
development. You can [read the book
99
online](https://doc.rust-lang.org/nightly/edition-guide/).
1010

11-
[rust]: https://www.rust-lang.org/
11+
[Rust]: https://www.rust-lang.org/
1212

1313
## License
1414

@@ -21,9 +21,9 @@ You can also build the book and read it locally if you'd like.
2121

2222
### Requirements
2323

24-
Building the book requires [mdBook] 0.2. To get it:
24+
Building the book requires [mdBook] 0.4. To get it:
2525

26-
[mdbook]: https://github.com/azerupi/mdBook
26+
[mdBook]: https://github.com/rust-lang/mdBook
2727

2828
```bash
2929
$ cargo install mdbook
@@ -32,32 +32,14 @@ $ cargo install mdbook
3232
### Building
3333

3434
The most straight-forward way to build and view the book locally is to use the following command:
35-
3635
```bash
37-
$ mdbook serve
36+
$ mdbook serve --open
3837
```
3938

40-
This serves the book at http://localhost:3000, and rebuilds it on changes.
41-
You can now view the book in your web browser. If you make changes to the book's source code,
42-
you should only need to refresh your browser to see them.
43-
44-
_Firefox:_
45-
46-
```shell
47-
$ firefox http://localhost:3000 # Linux
48-
$ open -a "Firefox" http://localhost:3000 # OS X
49-
$ Start-Process "firefox.exe" http://localhost:3000 # Windows (PowerShell)
50-
$ start firefox.exe http://localhost:3000 # Windows (Cmd)
51-
```
52-
53-
_Chrome:_
54-
55-
```shell
56-
$ google-chrome http://localhost:3000 # Linux
57-
$ open -a "Google Chrome" http://localhost:3000 # OS X
58-
$ Start-Process "chrome.exe" http://localhost:3000 # Windows (PowerShell)
59-
$ start chrome.exe http://localhost:3000 # Windows (Cmd)
60-
```
39+
This builds the HTML version of the book, starts a webserver at
40+
http://localhost:3000, and opens your default web browser. It will also
41+
automatically rebuild the book whenever the source changes, and the page
42+
should automatically reload.
6143

6244
To run the tests:
6345

book.toml

Lines changed: 108 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,114 @@
22
authors = ["The Rust Project Developers"]
33
multilingual = false
44
src = "src"
5-
title = "The Edition Guide"
5+
title = "エディションガイド"
6+
language = "ja"
7+
8+
[build]
9+
build-dir = "docs"
610

711
[output.html]
12+
git-repository-url = "https://github.com/rust-lang-ja/edition-guide"
813
additional-css = ["theme/em-to-bold.css"]
14+
15+
[output.html.redirect]
16+
"/rust-2018/edition-changes.html" = "index.html"
17+
"/rust-2018/module-system/index.html" = "../path-changes.html"
18+
"/rust-2018/module-system/raw-identifiers.html" = "../../../rust-by-example/compatibility/raw_identifiers.html"
19+
"/rust-2018/module-system/path-clarity.html" = "../path-changes.html"
20+
"/rust-2018/module-system/more-visibility-modifiers.html" = "../../../reference/visibility-and-privacy.html"
21+
"/rust-2018/module-system/nested-imports-with-use.html" = "../../../rust-by-example/mod/use.html"
22+
"/rust-2018/error-handling-and-panics/index.html" = "../../../book/ch09-00-error-handling.html"
23+
"/rust-2018/error-handling-and-panics/the-question-mark-operator-for-easier-error-handling.html" = "../../../book/ch09-02-recoverable-errors-with-result.html"
24+
"/rust-2018/error-handling-and-panics/question-mark-in-main-and-tests.html" = "../../../rust-by-example/error/result.html#using-result-in-main"
25+
"/rust-2018/error-handling-and-panics/controlling-panics-with-std-panic.html" = "https://blog.rust-lang.org/2016/05/26/Rust-1.9.html#controlled-unwinding"
26+
"/rust-2018/error-handling-and-panics/aborting-on-panic.html" = "../../../book/ch09-01-unrecoverable-errors-with-panic.html"
27+
"/rust-2018/control-flow/index.html" = "../../../rust-by-example/flow_control.html"
28+
"/rust-2018/control-flow/loops-can-break-with-a-value.html" = "../../../rust-by-example/flow_control/loop/return.html"
29+
"/rust-2018/control-flow/async-await-for-easier-concurrency.html" = "https://rust-lang.github.io/async-book/"
30+
"/rust-2018/trait-system/index.html" = "../index.html"
31+
"/rust-2018/trait-system/impl-trait-for-returning-complex-types-with-ease.html" = "https://blog.rust-lang.org/2018/05/10/Rust-1.26.html#impl-trait"
32+
"/rust-2018/trait-system/dyn-trait-for-trait-objects.html" = "https://blog.rust-lang.org/2018/06/21/Rust-1.27.html#dyn-trait"
33+
"/rust-2018/trait-system/more-container-types-support-trait-objects.html" = "https://github.com/rust-lang/rfcs/blob/master/text/0982-dst-coercion.md"
34+
"/rust-2018/trait-system/associated-constants.html" = "../../../reference/items/associated-items.html#associated-constants"
35+
"/rust-2018/trait-system/no-anon-params.html" = "../trait-fn-parameters.html"
36+
"/rust-2018/slice-patterns.html" = "https://blog.rust-lang.org/2018/05/10/Rust-1.26.html#basic-slice-patterns"
37+
"/rust-2018/ownership-and-lifetimes/index.html" = "../../../book/ch04-00-understanding-ownership.html"
38+
"/rust-2018/ownership-and-lifetimes/non-lexical-lifetimes.html" = "https://blog.rust-lang.org/2018/12/06/Rust-1.31-and-rust-2018.html#non-lexical-lifetimes"
39+
"/rust-2018/ownership-and-lifetimes/default-match-bindings.html" = "https://blog.rust-lang.org/2018/05/10/Rust-1.26.html#nicer-match-bindings"
40+
"/rust-2018/ownership-and-lifetimes/the-anonymous-lifetime.html" = "https://blog.rust-lang.org/2018/12/06/Rust-1.31-and-rust-2018.html#more-lifetime-elision-rules"
41+
"/rust-2018/ownership-and-lifetimes/lifetime-elision-in-impl.html" = "https://blog.rust-lang.org/2018/12/06/Rust-1.31-and-rust-2018.html#more-lifetime-elision-rules"
42+
"/rust-2018/ownership-and-lifetimes/inference-in-structs.html" = "https://github.com/rust-lang/rfcs/blob/master/text/2093-infer-outlives.md"
43+
"/rust-2018/ownership-and-lifetimes/simpler-lifetimes-in-static-and-const.html" = "../../../reference/lifetime-elision.html#static-lifetime-elision"
44+
"/rust-2018/data-types/index.html" = "../index.html"
45+
"/rust-2018/data-types/field-init-shorthand.html" = "../../../reference/expressions/struct-expr.html#struct-field-init-shorthand"
46+
"/rust-2018/data-types/inclusive-ranges.html" = "https://blog.rust-lang.org/2018/05/10/Rust-1.26.html#inclusive-ranges-with-"
47+
"/rust-2018/data-types/128-bit-integers.html" = "https://blog.rust-lang.org/2018/05/10/Rust-1.26.html#128-bit-integers"
48+
"/rust-2018/data-types/operator-equals-are-now-implementable.html" = "../../../std/ops/index.html"
49+
"/rust-2018/data-types/union-for-an-unsafe-form-of-enum.html" = "../../../reference/items/unions.html"
50+
"/rust-2018/data-types/choosing-alignment-with-the-repr-attribute.html" = "../../../reference/type-layout.html#representations"
51+
"/rust-2018/simd-for-faster-computing.html" = "https://blog.rust-lang.org/2018/06/21/Rust-1.27.html#simd"
52+
"/rust-2018/macros/index.html" = "../../../book/ch19-06-macros.html"
53+
"/rust-2018/macros/custom-derive.html" = "../../../book/ch19-06-macros.html#how-to-write-a-custom-derive-macro"
54+
"/rust-2018/macros/macro-changes.html" = "../../../book/ch19-06-macros.html"
55+
"/rust-2018/macros/at-most-once.html" = "../../../reference/macros-by-example.html#repetitions"
56+
"/rust-2018/the-compiler/index.html" = "../index.html"
57+
"/rust-2018/the-compiler/improved-error-messages.html" = "https://blog.rust-lang.org/2016/09/29/Rust-1.12.html#overhauled-error-messages"
58+
"/rust-2018/the-compiler/incremental-compilation-for-faster-compiles.html" = "https://blog.rust-lang.org/2018/02/15/Rust-1.24.html#incremental-compilation"
59+
"/rust-2018/the-compiler/an-attribute-for-deprecation.html" = "../../../reference/attributes/diagnostics.html#the-deprecated-attribute"
60+
"/rust-2018/rustup-for-managing-rust-versions.html" = "https://rust-lang.github.io/rustup/"
61+
"/rust-2018/cargo-and-crates-io/index.html" = "../../../cargo/index.html"
62+
"/rust-2018/cargo-and-crates-io/cargo-check-for-faster-checking.html" = "../../../cargo/commands/cargo-check.html"
63+
"/rust-2018/cargo-and-crates-io/cargo-install-for-easy-installation-of-tools.html" = "../../../cargo/commands/cargo-install.html"
64+
"/rust-2018/cargo-and-crates-io/cargo-new-defaults-to-a-binary-project.html" = "https://blog.rust-lang.org/2018/03/29/Rust-1.25.html#cargo-features"
65+
"/rust-2018/cargo-and-crates-io/cargo-rustc-for-passing-arbitrary-flags-to-rustc.html" = "../../../cargo/commands/cargo-rustc.html"
66+
"/rust-2018/cargo-and-crates-io/cargo-workspaces-for-multi-package-projects.html" = "../../../cargo/reference/workspaces.html"
67+
"/rust-2018/cargo-and-crates-io/multi-file-examples.html" = "../../../cargo/guide/project-layout.html"
68+
"/rust-2018/cargo-and-crates-io/replacing-dependencies-with-patch.html" = "../../../cargo/reference/overriding-dependencies.html#the-patch-section"
69+
"/rust-2018/cargo-and-crates-io/cargo-can-use-a-local-registry-replacement.html" = "../../../cargo/reference/source-replacement.html"
70+
"/rust-2018/cargo-and-crates-io/crates-io-disallows-wildcard-dependencies.html" = "https://blog.rust-lang.org/2016/01/21/Rust-1.6.html#cratesio-disallows-wildcards"
71+
"/rust-2018/documentation/index.html" = "../../../index.html"
72+
"/rust-2018/documentation/new-editions-of-the-book.html" = "../../../book/index.html"
73+
"/rust-2018/documentation/the-rust-bookshelf.html" = "../../../index.html"
74+
"/rust-2018/documentation/the-rustonomicon.html" = "../../../nomicon/index.html"
75+
"/rust-2018/documentation/std-os-has-documentation-for-all-platforms.html" = "../../../std/os/index.html"
76+
"/rust-2018/rustdoc/index.html" = "../../../rustdoc/index.html"
77+
"/rust-2018/rustdoc/documentation-tests-can-now-compile-fail.html" = "../../../rustdoc/documentation-tests.html#attributes"
78+
"/rust-2018/rustdoc/rustdoc-uses-commonmark.html" = "../../../rustdoc/how-to-write-documentation.html#markdown"
79+
"/rust-2018/platform-and-target-support/index.html" = "../../../rustc/targets/index.html"
80+
"/rust-2018/platform-and-target-support/libcore-for-low-level-rust.html" = "../../../core/index.html"
81+
"/rust-2018/platform-and-target-support/webassembly-support.html" = "https://rustwasm.github.io/docs/book/"
82+
"/rust-2018/platform-and-target-support/global-allocators.html" = "https://blog.rust-lang.org/2018/08/02/Rust-1.28.html#global-allocators"
83+
"/rust-2018/platform-and-target-support/msvc-toolchain-support.html" = "../../../rustc/platform-support.html"
84+
"/rust-2018/platform-and-target-support/musl-support-for-fully-static-binaries.html" = "../../../rustc/platform-support.html"
85+
"/rust-2018/platform-and-target-support/cdylib-crates-for-c-interoperability.html" = "https://github.com/rust-lang/rfcs/blob/master/text/1510-cdylib.md"
86+
"/rust-next/index.html" = "../rust-post-2018/index.html"
87+
"/rust-next/edition-changes.html" = "../rust-post-2018/edition-changes.html"
88+
# "/rust-next/dbg-macro.html" = "https://doc.rust-lang.org/std/macro.dbg.html"
89+
"/rust-next/dbg-macro.html" = "../rust-post-2018/dbg-macro.html"
90+
# "/rust-next/no-jemalloc.html" = "https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html#jemalloc-is-removed-by-default"
91+
"/rust-next/no-jemalloc.html" = "../rust-post-2018/no-jemalloc.html"
92+
# "/rust-next/uniform-paths.html" = "https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html#final-module-improvements"
93+
"/rust-next/uniform-paths.html" = "../rust-post-2018/uniform-paths.html"
94+
# "/rust-next/literal-macro-matcher.html" = "https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html#macro-improvements"
95+
"/rust-next/literal-macro-matcher.html" = "../rust-post-2018/literal-macro-matcher.html"
96+
# "/rust-next/qustion-mark-operator-in-macros.html" = "https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html#macro-improvements"
97+
"/rust-next/qustion-mark-operator-in-macros.html" = "../rust-post-2018/question-mark-operator-inmacros.html"
98+
# "/rust-next/const-fn.html" = "https://doc.rust-lang.org/reference/const_eval.html"
99+
"/rust-next/const-fn.html" = "../rust-post-2018/const_fn.html"
100+
# "/rust-next/pin.html" = "https://doc.rust-lang.org/std/pin/index.html"
101+
"/rust-next/pin.html" = "../rust-post-2018/pin.html"
102+
# "/rust-next/no-more-fnbox.html" = "https://blog.rust-lang.org/2019/05/23/Rust-1.35.0.html#fn-closure-traits-implemented-for-boxdyn-fn"
103+
"/rust-next/no-more-fnbox.html" = "https://blog.rust-lang.org/2019/05/23/Rust-1.35.0.html#fn-closure-traits-implemented-for-boxdyn-fn"
104+
# "/rust-next/alternative-cargo-registries.html" = "https://blog.rust-lang.org/2019/04/11/Rust-1.34.0.html#alternative-cargo-registries"
105+
"/rust-next/alternative-cargo-registries.html" = "../rust-post-2018/alternative-cargo-registries.html"
106+
# "/rust-next/tryfrom-and-tryinto.html" = "https://blog.rust-lang.org/2019/04/11/Rust-1.34.0.html#tryfrom-and-tryinto"
107+
"/rust-next/tryfrom-and-tryinto.html" = "../rust-post-2018/tryfrom-and-tryinto.html"
108+
# "/rust-next/future.html" = "https://doc.rust-lang.org/std/future/trait.Future.html"
109+
"/rust-next/future.html" = "../rust-post-2018/future.html"
110+
# "/rust-next/alloc.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#the-alloc-crate-is-stable"
111+
"/rust-next/alloc.html" = "../rust-post-2018/"
112+
# "/rust-next/maybe-uninit.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#maybeuninitt-instead-of-memuninitialized"
113+
"/rust-next/maybe-uninit.html" = "../rust-post-2018/aybe-uninit.html"
114+
# "/rust-next/cargo-vendor.html" = "https://doc.rust-lang.org/cargo/commands/cargo-vendor.html"
115+
"/rust-next/cargo-vendor.html" = "../rust-post-2018/cargo-vendor.html"

0 commit comments

Comments
 (0)