Skip to content

Commit 169efca

Browse files
authored
Merge branch 'master' into disjoint-capture-in-closures
2 parents 180d582 + be5e9ce commit 169efca

File tree

78 files changed

+1621
-6931
lines changed

Some content is hidden

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

78 files changed

+1621
-6931
lines changed

TranslationTable.md

+13-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
| bug | バグ
3737
| build-dependencies | ビルド時の依存 (Cargo.toml のセクション名としては build-dependencies をそのまま採用)
3838
| byte string | バイト列
39+
| call | 呼び出し
3940
| capture | キャプチャ
4041
| cargo | Cargo
4142
| case analysis | 場合分け
@@ -76,6 +77,7 @@
7677
| documentation comment | ドキュメンテーションコメント
7778
| documentation test | ドキュメンテーションテスト
7879
| drop | ドロップ
80+
| dynamic dispatch | 動的ディスパッチ
7981
| early return | 早期リターン
8082
| edition | エディション
8183
| empty tuple | 空タプル
@@ -93,8 +95,10 @@
9395
| exterior | 外側の
9496
| feature | フィーチャ
9597
| foreign | 他言語
98+
| (マクロの) fragment specifier | フラグメント指定子
9699
| free | 解放する
97100
| free-standing function | フリースタンディングな関数
101+
| fully qualified syntax | 完全修飾構文
98102
| garbage collector | ガベージコレクタ
99103
| generic parameter | ジェネリックパラメータ
100104
| generics | ジェネリクス
@@ -107,6 +111,7 @@
107111
| immutable | イミュータブル
108112
| immutability | イミュータビリティ
109113
| implement | 実装する
114+
| inherent method | 固有メソッド
110115
| initialize | 初期化する
111116
| input lifetime | 入力ライフタイム
112117
| interior | 内側の
@@ -116,6 +121,7 @@
116121
| (string) interpolation | (文字列)補間
117122
| Intrinsics | Intrinsic
118123
| irrefutable | 論駁不可能
124+
| item | アイテム
119125
| iterate | 列挙する
120126
| key | キー
121127
| keyword | キーワード
@@ -162,11 +168,13 @@
162168
| parametric polymorphism | パラメトリック多相
163169
| parse | パース、パースする
164170
| patch | パッチ
171+
| path | パス
165172
| pattern | パターン
166173
| performance | パフォーマンス
167174
| platform | プラットフォーム
168175
| primitive | プリミティブ
169176
| pointer | ポインタ
177+
| prelude | プレリュード (or prelude)
170178
| proc macro | 手続き的マクロ
171179
| process | プロセス
172180
| range | 範囲
@@ -175,7 +183,8 @@
175183
| raw string literal | 生文字列リテラル
176184
| re-assignment | 再代入
177185
| rebind | 再束縛
178-
| reference | 参照
186+
| reference (名詞) | 参照
187+
| reference (動詞) | 参照付け (to dereference の対義語として)
179188
| reference count | 参照カウント
180189
| refutable | 論駁可能
181190
| regression | リグレッション
@@ -199,8 +208,10 @@
199208
| slice | スライス
200209
| slicing | スライシング
201210
| specialized | 特殊化された
211+
| stablize | 安定化する
202212
| standard library | 標準ライブラリ
203213
| statement | 文
214+
| static dispatch | 静的ディスパッチ
204215
| string | 文字列
205216
| string interpolation | 文字列インターポーレーション
206217
| string slice | 文字列スライス
@@ -219,6 +230,7 @@
219230
| threadsafe | スレッドセーフ
220231
| tick | クオート
221232
| trait | トレイト
233+
| tracking issue | 追跡用の Issue
222234
| tuple | タプル
223235
| token trees | トークン木
224236
| type alias | 型エイリアス

book.toml

+14-28
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"

docs/404.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999

