Skip to content

Commit bcf15e8

Browse files
tatsuya6502tatsuya6502
authored
Merge branch 'master' into tyvar-behind-raw-pointer
2 parents b6d7b68 + d43afc8 commit bcf15e8

File tree

87 files changed

+3168
-8353
lines changed

Some content is hidden

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

87 files changed

+3168
-8353
lines changed

‎.circleci/config.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ version: 2
33
jobs:
44
build:
55
docker:
6-
- image: quay.io/rust-lang-ja/circleci:edition-guide-mdbook-0.4.5
6+
- image: quay.io/rust-lang-ja/circleci:edition-guide-mdbook-0.4.13
77
steps:
88
- checkout
99
- run: rustc --version --verbose
@@ -24,9 +24,9 @@ jobs:
2424
- store_artifacts:
2525
path: /tmp/docs.txz
2626
destination: docs.txz
27-
# - run:
28-
# name: Testing book
29-
# command: mdbook test
27+
- run:
28+
name: Testing book
29+
command: mdbook test
3030
# - run:
3131
# name: Check for broken links
3232
# command: |

‎TranslationTable.md‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
| binary | バイナリ
3131
| binding | 束縛
3232
| block | ブロック
33+
| body (関数の) | 本体
3334
| borrowing | 借用
3435
| bounds | 境界
3536
| boxed | ボックス化された
@@ -53,6 +54,7 @@
5354
| composable | 合成可能
5455
| computer science | コンピュータサイエンス
5556
| concurrency | 並行性
57+
| conditional compilation | 条件付きコンパイル
5658
| constant | 定数
5759
| constructor | コンストラクタ
5860
| continuous integration | 継続的インテグレーション
@@ -76,6 +78,7 @@
7678
| diverging | 発散する〜（上の diverge を修飾語として使った場合）
7779
| documentation comment | ドキュメンテーションコメント
7880
| documentation test | ドキュメンテーションテスト
81+
| drop | ドロップ
7982
| dynamic dispatch | 動的ディスパッチ
8083
| early return | 早期リターン
8184
| edition | エディション
@@ -94,6 +97,7 @@
9497
| exterior | 外側の
9598
| feature | フィーチャ
9699
| foreign | 他言語
100+
| (マクロの) fragment specifier | フラグメント指定子
97101
| free | 解放する
98102
| free-standing function | フリースタンディングな関数
99103
| fully qualified syntax | 完全修飾構文
@@ -143,10 +147,12 @@
143147
| memory | メモリ
144148
| method | メソッド
145149
| monomorphization | 単相化
146-
| move | ムーブ
150+
| move | ムーブ(する)
151+
| move out | ムーブする、ムーブアウトする
147152
| mutability | ミュータビリティ
148153
| mutable | ミュータブル
149154
| mutable binding | ミュータブルな束縛
155+
| mutate | 変更する、書き換える
150156
| mutual-exclusion | 相互排他
151157
| null | ヌル
152158
| object-safe | オブジェクト安全
@@ -205,9 +211,11 @@
205211
| slice | スライス
206212
| slicing | スライシング
207213
| specialized | 特殊化された
214+
| stablize | 安定化する
208215
| standard library | 標準ライブラリ
209216
| statement | 文
210217
| static dispatch | 静的ディスパッチ
218+
| strict keyword | 正格キーワード
211219
| string | 文字列
212220
| string interpolation | 文字列インターポーレーション
213221
| string slice | 文字列スライス

‎book.toml‎

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -84,32 +84,18 @@ additional-css = ["theme/em-to-bold.css"]
8484
"/rust-2018/platform-and-target-support/musl-support-for-fully-static-binaries.html" = "https://doc.rust-lang.org/rustc/platform-support.html"
8585
"/rust-2018/platform-and-target-support/cdylib-crates-for-c-interoperability.html" = "https://github.com/rust-lang/rfcs/blob/master/text/1510-cdylib.md"
8686
"/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"
87+
"/rust-next/edition-changes.html" = "../rust-2021/index.html"
88+
"/rust-next/dbg-macro.html" = "https://doc.rust-lang.org/std/macro.dbg.html"
89+
"/rust-next/no-jemalloc.html" = "https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html#jemalloc-is-removed-by-default"
90+
"/rust-next/uniform-paths.html" = "https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html#final-module-improvements"
91+
"/rust-next/literal-macro-matcher.html" = "https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html#macro-improvements"
92+
"/rust-next/qustion-mark-operator-in-macros.html" = "https://blog.rust-lang.org/2019/01/17/Rust-1.32.0.html#macro-improvements"
93+
"/rust-next/const-fn.html" = "https://doc.rust-lang.org/reference/const_eval.html"
94+
"/rust-next/pin.html" = "https://doc.rust-lang.org/std/pin/index.html"
10395
"/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"
96+
"/rust-next/alternative-cargo-registries.html" = "https://blog.rust-lang.org/2019/04/11/Rust-1.34.0.html#alternative-cargo-registries"
97+
"/rust-next/tryfrom-and-tryinto.html" = "https://blog.rust-lang.org/2019/04/11/Rust-1.34.0.html#tryfrom-and-tryinto"
98+
"/rust-next/future.html" = "https://doc.rust-lang.org/std/future/trait.Future.html"
99+
"/rust-next/alloc.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#the-alloc-crate-is-stable"
100+
"/rust-next/maybe-uninit.html" = "https://blog.rust-lang.org/2019/07/04/Rust-1.36.0.html#maybeuninitt-instead-of-memuninitialized"
101+
"/rust-next/cargo-vendor.html" = "https://doc.rust-lang.org/cargo/commands/cargo-vendor.html"

0 commit comments

Comments
 (0)