100100
<nav id="sidebar" class="sidebar" aria-label="Table of contents">
101101
<div class="sidebar-scrollbox">
102-
<ol class="chapter"><li class="chapter-item expanded affix "><a href="introduction.html">序文</a></li><li class="chapter-item expanded "><a href="editions/index.html"><strong aria-hidden="true">1.</strong> エディションとは?</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="editions/creating-a-new-project.html"><strong aria-hidden="true">1.1.</strong> 新しいプロジェクトを作成する</a></li><li class="chapter-item expanded "><a href="editions/transitioning-an-existing-project-to-a-new-edition.html"><strong aria-hidden="true">1.2.</strong> 既存のプロジェクトのエディションを移行する</a></li><li class="chapter-item expanded "><a href="editions/advanced-migrations.html"><strong aria-hidden="true">1.3.</strong> Advanced migrations</a></li></ol></li><li class="chapter-item expanded "><a href="rust-2015/index.html"><strong aria-hidden="true">2.</strong> Rust 2015</a></li><li class="chapter-item expanded "><a href="rust-2018/index.html"><strong aria-hidden="true">3.</strong> Rust 2018</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="rust-2018/path-changes.html"><strong aria-hidden="true">3.1.</strong> Path and module system changes</a></li><li class="chapter-item expanded "><a href="rust-2018/trait-fn-parameters.html"><strong aria-hidden="true">3.2.</strong> Anonymous trait function parameters deprecated</a></li><li class="chapter-item expanded "><a href="rust-2018/new-keywords.html"><strong aria-hidden="true">3.3.</strong> New keywords</a></li><li class="chapter-item expanded "><a href="rust-2018/tyvar-behind-raw-pointer.html"><strong aria-hidden="true">3.4.</strong> Method dispatch for raw pointers to inference variables</a></li><li class="chapter-item expanded "><a href="rust-2018/cargo.html"><strong aria-hidden="true">3.5.</strong> Cargo changes</a></li></ol></li><li class="chapter-item expanded "><a href="rust-post-2018/index.html"><strong aria-hidden="true">4.</strong> Rust 2018以降の変更(期間限定公開)</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="rust-post-2018/dbg-macro.html"><strong aria-hidden="true">4.1.</strong> dbg! マクロ</a></li><li class="chapter-item expanded "><a href="rust-post-2018/no-jemalloc.html"><strong aria-hidden="true">4.2.</strong> デフォルトでjemallocを使わない</a></li><li class="chapter-item expanded "><a href="rust-post-2018/uniform-paths.html"><strong aria-hidden="true">4.3.</strong> 統一的なパス</a></li><li class="chapter-item expanded "><a href="rust-post-2018/literal-macro-matcher.html"><strong aria-hidden="true">4.4.</strong> リテラルマクロマッチャ</a></li><li class="chapter-item expanded "><a href="rust-post-2018/qustion-mark-operator-in-macros.html"><strong aria-hidden="true">4.5.</strong> マクロ内の?演算子</a></li><li class="chapter-item expanded "><a href="rust-post-2018/const-fn.html"><strong aria-hidden="true">4.6.</strong> const fn</a></li><li class="chapter-item expanded "><a href="rust-post-2018/pin.html"><strong aria-hidden="true">4.7.</strong> ピン留め</a></li><li class="chapter-item expanded "><a href="rust-post-2018/no-more-fnbox.html"><strong aria-hidden="true">4.8.</strong> FnBoxは不要に</a></li><li class="chapter-item expanded "><a href="rust-post-2018/alternative-cargo-registries.html"><strong aria-hidden="true">4.9.</strong> Cargoレジストリが選択できるように</a></li><li class="chapter-item expanded "><a href="rust-post-2018/tryfrom-and-tryinto.html"><strong aria-hidden="true">4.10.</strong> TryFromとTryInto</a></li><li class="chapter-item expanded "><a href="rust-post-2018/future.html"><strong aria-hidden="true">4.11.</strong> Futureトレイト</a></li><li class="chapter-item expanded "><a href="rust-post-2018/alloc.html"><strong aria-hidden="true">4.12.</strong> allocクレート</a></li><li class="chapter-item expanded "><a href="rust-post-2018/maybe-uninit.html"><strong aria-hidden="true">4.13.</strong> MaybeUninit</a></li><li class="chapter-item expanded "><a href="rust-post-2018/cargo-vendor.html"><strong aria-hidden="true">4.14.</strong> cargo vendor</a></li></ol></li><li class="chapter-item expanded "><a href="rust-2021/index.html"><strong aria-hidden="true">5.</strong> Rust 2021</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="rust-2021/prelude.html"><strong aria-hidden="true">5.1.</strong> Additions to the prelude</a></li><li class="chapter-item expanded "><a href="rust-2021/default-cargo-resolver.html"><strong aria-hidden="true">5.2.</strong> デフォルトの Cargo のフィーチャリゾルバ</a></li><li class="chapter-item expanded "><a href="rust-2021/IntoIterator-for-arrays.html"><strong aria-hidden="true">5.3.</strong> 配列に対する IntoIterator</a></li><li class="chapter-item expanded "><a href="rust-2021/disjoint-capture-in-closures.html"><strong aria-hidden="true">5.4.</strong> Disjoint capture in closures</a></li><li class="chapter-item expanded "><a href="rust-2021/panic-macro-consistency.html"><strong aria-hidden="true">5.5.</strong> Panic macro consistency</a></li><li class="chapter-item expanded "><a href="rust-2021/reserving-syntax.html"><strong aria-hidden="true">5.6.</strong> Reserving syntax</a></li><li class="chapter-item expanded "><a href="rust-2021/warnings-promoted-to-error.html"><strong aria-hidden="true">5.7.</strong> 警告からエラーへの格上げ</a></li><li class="chapter-item expanded "><a href="rust-2021/or-patterns-macro-rules.html"><strong aria-hidden="true">5.8.</strong> Or patterns in macro-rules</a></li></ol></li></ol>
102+
<ol class="chapter"><li class="chapter-item expanded affix "><a href="introduction.html">序文</a></li><li class="chapter-item expanded "><a href="editions/index.html"><strong aria-hidden="true">1.</strong> エディションとは?</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="editions/creating-a-new-project.html"><strong aria-hidden="true">1.1.</strong> 新しいプロジェクトを作成する</a></li><li class="chapter-item expanded "><a href="editions/transitioning-an-existing-project-to-a-new-edition.html"><strong aria-hidden="true">1.2.</strong> 既存のプロジェクトのエディションを移行する</a></li><li class="chapter-item expanded "><a href="editions/advanced-migrations.html"><strong aria-hidden="true">1.3.</strong> Advanced migrations</a></li></ol></li><li class="chapter-item expanded "><a href="rust-2015/index.html"><strong aria-hidden="true">2.</strong> Rust 2015</a></li><li class="chapter-item expanded "><a href="rust-2018/index.html"><strong aria-hidden="true">3.</strong> Rust 2018</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="rust-2018/path-changes.html"><strong aria-hidden="true">3.1.</strong> Path and module system changes</a></li><li class="chapter-item expanded "><a href="rust-2018/trait-fn-parameters.html"><strong aria-hidden="true">3.2.</strong> Anonymous trait function parameters deprecated</a></li><li class="chapter-item expanded "><a href="rust-2018/new-keywords.html"><strong aria-hidden="true">3.3.</strong> New keywords</a></li><li class="chapter-item expanded "><a href="rust-2018/tyvar-behind-raw-pointer.html"><strong aria-hidden="true">3.4.</strong> Method dispatch for raw pointers to inference variables</a></li><li class="chapter-item expanded "><a href="rust-2018/cargo.html"><strong aria-hidden="true">3.5.</strong> Cargo changes</a></li></ol></li><li class="chapter-item expanded "><a href="rust-2021/index.html"><strong aria-hidden="true">4.</strong> Rust 2021</a></li><li><ol class="section"><li class="chapter-item expanded "><a href="rust-2021/prelude.html"><strong aria-hidden="true">4.1.</strong> Prelude への追加</a></li><li class="chapter-item expanded "><a href="rust-2021/default-cargo-resolver.html"><strong aria-hidden="true">4.2.</strong> デフォルトの Cargo のフィーチャリゾルバ</a></li><li class="chapter-item expanded "><a href="rust-2021/IntoIterator-for-arrays.html"><strong aria-hidden="true">4.3.</strong> 配列に対する IntoIterator</a></li><li class="chapter-item expanded "><a href="rust-2021/disjoint-capture-in-closures.html"><strong aria-hidden="true">4.4.</strong> Disjoint capture in closures</a></li><li class="chapter-item expanded "><a href="rust-2021/panic-macro-consistency.html"><strong aria-hidden="true">4.5.</strong> panic マクロの一貫性</a></li><li class="chapter-item expanded "><a href="rust-2021/reserving-syntax.html"><strong aria-hidden="true">4.6.</strong> 構文の予約</a></li><li class="chapter-item expanded "><a href="rust-2021/warnings-promoted-to-error.html"><strong aria-hidden="true">4.7.</strong> 警告からエラーへの格上げ</a></li><li class="chapter-item expanded "><a href="rust-2021/or-patterns-macro-rules.html"><strong aria-hidden="true">4.8.</strong> マクロ規則における OR パターン</a></li></ol></li></ol>
103103
</div>
104104
<div id="sidebar-resize-handle" class="sidebar-resize-handle"></div>
105105
</nav>

0 commit comments

Comments
 (0)