From eb7fe629eac84448836b9c36555c81985888533d Mon Sep 17 00:00:00 2001 From: CoinEZ <132030351+CoinEZ-JPN@users.noreply.github.com> Date: Mon, 29 May 2023 13:17:30 +0900 Subject: [PATCH] ja: Translate table of contents (#659) * ja: tooling check (#652) * updating table of contents based on suggestions --------- Co-authored-by: Kenta Aratani --- po/ja.po | 4715 +++++++++++++++++++++--------------------------------- 1 file changed, 1848 insertions(+), 2867 deletions(-) diff --git a/po/ja.po b/po/ja.po index 9d6b77b4..d68156b0 100644 --- a/po/ja.po +++ b/po/ja.po @@ -2,14 +2,15 @@ msgid "" msgstr "" "Project-Id-Version: Comprehensive Rust 🦀\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2023-05-25 10:59+0900\n" -"Last-Translator: Keiichi Watanabe \n" +"PO-Revision-Date: 2023-05-26 17:58+0900\n" +"Last-Translator: Kenta Aratani \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.3.1\n" #: src/SUMMARY.md:3 msgid "Welcome to Comprehensive Rust 🦀" @@ -17,7 +18,7 @@ msgstr "" #: src/SUMMARY.md:4 msgid "Running the Course" -msgstr "" +msgstr "講座の運営について" #: src/SUMMARY.md:5 msgid "Course Structure" @@ -45,16 +46,16 @@ msgstr "" #: src/SUMMARY.md:11 msgid "Running Cargo Locally" -msgstr "" +msgstr "ローカル環境での実行" #: src/SUMMARY.md:14 msgid "Day 1: Morning" -msgstr "" +msgstr "Day 1： AM" -#: src/SUMMARY.md:18 src/SUMMARY.md:75 src/SUMMARY.md:128 src/SUMMARY.md:185 -#: src/SUMMARY.md:211 src/SUMMARY.md:259 +#: src/SUMMARY.md:18 src/SUMMARY.md:75 src/SUMMARY.md:128 src/SUMMARY.md:185 src/SUMMARY.md:211 +#: src/SUMMARY.md:259 msgid "Welcome" -msgstr "" +msgstr "Welcome" #: src/SUMMARY.md:19 msgid "What is Rust?" @@ -66,7 +67,7 @@ msgstr "" #: src/SUMMARY.md:21 msgid "Small Example" -msgstr "" +msgstr "プログラムの例" #: src/SUMMARY.md:22 msgid "Why Rust?" @@ -106,801 +107,801 @@ msgstr "" #: src/SUMMARY.md:31 msgid "Slices" -msgstr "" +msgstr "スライス型" #: src/SUMMARY.md:32 msgid "String vs str" -msgstr "" +msgstr "文字列（String） vs 文字列スライス（str）" #: src/SUMMARY.md:33 msgid "Functions" -msgstr "" +msgstr "関数" #: src/SUMMARY.md:34 msgid "Rustdoc" -msgstr "" +msgstr "Rustdoc" #: src/SUMMARY.md:35 src/SUMMARY.md:82 msgid "Methods" -msgstr "" +msgstr "メソッド" #: src/SUMMARY.md:36 msgid "Overloading" -msgstr "" +msgstr "オーバーロード" -#: src/SUMMARY.md:37 src/SUMMARY.md:66 src/SUMMARY.md:90 src/SUMMARY.md:119 -#: src/SUMMARY.md:148 src/SUMMARY.md:177 src/SUMMARY.md:204 src/SUMMARY.md:225 -#: src/SUMMARY.md:251 src/SUMMARY.md:273 src/SUMMARY.md:293 +#: src/SUMMARY.md:37 src/SUMMARY.md:66 src/SUMMARY.md:90 src/SUMMARY.md:119 src/SUMMARY.md:148 +#: src/SUMMARY.md:177 src/SUMMARY.md:204 src/SUMMARY.md:225 src/SUMMARY.md:251 src/SUMMARY.md:273 +#: src/SUMMARY.md:293 msgid "Exercises" -msgstr "" +msgstr "練習問題" #: src/SUMMARY.md:38 msgid "Implicit Conversions" -msgstr "" +msgstr "暗黙的な型変換" #: src/SUMMARY.md:39 msgid "Arrays and for Loops" -msgstr "" +msgstr "配列とforループ" #: src/SUMMARY.md:41 msgid "Day 1: Afternoon" -msgstr "" +msgstr "Day 1： PM" #: src/SUMMARY.md:43 msgid "Variables" -msgstr "" +msgstr "変数" #: src/SUMMARY.md:44 msgid "Type Inference" -msgstr "" +msgstr "型推論" #: src/SUMMARY.md:45 msgid "static & const" -msgstr "" +msgstr "static & const" #: src/SUMMARY.md:46 msgid "Scopes and Shadowing" -msgstr "" +msgstr "スコープとシャドーイング" #: src/SUMMARY.md:47 msgid "Memory Management" -msgstr "" +msgstr "メモリ管理" #: src/SUMMARY.md:48 msgid "Stack vs Heap" -msgstr "" +msgstr "スタック vs ヒープ" #: src/SUMMARY.md:49 msgid "Stack Memory" -msgstr "" +msgstr "スタックメモリ" #: src/SUMMARY.md:50 msgid "Manual Memory Management" -msgstr "" +msgstr "手動でのメモリ管理" #: src/SUMMARY.md:51 msgid "Scope-Based Memory Management" -msgstr "" +msgstr "スコープに基づくメモリ管理" #: src/SUMMARY.md:52 msgid "Garbage Collection" -msgstr "" +msgstr "ガベージコレクション" #: src/SUMMARY.md:53 msgid "Rust Memory Management" -msgstr "" +msgstr "Rustのメモリ管理" #: src/SUMMARY.md:54 msgid "Comparison" -msgstr "" +msgstr "比較" #: src/SUMMARY.md:55 msgid "Ownership" -msgstr "" +msgstr "所有権" #: src/SUMMARY.md:56 msgid "Move Semantics" -msgstr "" +msgstr "ムーブセマンティクス" #: src/SUMMARY.md:57 msgid "Moved Strings in Rust" -msgstr "" +msgstr "文字列のムーブ" #: src/SUMMARY.md:58 msgid "Double Frees in Modern C++" -msgstr "" +msgstr "現代C++の二重解放" #: src/SUMMARY.md:59 msgid "Moves in Function Calls" -msgstr "" +msgstr "関数とムーブ" #: src/SUMMARY.md:60 msgid "Copying and Cloning" -msgstr "" +msgstr "コピーとクローン" #: src/SUMMARY.md:61 msgid "Borrowing" -msgstr "" +msgstr "借用" #: src/SUMMARY.md:62 msgid "Shared and Unique Borrows" -msgstr "" +msgstr "共有参照と固有参照" #: src/SUMMARY.md:63 msgid "Lifetimes" -msgstr "" +msgstr "ライフタイム" #: src/SUMMARY.md:64 msgid "Lifetimes in Function Calls" -msgstr "" +msgstr "関数とライフタイム" #: src/SUMMARY.md:65 msgid "Lifetimes in Data Structures" -msgstr "" +msgstr "データ構造とライフタイム" #: src/SUMMARY.md:67 msgid "Designing a Library" -msgstr "" +msgstr "ライブラリをデザイン" #: src/SUMMARY.md:68 msgid "Iterators and Ownership" -msgstr "" +msgstr "イテレータと所有権" #: src/SUMMARY.md:71 msgid "Day 2: Morning" -msgstr "" +msgstr "Day 2；AM" #: src/SUMMARY.md:76 msgid "Structs" -msgstr "" +msgstr "構造体（structs）" #: src/SUMMARY.md:77 msgid "Tuple Structs" -msgstr "" +msgstr "タプル構造体" #: src/SUMMARY.md:78 msgid "Field Shorthand Syntax" -msgstr "" +msgstr "フィールドの省略" #: src/SUMMARY.md:79 msgid "Enums" -msgstr "" +msgstr "列挙型（enums）" #: src/SUMMARY.md:80 msgid "Variant Payloads" -msgstr "" +msgstr "列挙子のペイロード" #: src/SUMMARY.md:81 msgid "Enum Sizes" -msgstr "" +msgstr "列挙型のサイズ" #: src/SUMMARY.md:83 msgid "Method Receiver" -msgstr "" +msgstr "メソッドレシーバ" #: src/SUMMARY.md:84 src/SUMMARY.md:159 src/SUMMARY.md:272 msgid "Example" -msgstr "" +msgstr "例" #: src/SUMMARY.md:85 msgid "Pattern Matching" -msgstr "" +msgstr "パターンマッチング" #: src/SUMMARY.md:86 msgid "Destructuring Enums" -msgstr "" +msgstr "列挙型編" #: src/SUMMARY.md:87 msgid "Destructuring Structs" -msgstr "" +msgstr "構造体編" #: src/SUMMARY.md:88 msgid "Destructuring Arrays" -msgstr "" +msgstr "配列編" #: src/SUMMARY.md:89 msgid "Match Guards" -msgstr "" +msgstr "マッチガード" #: src/SUMMARY.md:91 msgid "Health Statistics" -msgstr "" +msgstr "健康統計" #: src/SUMMARY.md:92 msgid "Points and Polygons" -msgstr "" +msgstr "ポイントとポリゴン" #: src/SUMMARY.md:94 msgid "Day 2: Afternoon" -msgstr "" +msgstr "Day 2：PM" #: src/SUMMARY.md:96 src/SUMMARY.md:286 msgid "Control Flow" -msgstr "" +msgstr "制御フロー" #: src/SUMMARY.md:97 msgid "Blocks" -msgstr "" +msgstr "コードブロック" #: src/SUMMARY.md:98 msgid "if expressions" -msgstr "" +msgstr "if式" #: src/SUMMARY.md:99 msgid "if let expressions" -msgstr "" +msgstr "if let式" #: src/SUMMARY.md:100 msgid "while expressions" -msgstr "" +msgstr "while式" #: src/SUMMARY.md:101 msgid "while let expressions" -msgstr "" +msgstr "while let式" #: src/SUMMARY.md:102 msgid "for expressions" -msgstr "" +msgstr "for式" #: src/SUMMARY.md:103 msgid "loop expressions" -msgstr "" +msgstr "loop式" #: src/SUMMARY.md:104 msgid "match expressions" -msgstr "" +msgstr "match式" #: src/SUMMARY.md:105 msgid "break & continue" -msgstr "" +msgstr "break & continue" #: src/SUMMARY.md:106 msgid "Standard Library" -msgstr "" +msgstr "標準ライブラリ" #: src/SUMMARY.md:107 msgid "Option and Result" -msgstr "" +msgstr "OptionとResult" #: src/SUMMARY.md:108 msgid "String" -msgstr "" +msgstr "文字列（String）" #: src/SUMMARY.md:109 msgid "Vec" -msgstr "" +msgstr "ベクタ（Vec）" #: src/SUMMARY.md:110 msgid "HashMap" -msgstr "" +msgstr "ハッシュマップ（HashMap）" #: src/SUMMARY.md:111 msgid "Box" -msgstr "" +msgstr "ボックス（Box）" #: src/SUMMARY.md:112 msgid "Recursive Data Types" -msgstr "" +msgstr "再帰的データ型" #: src/SUMMARY.md:113 msgid "Niche Optimization" -msgstr "" +msgstr "Niche最適化" #: src/SUMMARY.md:114 msgid "Rc" -msgstr "" +msgstr "Rc" #: src/SUMMARY.md:115 msgid "Modules" -msgstr "" +msgstr "モジュール" #: src/SUMMARY.md:116 msgid "Visibility" -msgstr "" +msgstr "可視性" #: src/SUMMARY.md:117 msgid "Paths" -msgstr "" +msgstr "パス" #: src/SUMMARY.md:118 msgid "Filesystem Hierarchy" -msgstr "" +msgstr "ファイルシステム階層" #: src/SUMMARY.md:120 msgid "Luhn Algorithm" -msgstr "" +msgstr "Luhnアルゴリズム" #: src/SUMMARY.md:121 msgid "Strings and Iterators" -msgstr "" +msgstr "文字列とイテレータ" #: src/SUMMARY.md:124 msgid "Day 3: Morning" -msgstr "" +msgstr "Day 3：AM" #: src/SUMMARY.md:129 msgid "Generics" -msgstr "" +msgstr "ジェネリクス（generics）" #: src/SUMMARY.md:130 msgid "Generic Data Types" -msgstr "" +msgstr "ジェネリックデータ型" #: src/SUMMARY.md:131 msgid "Generic Methods" -msgstr "" +msgstr "ジェネリックメソッド" #: src/SUMMARY.md:132 msgid "Monomorphization" -msgstr "" +msgstr "単相化" #: src/SUMMARY.md:133 msgid "Traits" -msgstr "" +msgstr "トレイト（trait）" #: src/SUMMARY.md:134 msgid "Trait Objects" -msgstr "" +msgstr "トレイトオブジェクト" #: src/SUMMARY.md:135 msgid "Deriving Traits" -msgstr "" +msgstr "トレイトの導出" #: src/SUMMARY.md:136 msgid "Default Methods" -msgstr "" +msgstr "デフォルトメソッド" #: src/SUMMARY.md:137 msgid "Trait Bounds" -msgstr "" +msgstr "トレイト境界" #: src/SUMMARY.md:138 msgid "impl Trait" -msgstr "" +msgstr "impl Trait" #: src/SUMMARY.md:139 msgid "Important Traits" -msgstr "" +msgstr "重要なトレイト" #: src/SUMMARY.md:140 msgid "Iterator" -msgstr "" +msgstr "Iterator" #: src/SUMMARY.md:141 msgid "FromIterator" -msgstr "" +msgstr "FromIterator" #: src/SUMMARY.md:142 msgid "From and Into" -msgstr "" +msgstr "FromとInto" #: src/SUMMARY.md:143 msgid "Read and Write" -msgstr "" +msgstr "ReadとWrite" #: src/SUMMARY.md:144 msgid "Drop" -msgstr "" +msgstr "Drop" #: src/SUMMARY.md:145 msgid "Default" -msgstr "" +msgstr "Default" #: src/SUMMARY.md:146 msgid "Operators: Add, Mul, ..." -msgstr "" +msgstr "演算子： Add, Mul, …" #: src/SUMMARY.md:147 msgid "Closures: Fn, FnMut, FnOnce" -msgstr "" +msgstr "クロージャ：Fn, FnMut, FnOnce" #: src/SUMMARY.md:149 msgid "A Simple GUI Library" -msgstr "" +msgstr "GUIライブラリ" #: src/SUMMARY.md:151 msgid "Day 3: Afternoon" -msgstr "" +msgstr "Day 3：PM" #: src/SUMMARY.md:153 msgid "Error Handling" -msgstr "" +msgstr "エラー処理" #: src/SUMMARY.md:154 msgid "Panics" -msgstr "" +msgstr "パニック（panic）" #: src/SUMMARY.md:155 msgid "Catching Stack Unwinding" -msgstr "" +msgstr "スタックの巻き戻し" #: src/SUMMARY.md:156 msgid "Structured Error Handling" -msgstr "" +msgstr "構造化されたエラー処理" #: src/SUMMARY.md:157 msgid "Propagating Errors with ?" -msgstr "" +msgstr "？でエラーを伝播する" #: src/SUMMARY.md:158 msgid "Converting Error Types" -msgstr "" +msgstr "エラーの型変換" #: src/SUMMARY.md:160 msgid "Deriving Error Enums" -msgstr "" +msgstr "列挙型エラーの導出" #: src/SUMMARY.md:161 msgid "Dynamic Error Types" -msgstr "" +msgstr "動的なエラー型" #: src/SUMMARY.md:162 msgid "Adding Context to Errors" -msgstr "" +msgstr "コンテキストをエラーに追加" #: src/SUMMARY.md:163 msgid "Testing" -msgstr "" +msgstr "テスト" #: src/SUMMARY.md:164 msgid "Unit Tests" -msgstr "" +msgstr "ユニットテスト" #: src/SUMMARY.md:165 msgid "Test Modules" -msgstr "" +msgstr "テストモジュール" #: src/SUMMARY.md:166 msgid "Documentation Tests" -msgstr "" +msgstr "ドキュメンテーションテスト" #: src/SUMMARY.md:167 msgid "Integration Tests" -msgstr "" +msgstr "インテグレーションテスト" #: src/SUMMARY.md:168 msgid "Useful crates" -msgstr "" +msgstr "便利クレート" #: src/SUMMARY.md:169 msgid "Unsafe Rust" -msgstr "" +msgstr "Unsafe Rust" #: src/SUMMARY.md:170 msgid "Dereferencing Raw Pointers" -msgstr "" +msgstr "生ポインタの参照外し" #: src/SUMMARY.md:171 msgid "Mutable Static Variables" -msgstr "" +msgstr "可変なstatic変数" #: src/SUMMARY.md:172 msgid "Unions" -msgstr "" +msgstr "共用体" #: src/SUMMARY.md:173 msgid "Calling Unsafe Functions" -msgstr "" +msgstr "Unsafe関数の呼び出し" #: src/SUMMARY.md:174 msgid "Writing Unsafe Functions" -msgstr "" +msgstr "Unsafe関数の書き方" #: src/SUMMARY.md:175 msgid "Extern Functions" -msgstr "" +msgstr "Extern関数" #: src/SUMMARY.md:176 msgid "Implementing Unsafe Traits" -msgstr "" +msgstr "Unsafeなトレイトの実装" #: src/SUMMARY.md:178 msgid "Safe FFI Wrapper" -msgstr "" +msgstr "安全なFFIラッパ" #: src/SUMMARY.md:181 src/SUMMARY.md:249 msgid "Android" -msgstr "" +msgstr "Android" #: src/SUMMARY.md:186 msgid "Setup" -msgstr "" +msgstr "セットアップ" #: src/SUMMARY.md:187 msgid "Build Rules" -msgstr "" +msgstr "ビルドのルール" #: src/SUMMARY.md:188 msgid "Binary" -msgstr "" +msgstr "バイナリ" #: src/SUMMARY.md:189 msgid "Library" -msgstr "" +msgstr "ライブラリ" #: src/SUMMARY.md:190 msgid "AIDL" -msgstr "" +msgstr "AIDL（Androidインターフェイス定義言語）" #: src/SUMMARY.md:191 msgid "Interface" -msgstr "" +msgstr "インターフェイス" #: src/SUMMARY.md:192 msgid "Implementation" -msgstr "" +msgstr "実装" #: src/SUMMARY.md:193 msgid "Server" -msgstr "" +msgstr "サーバ" #: src/SUMMARY.md:194 msgid "Deploy" -msgstr "" +msgstr "デプロイ" #: src/SUMMARY.md:195 msgid "Client" -msgstr "" +msgstr "クライアント" #: src/SUMMARY.md:196 msgid "Changing API" -msgstr "" +msgstr "APIの変更" #: src/SUMMARY.md:197 src/SUMMARY.md:240 msgid "Logging" -msgstr "" +msgstr "ログ出力" #: src/SUMMARY.md:198 msgid "Interoperability" -msgstr "" +msgstr "相互運用性" #: src/SUMMARY.md:199 msgid "With C" -msgstr "" +msgstr "C" #: src/SUMMARY.md:200 msgid "Calling C with Bindgen" -msgstr "" +msgstr "BindgenによるCの呼び出し" #: src/SUMMARY.md:201 msgid "Calling Rust from C" -msgstr "" +msgstr "CからRust呼び出し" #: src/SUMMARY.md:202 msgid "With C++" -msgstr "" +msgstr "C++" #: src/SUMMARY.md:203 msgid "With Java" -msgstr "" +msgstr "Java" #: src/SUMMARY.md:207 msgid "Bare Metal: Morning" -msgstr "" +msgstr "ベアメタル：AM" #: src/SUMMARY.md:212 msgid "no_std" -msgstr "" +msgstr "no_std" #: src/SUMMARY.md:213 msgid "A Minimal Example" -msgstr "" +msgstr "例" #: src/SUMMARY.md:214 msgid "alloc" -msgstr "" +msgstr "alloc" #: src/SUMMARY.md:215 msgid "Microcontrollers" -msgstr "" +msgstr "マイクロコントローラ" #: src/SUMMARY.md:216 msgid "Raw MMIO" -msgstr "" +msgstr "生MMIO（メモリマップトI/O）" #: src/SUMMARY.md:217 msgid "PACs" -msgstr "" +msgstr "PACs" #: src/SUMMARY.md:218 msgid "HAL Crates" -msgstr "" +msgstr "HALクレート" #: src/SUMMARY.md:219 msgid "Board Support Crates" -msgstr "" +msgstr "ボードサポートクレート" #: src/SUMMARY.md:220 msgid "The Type State Pattern" -msgstr "" +msgstr "タイプステートパターン" #: src/SUMMARY.md:221 msgid "embedded-hal" -msgstr "" +msgstr "embedded-hal" #: src/SUMMARY.md:222 msgid "probe-rs, cargo-embed" -msgstr "" +msgstr "probe-rs, cargo-embed" #: src/SUMMARY.md:223 msgid "Debugging" -msgstr "" +msgstr "デバッグ" #: src/SUMMARY.md:224 src/SUMMARY.md:242 msgid "Other Projects" -msgstr "" +msgstr "他のプロジェクト" #: src/SUMMARY.md:226 msgid "Compass" -msgstr "" +msgstr "コンパス" #: src/SUMMARY.md:228 msgid "Bare Metal: Afternoon" -msgstr "" +msgstr "ベアメタル：PM" #: src/SUMMARY.md:230 msgid "Application Processors" -msgstr "" +msgstr "アプリケーションプロセッサ" #: src/SUMMARY.md:231 msgid "Inline Assembly" -msgstr "" +msgstr "インラインアセンブリ" #: src/SUMMARY.md:232 msgid "MMIO" -msgstr "" +msgstr "MMIO" #: src/SUMMARY.md:233 msgid "Let's Write a UART Driver" -msgstr "" +msgstr "UARTドライバを書いてみよう" #: src/SUMMARY.md:234 msgid "More Traits" -msgstr "" +msgstr "他のトレイト" #: src/SUMMARY.md:235 msgid "A Better UART Driver" -msgstr "" +msgstr "UARTドライバの改善" #: src/SUMMARY.md:236 msgid "Bitflags" -msgstr "" +msgstr "ビットフラッグ" #: src/SUMMARY.md:237 msgid "Multiple Registers" -msgstr "" +msgstr "複数のレジスタ" #: src/SUMMARY.md:238 msgid "Driver" -msgstr "" +msgstr "ドライバ" #: src/SUMMARY.md:239 src/SUMMARY.md:241 msgid "Using It" -msgstr "" +msgstr "使用例" #: src/SUMMARY.md:243 msgid "Useful Crates" -msgstr "" +msgstr "便利クレート" #: src/SUMMARY.md:244 msgid "zerocopy" -msgstr "" +msgstr "zerocopy" #: src/SUMMARY.md:245 msgid "aarch64-paging" -msgstr "" +msgstr "aarch64-paging" #: src/SUMMARY.md:246 msgid "buddy_system_allocator" -msgstr "" +msgstr "buddy_system_allocator" #: src/SUMMARY.md:247 msgid "tinyvec" -msgstr "" +msgstr "tinyvec" #: src/SUMMARY.md:248 msgid "spin" -msgstr "" +msgstr "spin" #: src/SUMMARY.md:250 msgid "vmbase" -msgstr "" +msgstr "vmbase" #: src/SUMMARY.md:252 msgid "RTC Driver" -msgstr "" +msgstr "RTC（リアルタイムクロック）ドライバ" #: src/SUMMARY.md:255 msgid "Concurrency: Morning" -msgstr "" +msgstr "並行性：AM" #: src/SUMMARY.md:260 msgid "Threads" -msgstr "" +msgstr "スレッド" #: src/SUMMARY.md:261 msgid "Scoped Threads" -msgstr "" +msgstr "スコープ付きスレッド" #: src/SUMMARY.md:262 msgid "Channels" -msgstr "" +msgstr "チャネル" #: src/SUMMARY.md:263 msgid "Unbounded Channels" -msgstr "" +msgstr "Unboundedチャネル" #: src/SUMMARY.md:264 msgid "Bounded Channels" -msgstr "" +msgstr "Boundedチャネル" #: src/SUMMARY.md:265 msgid "Send and Sync" -msgstr "" +msgstr "SendとSync" #: src/SUMMARY.md:265 msgid "Send" -msgstr "" +msgstr "Send" #: src/SUMMARY.md:265 msgid "Sync" -msgstr "" +msgstr "Sync" #: src/SUMMARY.md:268 msgid "Examples" -msgstr "" +msgstr "例" #: src/SUMMARY.md:269 msgid "Shared State" -msgstr "" +msgstr "状態共有" #: src/SUMMARY.md:270 msgid "Arc" -msgstr "" +msgstr "Arc" #: src/SUMMARY.md:271 msgid "Mutex" -msgstr "" +msgstr "Mutex" #: src/SUMMARY.md:274 src/SUMMARY.md:294 msgid "Dining Philosophers" -msgstr "" +msgstr "食事する哲学者" #: src/SUMMARY.md:275 msgid "Multi-threaded Link Checker" -msgstr "" +msgstr "マルチスレッド・リンクチェッカー" #: src/SUMMARY.md:277 msgid "Concurrency: Afternoon" -msgstr "" +msgstr "並行性：PM" #: src/SUMMARY.md:279 msgid "Async Basics" -msgstr "" +msgstr "Asyncの基礎" #: src/SUMMARY.md:280 msgid "async/await" -msgstr "" +msgstr "async/await" #: src/SUMMARY.md:281 msgid "Futures" -msgstr "" +msgstr "Futures" #: src/SUMMARY.md:282 msgid "Runtimes" -msgstr "" +msgstr "ランタイム" #: src/SUMMARY.md:283 msgid "Tokio" -msgstr "" +msgstr "Tokio" #: src/SUMMARY.md:284 msgid "Tasks" -msgstr "" +msgstr "タスク" #: src/SUMMARY.md:285 msgid "Async Channels" -msgstr "" +msgstr "Asyncチャネル" #: src/SUMMARY.md:287 msgid "Join" @@ -912,83 +913,83 @@ msgstr "" #: src/SUMMARY.md:289 msgid "Pitfalls" -msgstr "" +msgstr "落とし穴" #: src/SUMMARY.md:290 msgid "Blocking the Executor" -msgstr "" +msgstr "エグゼキュータのブロッキング" #: src/SUMMARY.md:291 msgid "Pin" -msgstr "" +msgstr "Pin" #: src/SUMMARY.md:292 msgid "Async Traits" -msgstr "" +msgstr "Asyncトレイト" #: src/SUMMARY.md:295 msgid "Broadcast Chat Application" -msgstr "" +msgstr "ブロードキャスト・チャットアプリ" #: src/SUMMARY.md:298 msgid "Final Words" -msgstr "" +msgstr "最後に" #: src/SUMMARY.md:302 msgid "Thanks!" -msgstr "" +msgstr "ありがとうございました！" #: src/SUMMARY.md:303 msgid "Other Resources" -msgstr "" +msgstr "参考資料" #: src/SUMMARY.md:304 msgid "Credits" -msgstr "" +msgstr "クレジット" #: src/SUMMARY.md:307 msgid "Solutions" -msgstr "" +msgstr "解答" #: src/SUMMARY.md:312 msgid "Day 1 Morning" -msgstr "" +msgstr "Day 1 AM" #: src/SUMMARY.md:313 msgid "Day 1 Afternoon" -msgstr "" +msgstr "Day 1 PM" #: src/SUMMARY.md:314 msgid "Day 2 Morning" -msgstr "" +msgstr "Day 2 AM" #: src/SUMMARY.md:315 msgid "Day 2 Afternoon" -msgstr "" +msgstr "Day 2 PM" #: src/SUMMARY.md:316 msgid "Day 3 Morning" -msgstr "" +msgstr "Day 3 AM" #: src/SUMMARY.md:317 msgid "Day 3 Afternoon" -msgstr "" +msgstr "Day 3 PM" #: src/SUMMARY.md:318 msgid "Bare Metal Rust Morning" -msgstr "" +msgstr "ベアメタルRust AM" #: src/SUMMARY.md:319 msgid "Bare Metal Rust Afternoon" -msgstr "" +msgstr "ベアメタルRust PM" #: src/SUMMARY.md:320 msgid "Concurrency Morning" -msgstr "" +msgstr "並行性 AM" #: src/SUMMARY.md:321 msgid "Concurrency Afternoon" -msgstr "" +msgstr "並行性 PM" #: src/welcome.md:1 msgid "# Welcome to Comprehensive Rust 🦀" @@ -996,9 +997,9 @@ msgstr "" #: src/welcome.md:3 msgid "" -"[![Build workflow](https://img.shields.io/github/actions/workflow/status/" -"google/comprehensive-rust/build.yml?style=flat-square)](https://github.com/" -"google/comprehensive-rust/actions/workflows/build.yml?query=branch%3Amain)" +"[![Build workflow](https://img.shields.io/github/actions/workflow/status/google/comprehensive-rust/" +"build.yml?style=flat-square)](https://github.com/google/comprehensive-rust/actions/workflows/build." +"yml?query=branch%3Amain)" msgstr "" #: src/welcome.md:3 @@ -1007,12 +1008,11 @@ msgstr "" #: src/welcome.md:3 msgid "" -"[![Build workflow](https://img.shields.io/github/actions/workflow/status/" -"google/comprehensive-rust/build.yml?style=flat-square)](https://github.com/" -"google/comprehensive-rust/actions/workflows/build.yml?query=branch%3Amain)\n" -"[![GitHub contributors](https://img.shields.io/github/contributors/google/" -"comprehensive-rust?style=flat-square)](https://github.com/google/" -"comprehensive-rust/graphs/contributors)" +"[![Build workflow](https://img.shields.io/github/actions/workflow/status/google/comprehensive-rust/" +"build.yml?style=flat-square)](https://github.com/google/comprehensive-rust/actions/workflows/build." +"yml?query=branch%3Amain)\n" +"[![GitHub contributors](https://img.shields.io/github/contributors/google/comprehensive-rust?" +"style=flat-square)](https://github.com/google/comprehensive-rust/graphs/contributors)" msgstr "" #: src/welcome.md:4 @@ -1021,12 +1021,10 @@ msgstr "" #: src/welcome.md:4 msgid "" -"[![GitHub contributors](https://img.shields.io/github/contributors/google/" -"comprehensive-rust?style=flat-square)](https://github.com/google/" -"comprehensive-rust/graphs/contributors)\n" -"[![GitHub stars](https://img.shields.io/github/stars/google/comprehensive-" -"rust?style=flat-square)](https://github.com/google/comprehensive-rust/" -"stargazers)" +"[![GitHub contributors](https://img.shields.io/github/contributors/google/comprehensive-rust?" +"style=flat-square)](https://github.com/google/comprehensive-rust/graphs/contributors)\n" +"[![GitHub stars](https://img.shields.io/github/stars/google/comprehensive-rust?style=flat-square)]" +"(https://github.com/google/comprehensive-rust/stargazers)" msgstr "" #: src/welcome.md:5 @@ -1035,25 +1033,20 @@ msgstr "" #: src/welcome.md:5 msgid "" -"[![GitHub stars](https://img.shields.io/github/stars/google/comprehensive-" -"rust?style=flat-square)](https://github.com/google/comprehensive-rust/" -"stargazers)" +"[![GitHub stars](https://img.shields.io/github/stars/google/comprehensive-rust?style=flat-square)]" +"(https://github.com/google/comprehensive-rust/stargazers)" msgstr "" #: src/welcome.md:7 msgid "" -"This is a three day Rust course developed by the Android team. The course " -"covers\n" -"the full spectrum of Rust, from basic syntax to advanced topics like " -"generics\n" -"and error handling. It also includes Android-specific content on the last " -"day." +"This is a three day Rust course developed by the Android team. The course covers\n" +"the full spectrum of Rust, from basic syntax to advanced topics like generics\n" +"and error handling. It also includes Android-specific content on the last day." msgstr "" #: src/welcome.md:11 msgid "" -"The goal of the course is to teach you Rust. We assume you don't know " -"anything\n" +"The goal of the course is to teach you Rust. We assume you don't know anything\n" "about Rust and hope to:" msgstr "" @@ -1066,25 +1059,19 @@ msgstr "" #: src/welcome.md:18 msgid "" -"The first three days show you the fundamentals of Rust. Following this, " -"you're\n" +"The first three days show you the fundamentals of Rust. Following this, you're\n" "invited to dive into one or more spezialized topics:" msgstr "" #: src/welcome.md:21 msgid "" -"* [Android](android.md): a half-day course on using Rust for Android " -"platform\n" +"* [Android](android.md): a half-day course on using Rust for Android platform\n" " development (AOSP). This includes interoperability wtih C, C++, and Java.\n" -"* [Bare-metal](bare-metal.md): a full day class on using Rust for bare-" -"metal\n" -" (embedded) development. Both microcontrollers and application processors " -"are\n" +"* [Bare-metal](bare-metal.md): a full day class on using Rust for bare-metal\n" +" (embedded) development. Both microcontrollers and application processors are\n" " covered.\n" -"* [Concurrency](concurrency.md): a full day class on concurrency in Rust. " -"We\n" -" cover both classical concurrency (preemptively scheduling using threads " -"and\n" +"* [Concurrency](concurrency.md): a full day class on concurrency in Rust. We\n" +" cover both classical concurrency (preemptively scheduling using threads and\n" " mutextes) and async/await concurrency (cooperative multitasking using\n" " futures)." msgstr "" @@ -1095,8 +1082,7 @@ msgstr "" #: src/welcome.md:34 msgid "" -"Rust is a large language and we won't be able to cover all of it in a few " -"days.\n" +"Rust is a large language and we won't be able to cover all of it in a few days.\n" "Some non-goals of this course are:" msgstr "" @@ -1113,112 +1099,83 @@ msgstr "" #: src/welcome.md:43 msgid "" -"The course assumes that you already know how to program. Rust is a " -"statically\n" -"typed language and we will sometimes make comparisons with C and C++ to " -"better\n" +"The course assumes that you already know how to program. Rust is a statically\n" +"typed language and we will sometimes make comparisons with C and C++ to better\n" "explain or contrast the Rust approach." msgstr "" #: src/welcome.md:47 msgid "" -"If you know how to program in a dynamically typed language such as Python " -"or\n" +"If you know how to program in a dynamically typed language such as Python or\n" "JavaScript, then you will be able to follow along just fine too." msgstr "" -#: src/welcome.md:50 src/cargo/rust-ecosystem.md:19 -#: src/cargo/code-samples.md:22 src/cargo/running-locally.md:68 -#: src/welcome-day-1.md:14 src/welcome-day-1/what-is-rust.md:19 +#: src/welcome.md:50 src/cargo/rust-ecosystem.md:19 src/cargo/code-samples.md:22 +#: src/cargo/running-locally.md:68 src/welcome-day-1.md:14 src/welcome-day-1/what-is-rust.md:19 #: src/hello-world.md:20 src/hello-world/small-example.md:21 src/why-rust.md:9 -#: src/why-rust/compile-time.md:14 src/why-rust/runtime.md:8 -#: src/why-rust/modern.md:19 src/basic-syntax/scalar-types.md:19 -#: src/basic-syntax/compound-types.md:28 src/basic-syntax/references.md:21 -#: src/basic-syntax/slices.md:18 src/basic-syntax/string-slices.md:25 -#: src/basic-syntax/functions.md:33 src/basic-syntax/rustdoc.md:22 -#: src/basic-syntax/methods.md:32 src/basic-syntax/functions-interlude.md:25 -#: src/exercises/day-1/morning.md:9 src/exercises/day-1/for-loops.md:90 -#: src/basic-syntax/variables.md:15 src/basic-syntax/type-inference.md:24 -#: src/basic-syntax/static-and-const.md:46 +#: src/why-rust/compile-time.md:14 src/why-rust/runtime.md:8 src/why-rust/modern.md:19 +#: src/basic-syntax/scalar-types.md:19 src/basic-syntax/compound-types.md:28 +#: src/basic-syntax/references.md:21 src/basic-syntax/slices.md:18 +#: src/basic-syntax/string-slices.md:25 src/basic-syntax/functions.md:33 +#: src/basic-syntax/rustdoc.md:22 src/basic-syntax/methods.md:32 +#: src/basic-syntax/functions-interlude.md:25 src/exercises/day-1/morning.md:9 +#: src/exercises/day-1/for-loops.md:90 src/basic-syntax/variables.md:15 +#: src/basic-syntax/type-inference.md:24 src/basic-syntax/static-and-const.md:46 #: src/basic-syntax/scopes-shadowing.md:23 src/memory-management/stack.md:26 #: src/memory-management/rust.md:12 src/ownership/move-semantics.md:20 #: src/ownership/moves-function-calls.md:18 src/ownership/copy-clone.md:33 #: src/ownership/borrowing.md:25 src/ownership/shared-unique-borrows.md:23 -#: src/ownership/lifetimes-function-calls.md:27 -#: src/ownership/lifetimes-data-structures.md:23 -#: src/exercises/day-1/afternoon.md:9 src/exercises/day-1/book-library.md:100 -#: src/structs.md:29 src/structs/tuple-structs.md:35 -#: src/structs/field-shorthand.md:25 src/enums.md:31 +#: src/ownership/lifetimes-function-calls.md:27 src/ownership/lifetimes-data-structures.md:23 +#: src/exercises/day-1/afternoon.md:9 src/exercises/day-1/book-library.md:100 src/structs.md:29 +#: src/structs/tuple-structs.md:35 src/structs/field-shorthand.md:25 src/enums.md:31 #: src/enums/variant-payloads.md:33 src/enums/sizes.md:27 src/methods.md:28 -#: src/methods/receiver.md:23 src/methods/example.md:44 -#: src/pattern-matching.md:23 src/pattern-matching/destructuring-enums.md:33 -#: src/pattern-matching/destructuring-structs.md:21 -#: src/pattern-matching/destructuring-arrays.md:19 -#: src/pattern-matching/match-guards.md:20 src/exercises/day-2/morning.md:9 -#: src/exercises/day-2/points-polygons.md:115 src/control-flow/blocks.md:40 -#: src/control-flow/if-expressions.md:33 -#: src/control-flow/if-let-expressions.md:21 -#: src/control-flow/while-let-expressions.md:24 -#: src/control-flow/for-expressions.md:23 -#: src/control-flow/loop-expressions.md:25 -#: src/control-flow/match-expressions.md:26 src/std.md:23 -#: src/std/option-result.md:16 src/std/string.md:28 src/std/vec.md:35 -#: src/std/hashmap.md:36 src/std/box.md:32 src/std/box-recursive.md:31 -#: src/std/rc.md:29 src/modules.md:26 src/modules/visibility.md:37 -#: src/modules/filesystem.md:42 src/exercises/day-2/afternoon.md:5 -#: src/generics/data-types.md:19 src/generics/methods.md:23 -#: src/traits/trait-objects.md:70 src/traits/default-methods.md:30 -#: src/traits/trait-bounds.md:33 src/traits/impl-trait.md:21 -#: src/traits/iterator.md:30 src/traits/from-iterator.md:15 -#: src/traits/from-into.md:27 src/traits/drop.md:32 src/traits/default.md:38 -#: src/traits/operators.md:24 src/traits/closures.md:23 +#: src/methods/receiver.md:23 src/methods/example.md:44 src/pattern-matching.md:23 +#: src/pattern-matching/destructuring-enums.md:33 src/pattern-matching/destructuring-structs.md:21 +#: src/pattern-matching/destructuring-arrays.md:19 src/pattern-matching/match-guards.md:20 +#: src/exercises/day-2/morning.md:9 src/exercises/day-2/points-polygons.md:115 +#: src/control-flow/blocks.md:40 src/control-flow/if-expressions.md:33 +#: src/control-flow/if-let-expressions.md:21 src/control-flow/while-let-expressions.md:24 +#: src/control-flow/for-expressions.md:23 src/control-flow/loop-expressions.md:25 +#: src/control-flow/match-expressions.md:26 src/std.md:23 src/std/option-result.md:16 +#: src/std/string.md:28 src/std/vec.md:35 src/std/hashmap.md:36 src/std/box.md:32 +#: src/std/box-recursive.md:31 src/std/rc.md:29 src/modules.md:26 src/modules/visibility.md:37 +#: src/modules/filesystem.md:42 src/exercises/day-2/afternoon.md:5 src/generics/data-types.md:19 +#: src/generics/methods.md:23 src/traits/trait-objects.md:70 src/traits/default-methods.md:30 +#: src/traits/trait-bounds.md:33 src/traits/impl-trait.md:21 src/traits/iterator.md:30 +#: src/traits/from-iterator.md:15 src/traits/from-into.md:27 src/traits/drop.md:32 +#: src/traits/default.md:38 src/traits/operators.md:24 src/traits/closures.md:23 #: src/exercises/day-3/morning.md:5 src/error-handling/result.md:25 -#: src/error-handling/try-operator.md:46 -#: src/error-handling/converting-error-types-example.md:48 -#: src/error-handling/deriving-error-enums.md:37 -#: src/error-handling/dynamic-errors.md:34 -#: src/error-handling/error-contexts.md:33 src/unsafe.md:26 -#: src/unsafe/raw-pointers.md:25 src/unsafe/mutable-static-variables.md:30 -#: src/unsafe/unions.md:19 src/unsafe/writing-unsafe-functions.md:31 -#: src/unsafe/extern-functions.md:19 src/unsafe/unsafe-traits.md:28 -#: src/exercises/day-3/afternoon.md:5 -#: src/android/interoperability/with-c/rust.md:81 -#: src/exercises/android/morning.md:10 src/bare-metal/minimal.md:15 -#: src/bare-metal/alloc.md:37 src/bare-metal/microcontrollers.md:23 -#: src/bare-metal/microcontrollers/mmio.md:62 -#: src/bare-metal/microcontrollers/pacs.md:47 -#: src/bare-metal/microcontrollers/hals.md:37 -#: src/bare-metal/microcontrollers/board-support.md:26 +#: src/error-handling/try-operator.md:46 src/error-handling/converting-error-types-example.md:48 +#: src/error-handling/deriving-error-enums.md:37 src/error-handling/dynamic-errors.md:34 +#: src/error-handling/error-contexts.md:33 src/unsafe.md:26 src/unsafe/raw-pointers.md:25 +#: src/unsafe/mutable-static-variables.md:30 src/unsafe/unions.md:19 +#: src/unsafe/writing-unsafe-functions.md:31 src/unsafe/extern-functions.md:19 +#: src/unsafe/unsafe-traits.md:28 src/exercises/day-3/afternoon.md:5 +#: src/android/interoperability/with-c/rust.md:81 src/exercises/android/morning.md:10 +#: src/bare-metal/minimal.md:15 src/bare-metal/alloc.md:37 src/bare-metal/microcontrollers.md:23 +#: src/bare-metal/microcontrollers/mmio.md:62 src/bare-metal/microcontrollers/pacs.md:47 +#: src/bare-metal/microcontrollers/hals.md:37 src/bare-metal/microcontrollers/board-support.md:26 #: src/bare-metal/microcontrollers/type-state.md:30 -#: src/bare-metal/microcontrollers/embedded-hal.md:17 -#: src/bare-metal/microcontrollers/probe-rs.md:14 +#: src/bare-metal/microcontrollers/embedded-hal.md:17 src/bare-metal/microcontrollers/probe-rs.md:14 #: src/bare-metal/microcontrollers/debugging.md:25 -#: src/bare-metal/microcontrollers/other-projects.md:16 -#: src/exercises/bare-metal/morning.md:5 src/bare-metal/aps.md:7 -#: src/bare-metal/aps/inline-assembly.md:41 src/bare-metal/aps/mmio.md:7 +#: src/bare-metal/microcontrollers/other-projects.md:16 src/exercises/bare-metal/morning.md:5 +#: src/bare-metal/aps.md:7 src/bare-metal/aps/inline-assembly.md:41 src/bare-metal/aps/mmio.md:7 #: src/bare-metal/aps/uart.md:53 src/bare-metal/aps/uart/traits.md:22 -#: src/bare-metal/aps/better-uart.md:24 -#: src/bare-metal/aps/better-uart/bitflags.md:35 -#: src/bare-metal/aps/better-uart/registers.md:39 -#: src/bare-metal/aps/better-uart/driver.md:62 +#: src/bare-metal/aps/better-uart.md:24 src/bare-metal/aps/better-uart/bitflags.md:35 +#: src/bare-metal/aps/better-uart/registers.md:39 src/bare-metal/aps/better-uart/driver.md:62 #: src/bare-metal/aps/better-uart/using.md:49 src/bare-metal/aps/logging.md:48 -#: src/bare-metal/aps/logging/using.md:44 -#: src/bare-metal/useful-crates/zerocopy.md:43 +#: src/bare-metal/aps/logging/using.md:44 src/bare-metal/useful-crates/zerocopy.md:43 #: src/bare-metal/useful-crates/aarch64-paging.md:26 #: src/bare-metal/useful-crates/buddy_system_allocator.md:24 -#: src/bare-metal/useful-crates/tinyvec.md:21 -#: src/bare-metal/useful-crates/spin.md:21 src/bare-metal/android/vmbase.md:19 -#: src/exercises/bare-metal/afternoon.md:5 src/concurrency/threads.md:28 -#: src/concurrency/scoped-threads.md:35 src/concurrency/channels.md:25 +#: src/bare-metal/useful-crates/tinyvec.md:21 src/bare-metal/useful-crates/spin.md:21 +#: src/bare-metal/android/vmbase.md:19 src/exercises/bare-metal/afternoon.md:5 +#: src/concurrency/threads.md:28 src/concurrency/scoped-threads.md:35 src/concurrency/channels.md:25 #: src/concurrency/send-sync.md:18 src/concurrency/send-sync/send.md:11 #: src/concurrency/send-sync/sync.md:12 src/concurrency/shared_state/arc.md:27 -#: src/concurrency/shared_state/mutex.md:29 -#: src/concurrency/shared_state/example.md:21 -#: src/exercises/concurrency/morning.md:10 src/async/async-await.md:23 -#: src/async/futures.md:30 src/async/runtimes.md:18 -#: src/async/runtimes/tokio.md:31 src/async/tasks.md:51 -#: src/async/channels.md:33 src/async/control-flow/join.md:34 -#: src/async/control-flow/select.md:59 +#: src/concurrency/shared_state/mutex.md:29 src/concurrency/shared_state/example.md:21 +#: src/exercises/concurrency/morning.md:10 src/async/async-await.md:23 src/async/futures.md:30 +#: src/async/runtimes.md:18 src/async/runtimes/tokio.md:31 src/async/tasks.md:51 +#: src/async/channels.md:33 src/async/control-flow/join.md:34 src/async/control-flow/select.md:59 #: src/async/pitfalls/blocking-executor.md:27 src/async/pitfalls/pin.md:66 #: src/exercises/concurrency/afternoon.md:11 #: src/exercises/concurrency/dining-philosophers-async.md:75 @@ -1228,106 +1185,78 @@ msgstr "" #: src/welcome.md:52 msgid "" "This is an example of a _speaker note_. We will use these to add additional\n" -"information to the slides. This could be key points which the instructor " -"should\n" +"information to the slides. This could be key points which the instructor should\n" "cover as well as answers to typical questions which come up in class." msgstr "" -#: src/welcome.md:56 src/cargo/rust-ecosystem.md:67 -#: src/cargo/code-samples.md:35 src/cargo/running-locally.md:74 -#: src/welcome-day-1.md:42 src/welcome-day-1/what-is-rust.md:29 +#: src/welcome.md:56 src/cargo/rust-ecosystem.md:67 src/cargo/code-samples.md:35 +#: src/cargo/running-locally.md:74 src/welcome-day-1.md:42 src/welcome-day-1/what-is-rust.md:29 #: src/hello-world.md:40 src/hello-world/small-example.md:44 src/why-rust.md:24 -#: src/why-rust/compile-time.md:35 src/why-rust/runtime.md:22 -#: src/why-rust/modern.md:66 src/basic-syntax/scalar-types.md:43 -#: src/basic-syntax/compound-types.md:62 src/basic-syntax/references.md:29 -#: src/basic-syntax/slices.md:36 src/basic-syntax/string-slices.md:44 -#: src/basic-syntax/functions.md:41 src/basic-syntax/rustdoc.md:33 -#: src/basic-syntax/methods.md:45 src/basic-syntax/functions-interlude.md:30 -#: src/exercises/day-1/morning.md:28 src/exercises/day-1/for-loops.md:95 -#: src/basic-syntax/variables.md:20 src/basic-syntax/type-inference.md:48 -#: src/basic-syntax/static-and-const.md:52 +#: src/why-rust/compile-time.md:35 src/why-rust/runtime.md:22 src/why-rust/modern.md:66 +#: src/basic-syntax/scalar-types.md:43 src/basic-syntax/compound-types.md:62 +#: src/basic-syntax/references.md:29 src/basic-syntax/slices.md:36 +#: src/basic-syntax/string-slices.md:44 src/basic-syntax/functions.md:41 +#: src/basic-syntax/rustdoc.md:33 src/basic-syntax/methods.md:45 +#: src/basic-syntax/functions-interlude.md:30 src/exercises/day-1/morning.md:28 +#: src/exercises/day-1/for-loops.md:95 src/basic-syntax/variables.md:20 +#: src/basic-syntax/type-inference.md:48 src/basic-syntax/static-and-const.md:52 #: src/basic-syntax/scopes-shadowing.md:39 src/memory-management/stack.md:49 #: src/memory-management/rust.md:18 src/ownership/move-semantics.md:26 #: src/ownership/moves-function-calls.md:26 src/ownership/copy-clone.md:51 #: src/ownership/borrowing.md:51 src/ownership/shared-unique-borrows.md:29 -#: src/ownership/lifetimes-function-calls.md:60 -#: src/ownership/lifetimes-data-structures.md:30 -#: src/exercises/day-1/afternoon.md:15 src/exercises/day-1/book-library.md:104 -#: src/structs.md:42 src/structs/tuple-structs.md:43 -#: src/structs/field-shorthand.md:72 src/enums.md:41 +#: src/ownership/lifetimes-function-calls.md:60 src/ownership/lifetimes-data-structures.md:30 +#: src/exercises/day-1/afternoon.md:15 src/exercises/day-1/book-library.md:104 src/structs.md:42 +#: src/structs/tuple-structs.md:43 src/structs/field-shorthand.md:72 src/enums.md:41 #: src/enums/variant-payloads.md:45 src/enums/sizes.md:155 src/methods.md:41 -#: src/methods/receiver.md:29 src/methods/example.md:53 -#: src/pattern-matching.md:35 src/pattern-matching/destructuring-enums.md:39 -#: src/pattern-matching/destructuring-structs.md:29 -#: src/pattern-matching/destructuring-arrays.md:46 -#: src/pattern-matching/match-guards.md:28 src/exercises/day-2/morning.md:15 -#: src/exercises/day-2/points-polygons.md:125 src/control-flow/blocks.md:46 -#: src/control-flow/if-expressions.md:37 -#: src/control-flow/if-let-expressions.md:41 -#: src/control-flow/while-let-expressions.md:29 -#: src/control-flow/for-expressions.md:30 -#: src/control-flow/loop-expressions.md:32 -#: src/control-flow/match-expressions.md:33 src/std.md:31 -#: src/std/option-result.md:25 src/std/string.md:42 src/std/vec.md:49 -#: src/std/hashmap.md:66 src/std/box.md:39 src/std/box-recursive.md:41 -#: src/std/rc.md:69 src/modules.md:32 src/modules/visibility.md:48 -#: src/modules/filesystem.md:71 src/exercises/day-2/afternoon.md:11 -#: src/generics/data-types.md:25 src/generics/methods.md:31 -#: src/traits/trait-objects.md:83 src/traits/default-methods.md:60 -#: src/traits/trait-bounds.md:50 src/traits/impl-trait.md:44 -#: src/traits/iterator.md:42 src/traits/from-iterator.md:26 -#: src/traits/from-into.md:33 src/traits/drop.md:42 src/traits/default.md:47 -#: src/traits/operators.md:38 src/traits/closures.md:38 +#: src/methods/receiver.md:29 src/methods/example.md:53 src/pattern-matching.md:35 +#: src/pattern-matching/destructuring-enums.md:39 src/pattern-matching/destructuring-structs.md:29 +#: src/pattern-matching/destructuring-arrays.md:46 src/pattern-matching/match-guards.md:28 +#: src/exercises/day-2/morning.md:15 src/exercises/day-2/points-polygons.md:125 +#: src/control-flow/blocks.md:46 src/control-flow/if-expressions.md:37 +#: src/control-flow/if-let-expressions.md:41 src/control-flow/while-let-expressions.md:29 +#: src/control-flow/for-expressions.md:30 src/control-flow/loop-expressions.md:32 +#: src/control-flow/match-expressions.md:33 src/std.md:31 src/std/option-result.md:25 +#: src/std/string.md:42 src/std/vec.md:49 src/std/hashmap.md:66 src/std/box.md:39 +#: src/std/box-recursive.md:41 src/std/rc.md:69 src/modules.md:32 src/modules/visibility.md:48 +#: src/modules/filesystem.md:71 src/exercises/day-2/afternoon.md:11 src/generics/data-types.md:25 +#: src/generics/methods.md:31 src/traits/trait-objects.md:83 src/traits/default-methods.md:60 +#: src/traits/trait-bounds.md:50 src/traits/impl-trait.md:44 src/traits/iterator.md:42 +#: src/traits/from-iterator.md:26 src/traits/from-into.md:33 src/traits/drop.md:42 +#: src/traits/default.md:47 src/traits/operators.md:38 src/traits/closures.md:38 #: src/exercises/day-3/morning.md:11 src/error-handling/result.md:33 -#: src/error-handling/try-operator.md:53 -#: src/error-handling/converting-error-types-example.md:60 -#: src/error-handling/deriving-error-enums.md:45 -#: src/error-handling/dynamic-errors.md:41 -#: src/error-handling/error-contexts.md:42 src/unsafe.md:32 -#: src/unsafe/raw-pointers.md:43 src/unsafe/mutable-static-variables.md:35 -#: src/unsafe/unions.md:28 src/unsafe/writing-unsafe-functions.md:38 -#: src/unsafe/extern-functions.md:28 src/unsafe/unsafe-traits.md:37 -#: src/exercises/day-3/afternoon.md:11 -#: src/android/interoperability/with-c/rust.md:86 -#: src/exercises/android/morning.md:15 src/bare-metal/no_std.md:65 -#: src/bare-metal/minimal.md:26 src/bare-metal/alloc.md:49 -#: src/bare-metal/microcontrollers.md:29 -#: src/bare-metal/microcontrollers/mmio.md:72 -#: src/bare-metal/microcontrollers/pacs.md:65 -#: src/bare-metal/microcontrollers/hals.md:49 +#: src/error-handling/try-operator.md:53 src/error-handling/converting-error-types-example.md:60 +#: src/error-handling/deriving-error-enums.md:45 src/error-handling/dynamic-errors.md:41 +#: src/error-handling/error-contexts.md:42 src/unsafe.md:32 src/unsafe/raw-pointers.md:43 +#: src/unsafe/mutable-static-variables.md:35 src/unsafe/unions.md:28 +#: src/unsafe/writing-unsafe-functions.md:38 src/unsafe/extern-functions.md:28 +#: src/unsafe/unsafe-traits.md:37 src/exercises/day-3/afternoon.md:11 +#: src/android/interoperability/with-c/rust.md:86 src/exercises/android/morning.md:15 +#: src/bare-metal/no_std.md:65 src/bare-metal/minimal.md:26 src/bare-metal/alloc.md:49 +#: src/bare-metal/microcontrollers.md:29 src/bare-metal/microcontrollers/mmio.md:72 +#: src/bare-metal/microcontrollers/pacs.md:65 src/bare-metal/microcontrollers/hals.md:49 #: src/bare-metal/microcontrollers/board-support.md:40 #: src/bare-metal/microcontrollers/type-state.md:43 -#: src/bare-metal/microcontrollers/embedded-hal.md:23 -#: src/bare-metal/microcontrollers/probe-rs.md:29 +#: src/bare-metal/microcontrollers/embedded-hal.md:23 src/bare-metal/microcontrollers/probe-rs.md:29 #: src/bare-metal/microcontrollers/debugging.md:38 -#: src/bare-metal/microcontrollers/other-projects.md:26 -#: src/exercises/bare-metal/morning.md:11 src/bare-metal/aps.md:15 -#: src/bare-metal/aps/inline-assembly.md:58 src/bare-metal/aps/mmio.md:17 +#: src/bare-metal/microcontrollers/other-projects.md:26 src/exercises/bare-metal/morning.md:11 +#: src/bare-metal/aps.md:15 src/bare-metal/aps/inline-assembly.md:58 src/bare-metal/aps/mmio.md:17 #: src/bare-metal/aps/uart/traits.md:27 src/bare-metal/aps/better-uart.md:28 -#: src/bare-metal/aps/better-uart/bitflags.md:40 -#: src/bare-metal/aps/better-uart/registers.md:46 -#: src/bare-metal/aps/better-uart/driver.md:67 -#: src/bare-metal/aps/better-uart/using.md:55 src/bare-metal/aps/logging.md:52 -#: src/bare-metal/aps/logging/using.md:49 -#: src/bare-metal/useful-crates/zerocopy.md:53 -#: src/bare-metal/useful-crates/aarch64-paging.md:33 +#: src/bare-metal/aps/better-uart/bitflags.md:40 src/bare-metal/aps/better-uart/registers.md:46 +#: src/bare-metal/aps/better-uart/driver.md:67 src/bare-metal/aps/better-uart/using.md:55 +#: src/bare-metal/aps/logging.md:52 src/bare-metal/aps/logging/using.md:49 +#: src/bare-metal/useful-crates/zerocopy.md:53 src/bare-metal/useful-crates/aarch64-paging.md:33 #: src/bare-metal/useful-crates/buddy_system_allocator.md:30 -#: src/bare-metal/useful-crates/tinyvec.md:26 -#: src/bare-metal/useful-crates/spin.md:30 src/bare-metal/android/vmbase.md:25 -#: src/exercises/bare-metal/afternoon.md:11 src/concurrency/threads.md:45 -#: src/concurrency/scoped-threads.md:40 src/concurrency/channels.md:32 +#: src/bare-metal/useful-crates/tinyvec.md:26 src/bare-metal/useful-crates/spin.md:30 +#: src/bare-metal/android/vmbase.md:25 src/exercises/bare-metal/afternoon.md:11 +#: src/concurrency/threads.md:45 src/concurrency/scoped-threads.md:40 src/concurrency/channels.md:32 #: src/concurrency/send-sync.md:23 src/concurrency/send-sync/send.md:16 #: src/concurrency/send-sync/sync.md:18 src/concurrency/shared_state/arc.md:38 -#: src/concurrency/shared_state/mutex.md:45 -#: src/concurrency/shared_state/example.md:56 -#: src/exercises/concurrency/morning.md:16 src/async/async-await.md:48 -#: src/async/futures.md:45 src/async/runtimes.md:29 -#: src/async/runtimes/tokio.md:49 src/async/tasks.md:64 -#: src/async/channels.md:49 src/async/control-flow/join.md:50 -#: src/async/control-flow/select.md:77 +#: src/concurrency/shared_state/mutex.md:45 src/concurrency/shared_state/example.md:56 +#: src/exercises/concurrency/morning.md:16 src/async/async-await.md:48 src/async/futures.md:45 +#: src/async/runtimes.md:29 src/async/runtimes/tokio.md:49 src/async/tasks.md:64 +#: src/async/channels.md:49 src/async/control-flow/join.md:50 src/async/control-flow/select.md:77 #: src/async/pitfalls/blocking-executor.md:50 src/async/pitfalls/pin.md:112 -#: src/async/pitfalls/async-traits.md:63 -#: src/exercises/concurrency/afternoon.md:17 +#: src/async/pitfalls/async-traits.md:63 src/exercises/concurrency/afternoon.md:17 #: src/exercises/concurrency/dining-philosophers-async.md:79 msgid "" msgstr "" @@ -1342,8 +1271,7 @@ msgstr "" #: src/running-the-course.md:5 msgid "" -"Here is a bit of background information about how we've been running the " -"course\n" +"Here is a bit of background information about how we've been running the course\n" "internally at Google." msgstr "" @@ -1353,61 +1281,45 @@ msgstr "" #: src/running-the-course.md:10 msgid "" -"1. Make yourself familiar with the course material. We've included speaker " -"notes\n" -" to help highlight the key points (please help us by contributing more " -"speaker\n" -" notes!). When presenting, you should make sure to open the speaker notes " -"in a\n" -" popup (click the link with a little arrow next to \"Speaker Notes\"). " -"This way\n" +"1. Make yourself familiar with the course material. We've included speaker notes\n" +" to help highlight the key points (please help us by contributing more speaker\n" +" notes!). When presenting, you should make sure to open the speaker notes in a\n" +" popup (click the link with a little arrow next to \"Speaker Notes\"). This way\n" " you have a clean screen to present to the class.\n" "\n" -"1. Decide on the dates. Since the course takes at least three full days, we " -"recommend that you\n" +"1. Decide on the dates. Since the course takes at least three full days, we recommend that you\n" " schedule the days over two weeks. Course participants have said that\n" -" they find it helpful to have a gap in the course since it helps them " -"process\n" +" they find it helpful to have a gap in the course since it helps them process\n" " all the information we give them.\n" "\n" "1. Find a room large enough for your in-person participants. We recommend a\n" -" class size of 15-25 people. That's small enough that people are " -"comfortable\n" -" asking questions --- it's also small enough that one instructor will " -"have\n" -" time to answer the questions. Make sure the room has _desks_ for yourself " -"and for the\n" -" students: you will all need to be able to sit and work with your " -"laptops.\n" -" In particular, you will be doing a lot of live-coding as an instructor, " -"so a lectern won't\n" +" class size of 15-25 people. That's small enough that people are comfortable\n" +" asking questions --- it's also small enough that one instructor will have\n" +" time to answer the questions. Make sure the room has _desks_ for yourself and for the\n" +" students: you will all need to be able to sit and work with your laptops.\n" +" In particular, you will be doing a lot of live-coding as an instructor, so a lectern won't\n" " be very helpful for you.\n" "\n" -"1. On the day of your course, show up to the room a little early to set " -"things\n" -" up. We recommend presenting directly using `mdbook serve` running on " -"your\n" -" laptop (see the [installation instructions][3]). This ensures optimal " -"performance with no lag as you change pages.\n" +"1. On the day of your course, show up to the room a little early to set things\n" +" up. We recommend presenting directly using `mdbook serve` running on your\n" +" laptop (see the [installation instructions][3]). This ensures optimal performance with no lag " +"as you change pages.\n" " Using your laptop will also allow you to fix typos as you or the course\n" " participants spot them.\n" "\n" "1. Let people solve the exercises by themselves or in small groups.\n" -" We typically spend 30-45 minutes on exercises in the morning and in the " -"afternoon (including time to review the solutions).\n" +" We typically spend 30-45 minutes on exercises in the morning and in the afternoon (including " +"time to review the solutions).\n" " Make sure to\n" -" ask people if they're stuck or if there is anything you can help with. " -"When\n" -" you see that several people have the same problem, call it out to the " -"class\n" +" ask people if they're stuck or if there is anything you can help with. When\n" +" you see that several people have the same problem, call it out to the class\n" " and offer a solution, e.g., by showing people where to find the relevant\n" " information in the standard library." msgstr "" #: src/running-the-course.md:43 msgid "" -"That is all, good luck running the course! We hope it will be as much fun " -"for\n" +"That is all, good luck running the course! We hope it will be as much fun for\n" "you as it has been for us!" msgstr "" @@ -1449,29 +1361,23 @@ msgstr "" #: src/running-the-course/course-structure.md:18 msgid "" -"The [Android Deep Dive](../android.md) is a half-day course on using Rust " -"for\n" -"Android platform development. This includes interoperability wtih C, C++, " -"and\n" +"The [Android Deep Dive](../android.md) is a half-day course on using Rust for\n" +"Android platform development. This includes interoperability wtih C, C++, and\n" "Java." msgstr "" #: src/running-the-course/course-structure.md:22 msgid "" "You will need an [AOSP checkout][1]. Make a checkout of the [course\n" -"repository][2] on the same machine and move the `src/android/` directory " -"into\n" -"the root of your AOSP checkout. This will ensure that the Android build " -"system\n" +"repository][2] on the same machine and move the `src/android/` directory into\n" +"the root of your AOSP checkout. This will ensure that the Android build system\n" "sees the `Android.bp` files in `src/android/`." msgstr "" #: src/running-the-course/course-structure.md:27 msgid "" -"Ensure that `adb sync` works with your emulator or real device and pre-build " -"all\n" -"Android examples using `src/android/build_all.sh`. Read the script to see " -"the\n" +"Ensure that `adb sync` works with your emulator or real device and pre-build all\n" +"Android examples using `src/android/build_all.sh`. Read the script to see the\n" "commands it runs and make sure they work when you run them by hand." msgstr "" @@ -1481,8 +1387,7 @@ msgstr "" #: src/running-the-course/course-structure.md:36 msgid "" -"The [Bare-Metal Deep Dive](../bare-metal.md): a full day class on using Rust " -"for\n" +"The [Bare-Metal Deep Dive](../bare-metal.md): a full day class on using Rust for\n" "bare-metal (embedded) development. Both microcontrollers and application\n" "processors are covered." msgstr "" @@ -1490,8 +1395,7 @@ msgstr "" #: src/running-the-course/course-structure.md:40 msgid "" "For the microcontroller part, you will need to buy the [BBC\n" -"micro:bit](https://microbit.org/) v2 development board ahead of time. " -"Everybody\n" +"micro:bit](https://microbit.org/) v2 development board ahead of time. Everybody\n" "will need to install a number of packages as described on the [welcome\n" "page](../bare-metal.md)." msgstr "" @@ -1502,17 +1406,14 @@ msgstr "" #: src/running-the-course/course-structure.md:47 msgid "" -"The [Concurrency Deep Dive](../concurrency.md) is a full day class on " -"classical\n" +"The [Concurrency Deep Dive](../concurrency.md) is a full day class on classical\n" "as well as `async`/`await` concurrency." msgstr "" #: src/running-the-course/course-structure.md:50 msgid "" -"You will need a fresh crate set up and the dependencies downloaded and ready " -"to\n" -"go. You can then copy/paste the examples into `src/main.rs` to experiment " -"with\n" +"You will need a fresh crate set up and the dependencies downloaded and ready to\n" +"go. You can then copy/paste the examples into `src/main.rs` to experiment with\n" "them:" msgstr "" @@ -1569,14 +1470,12 @@ msgid "" msgstr "" #: src/running-the-course/translations.md:9 -msgid "" -"Use the language picker in the top-right corner to switch between languages." +msgid "Use the language picker in the top-right corner to switch between languages." msgstr "" #: src/running-the-course/translations.md:11 msgid "" -"If you want to help with this effort, please see [our instructions] for how " -"to\n" +"If you want to help with this effort, please see [our instructions] for how to\n" "get going. Translations are coordinated on the [issue tracker]." msgstr "" @@ -1586,12 +1485,10 @@ msgstr "" #: src/cargo.md:3 msgid "" -"When you start reading about Rust, you will soon meet [Cargo](https://doc." -"rust-lang.org/cargo/), the standard tool\n" -"used in the Rust ecosystem to build and run Rust applications. Here we want " -"to\n" -"give a brief overview of what Cargo is and how it fits into the wider " -"ecosystem\n" +"When you start reading about Rust, you will soon meet [Cargo](https://doc.rust-lang.org/cargo/), " +"the standard tool\n" +"used in the Rust ecosystem to build and run Rust applications. Here we want to\n" +"give a brief overview of what Cargo is and how it fits into the wider ecosystem\n" "and how it fits into this training." msgstr "" @@ -1605,16 +1502,14 @@ msgstr "" #: src/cargo.md:12 msgid "" -"You can follow the instructions to install cargo and rust compiler, among " -"other standard ecosystem tools with the [rustup][3] tool, which is " -"maintained by the Rust Foundation." +"You can follow the instructions to install cargo and rust compiler, among other standard ecosystem " +"tools with the [rustup][3] tool, which is maintained by the Rust Foundation." msgstr "" #: src/cargo.md:14 msgid "" -"Along with cargo and rustc, Rustup will install itself as a command line " -"utility that you can use to install/switch toolchains, setup cross " -"compilation, etc." +"Along with cargo and rustc, Rustup will install itself as a command line utility that you can use " +"to install/switch toolchains, setup cross compilation, etc." msgstr "" #: src/cargo.md:16 @@ -1626,9 +1521,7 @@ msgid "#### Debian" msgstr "" #: src/cargo.md:20 -msgid "" -"On Debian/Ubuntu, you can install Cargo, the Rust source and the [Rust " -"formatter][6] with" +msgid "On Debian/Ubuntu, you can install Cargo, the Rust source and the [Rust formatter][6] with" msgstr "" #: src/cargo.md:22 @@ -1640,17 +1533,15 @@ msgstr "" #: src/cargo.md:26 msgid "" -"This will allow [rust-analyzer][1] to jump to the definitions. We suggest " -"using\n" +"This will allow [rust-analyzer][1] to jump to the definitions. We suggest using\n" "[VS Code][2] to edit the code (but any LSP compatible editor works)." msgstr "" #: src/cargo.md:29 msgid "" -"Some folks also like to use the [JetBrains][4] family of IDEs, which do " -"their own analysis but have their own tradeoffs. If you prefer them, you can " -"install the [Rust Plugin][5]. Please take note that as of January 2023 " -"debugging only works on the CLion version of the JetBrains IDEA suite." +"Some folks also like to use the [JetBrains][4] family of IDEs, which do their own analysis but " +"have their own tradeoffs. If you prefer them, you can install the [Rust Plugin][5]. Please take " +"note that as of January 2023 debugging only works on the CLion version of the JetBrains IDEA suite." msgstr "" #: src/cargo/rust-ecosystem.md:1 @@ -1658,38 +1549,30 @@ msgid "# The Rust Ecosystem" msgstr "" #: src/cargo/rust-ecosystem.md:3 -msgid "" -"The Rust ecosystem consists of a number of tools, of which the main ones are:" +msgid "The Rust ecosystem consists of a number of tools, of which the main ones are:" msgstr "" #: src/cargo/rust-ecosystem.md:5 msgid "" -"* `rustc`: the Rust compiler which turns `.rs` files into binaries and " -"other\n" +"* `rustc`: the Rust compiler which turns `.rs` files into binaries and other\n" " intermediate formats.\n" "\n" "* `cargo`: the Rust dependency manager and build tool. Cargo knows how to\n" -" download dependencies hosted on and it will pass them " -"to\n" +" download dependencies hosted on and it will pass them to\n" " `rustc` when building your project. Cargo also comes with a built-in test\n" " runner which is used to execute unit tests.\n" "\n" "* `rustup`: the Rust toolchain installer and updater. This tool is used to\n" -" install and update `rustc` and `cargo` when new versions of Rust is " -"released.\n" +" install and update `rustc` and `cargo` when new versions of Rust is released.\n" " In addition, `rustup` can also download documentation for the standard\n" -" library. You can have multiple versions of Rust installed at once and " -"`rustup`\n" +" library. You can have multiple versions of Rust installed at once and `rustup`\n" " will let you switch between them as needed." msgstr "" -#: src/cargo/rust-ecosystem.md:21 src/hello-world.md:25 -#: src/hello-world/small-example.md:27 src/why-rust/runtime.md:10 -#: src/why-rust/modern.md:21 src/basic-syntax/compound-types.md:30 -#: src/basic-syntax/references.md:23 -#: src/pattern-matching/destructuring-enums.md:35 -#: src/error-handling/try-operator.md:48 -#: src/error-handling/converting-error-types-example.md:50 +#: src/cargo/rust-ecosystem.md:21 src/hello-world.md:25 src/hello-world/small-example.md:27 +#: src/why-rust/runtime.md:10 src/why-rust/modern.md:21 src/basic-syntax/compound-types.md:30 +#: src/basic-syntax/references.md:23 src/pattern-matching/destructuring-enums.md:35 +#: src/error-handling/try-operator.md:48 src/error-handling/converting-error-types-example.md:50 #: src/concurrency/threads.md:30 src/async/async-await.md:25 msgid "Key points:" msgstr "" @@ -1717,19 +1600,17 @@ msgid "" " * To avoid splitting the ecosystem, Rust compilers can mix code\n" " written for different editions.\n" "\n" -" * Mention that it is quite rare to ever use the compiler directly not " -"through `cargo` (most users never do).\n" +" * Mention that it is quite rare to ever use the compiler directly not through `cargo` (most " +"users never do).\n" "\n" -" * It might be worth alluding that Cargo itself is an extremely powerful " -"and comprehensive tool. It is capable of many advanced features including " -"but not limited to: \n" +" * It might be worth alluding that Cargo itself is an extremely powerful and comprehensive tool. " +"It is capable of many advanced features including but not limited to: \n" " * Project/package structure\n" " * [workspaces]\n" " * Dev Dependencies and Runtime Dependency management/caching\n" " * [build scripting]\n" " * [global installation]\n" -" * It is also extensible with sub command plugins as well (such as " -"[cargo clippy]).\n" +" * It is also extensible with sub command plugins as well (such as [cargo clippy]).\n" " * Read more from the [official Cargo Book]" msgstr "" @@ -1739,19 +1620,15 @@ msgstr "" #: src/cargo/code-samples.md:3 msgid "" -"For this training, we will mostly explore the Rust language through " -"examples\n" -"which can be executed through your browser. This makes the setup much easier " -"and\n" +"For this training, we will mostly explore the Rust language through examples\n" +"which can be executed through your browser. This makes the setup much easier and\n" "ensures a consistent experience for everyone." msgstr "" #: src/cargo/code-samples.md:7 msgid "" -"Installing Cargo is still encouraged: it will make it easier for you to do " -"the\n" -"exercises. On the last day, we will do a larger exercise which shows you how " -"to\n" +"Installing Cargo is still encouraged: it will make it easier for you to do the\n" +"exercises. On the last day, we will do a larger exercise which shows you how to\n" "work with dependencies and for that you need Cargo." msgstr "" @@ -1770,8 +1647,7 @@ msgstr "" #: src/cargo/code-samples.md:19 msgid "" -"You can use Ctrl + Enter to execute the code when focus is in " -"the\n" +"You can use Ctrl + Enter to execute the code when focus is in the\n" "text box." msgstr "" @@ -1798,11 +1674,9 @@ msgstr "" #: src/cargo/running-locally.md:3 msgid "" -"If you want to experiment with the code on your own system, then you will " -"need\n" +"If you want to experiment with the code on your own system, then you will need\n" "to first install Rust. Do this by following the [instructions in the Rust\n" -"Book][1]. This should give you a working `rustc` and `cargo`. At the time " -"of\n" +"Book][1]. This should give you a working `rustc` and `cargo`. At the time of\n" "writing, the latest stable Rust release has these version numbers:" msgstr "" @@ -1818,8 +1692,7 @@ msgstr "" #: src/cargo/running-locally.md:15 msgid "" -"With this is in place, then follow these steps to build a Rust binary from " -"one\n" +"With this is in place, then follow these steps to build a Rust binary from one\n" "of the examples in this training:" msgstr "" @@ -1827,16 +1700,14 @@ msgstr "" msgid "" "1. Click the \"Copy to clipboard\" button on the example you want to copy.\n" "\n" -"2. Use `cargo new exercise` to create a new `exercise/` directory for your " -"code:\n" +"2. Use `cargo new exercise` to create a new `exercise/` directory for your code:\n" "\n" " ```shell\n" " $ cargo new exercise\n" " Created binary (application) `exercise` package\n" " ```\n" "\n" -"3. Navigate into `exercise/` and use `cargo run` to build and run your " -"binary:\n" +"3. Navigate into `exercise/` and use `cargo run` to build and run your binary:\n" "\n" " ```shell\n" " $ cd exercise\n" @@ -1848,8 +1719,7 @@ msgid "" " ```\n" "\n" "4. Replace the boiler-plate code in `src/main.rs` with your own code. For\n" -" example, using the example on the previous page, make `src/main.rs` look " -"like\n" +" example, using the example on the previous page, make `src/main.rs` look like\n" "\n" " ```rust\n" " fn main() {\n" @@ -1867,16 +1737,12 @@ msgid "" " Edit me!\n" " ```\n" "\n" -"6. Use `cargo check` to quickly check your project for errors, use `cargo " -"build`\n" -" to compile it without running it. You will find the output in `target/" -"debug/`\n" -" for a normal debug build. Use `cargo build --release` to produce an " -"optimized\n" +"6. Use `cargo check` to quickly check your project for errors, use `cargo build`\n" +" to compile it without running it. You will find the output in `target/debug/`\n" +" for a normal debug build. Use `cargo build --release` to produce an optimized\n" " release build in `target/release/`.\n" "\n" -"7. You can add dependencies for your project by editing `Cargo.toml`. When " -"you\n" +"7. You can add dependencies for your project by editing `Cargo.toml`. When you\n" " run `cargo` commands, it will automatically download and compile missing\n" " dependencies for you." msgstr "" @@ -1903,8 +1769,7 @@ msgid "" "* Basic Rust syntax: variables, scalar and compound types, enums, structs,\n" " references, functions, and methods.\n" "\n" -"* Memory management: stack vs heap, manual memory management, scope-based " -"memory\n" +"* Memory management: stack vs heap, manual memory management, scope-based memory\n" " management, and garbage collection.\n" "\n" "* Ownership: move semantics, copying and cloning, borrowing, and lifetimes." @@ -1917,29 +1782,21 @@ msgstr "" #: src/welcome-day-1.md:18 msgid "" "* They should ask questions when they get them, don't save them to the end.\n" -"* The class is meant to be interactive and discussions are very much " -"encouraged!\n" -" * As an instructor, you should try to keep the discussions relevant, i." -"e.,\n" -" keep the related to how Rust does things vs some other language. It can " -"be\n" -" hard to find the right balance, but err on the side of allowing " -"discussions\n" +"* The class is meant to be interactive and discussions are very much encouraged!\n" +" * As an instructor, you should try to keep the discussions relevant, i.e.,\n" +" keep the related to how Rust does things vs some other language. It can be\n" +" hard to find the right balance, but err on the side of allowing discussions\n" " since they engage people much more than one-way communication.\n" -"* The questions will likely mean that we talk about things ahead of the " -"slides.\n" -" * This is perfectly okay! Repetition is an important part of learning. " -"Remember\n" +"* The questions will likely mean that we talk about things ahead of the slides.\n" +" * This is perfectly okay! Repetition is an important part of learning. Remember\n" " that the slides are just a support and you are free to skip them as you\n" " like." msgstr "" #: src/welcome-day-1.md:29 msgid "" -"The idea for the first day is to show _just enough_ of Rust to be able to " -"speak\n" -"about the famous borrow checker. The way Rust handles memory is a major " -"feature\n" +"The idea for the first day is to show _just enough_ of Rust to be able to speak\n" +"about the famous borrow checker. The way Rust handles memory is a major feature\n" "and we should show students this right away." msgstr "" @@ -1957,8 +1814,7 @@ msgstr "" #: src/welcome-day-1.md:39 msgid "" -"You can of course adjust this as necessary. Please make sure to include " -"breaks,\n" +"You can of course adjust this as necessary. Please make sure to include breaks,\n" "we recommend a break every hour!" msgstr "" @@ -1967,8 +1823,7 @@ msgid "# What is Rust?" msgstr "" #: src/welcome-day-1/what-is-rust.md:3 -msgid "" -"Rust is a new programming language which had its [1.0 release in 2015][1]:" +msgid "Rust is a new programming language which had its [1.0 release in 2015][1]:" msgstr "" #: src/welcome-day-1/what-is-rust.md:5 @@ -1976,8 +1831,7 @@ msgid "" "* Rust is a statically compiled language in a similar role as C++\n" " * `rustc` uses LLVM as its backend.\n" "* Rust supports many [platforms and\n" -" architectures](https://doc.rust-lang.org/nightly/rustc/platform-support." -"html):\n" +" architectures](https://doc.rust-lang.org/nightly/rustc/platform-support.html):\n" " * x86, ARM, WebAssembly, ...\n" " * Linux, Mac, Windows, ...\n" "* Rust is used for a wide range of devices:\n" @@ -2035,10 +1889,8 @@ msgstr "" #: src/hello-world.md:22 msgid "" -"This slide tries to make the students comfortable with Rust code. They will " -"see\n" -"a ton of it over the next four days so we start small with something " -"familiar." +"This slide tries to make the students comfortable with Rust code. They will see\n" +"a ton of it over the next four days so we start small with something familiar." msgstr "" #: src/hello-world.md:27 @@ -2049,16 +1901,12 @@ msgid "" "\n" "* Rust is modern with full support for things like Unicode.\n" "\n" -"* Rust uses macros for situations where you want to have a variable number " -"of\n" -" arguments (no function [overloading](basic-syntax/functions-interlude." -"md)).\n" +"* Rust uses macros for situations where you want to have a variable number of\n" +" arguments (no function [overloading](basic-syntax/functions-interlude.md)).\n" "\n" -"* Macros being 'hygienic' means they don't accidentally capture identifiers " -"from\n" +"* Macros being 'hygienic' means they don't accidentally capture identifiers from\n" " the scope they are used in. Rust macros are actually only\n" -" [partially hygenic](https://veykril.github.io/tlborm/decl-macros/minutiae/" -"hygiene.html)." +" [partially hygenic](https://veykril.github.io/tlborm/decl-macros/minutiae/hygiene.html)." msgstr "" #: src/hello-world/small-example.md:1 @@ -2090,33 +1938,26 @@ msgstr "" #: src/hello-world/small-example.md:23 msgid "" -"The code implements the Collatz conjecture: it is believed that the loop " -"will\n" -"always end, but this is not yet proved. Edit the code and play with " -"different\n" +"The code implements the Collatz conjecture: it is believed that the loop will\n" +"always end, but this is not yet proved. Edit the code and play with different\n" "inputs." msgstr "" #: src/hello-world/small-example.md:29 msgid "" -"* Explain that all variables are statically typed. Try removing `i32` to " -"trigger\n" -" type inference. Try with `i8` instead and trigger a runtime integer " -"overflow.\n" +"* Explain that all variables are statically typed. Try removing `i32` to trigger\n" +" type inference. Try with `i8` instead and trigger a runtime integer overflow.\n" "\n" "* Change `let mut x` to `let x`, discuss the compiler error.\n" "\n" -"* Show how `print!` gives a compilation error if the arguments don't match " -"the\n" +"* Show how `print!` gives a compilation error if the arguments don't match the\n" " format string.\n" "\n" "* Show how you need to use `{}` as a placeholder if you want to print an\n" " expression which is more complex than just a single variable.\n" "\n" -"* Show the students the standard library, show them how to search for `std::" -"fmt`\n" -" which has the rules of the formatting mini-language. It's important that " -"the\n" +"* Show the students the standard library, show them how to search for `std::fmt`\n" +" which has the rules of the formatting mini-language. It's important that the\n" " students become familiar with searching in the standard library." msgstr "" @@ -2137,27 +1978,20 @@ msgstr "" #: src/why-rust.md:11 msgid "" -"Make sure to ask the class which languages they have experience with. " -"Depending\n" +"Make sure to ask the class which languages they have experience with. Depending\n" "on the answer you can highlight different features of Rust:" msgstr "" #: src/why-rust.md:14 msgid "" -"* Experience with C or C++: Rust eliminates a whole class of _runtime " -"errors_\n" -" via the borrow checker. You get performance like in C and C++, but you " -"don't\n" -" have the memory unsafety issues. In addition, you get a modern language " -"with\n" +"* Experience with C or C++: Rust eliminates a whole class of _runtime errors_\n" +" via the borrow checker. You get performance like in C and C++, but you don't\n" +" have the memory unsafety issues. In addition, you get a modern language with\n" " constructs like pattern matching and built-in dependency management.\n" "\n" -"* Experience with Java, Go, Python, JavaScript...: You get the same memory " -"safety\n" -" as in those languages, plus a similar high-level language feeling. In " -"addition\n" -" you get fast and predictable performance like C and C++ (no garbage " -"collector)\n" +"* Experience with Java, Go, Python, JavaScript...: You get the same memory safety\n" +" as in those languages, plus a similar high-level language feeling. In addition\n" +" you get fast and predictable performance like C and C++ (no garbage collector)\n" " as well as access to low-level hardware (should you need it)" msgstr "" @@ -2266,49 +2100,39 @@ msgstr "" #: src/why-rust/modern.md:23 msgid "" -"* Zero-cost abstractions, similar to C++, means that you don't have to " -"'pay'\n" +"* Zero-cost abstractions, similar to C++, means that you don't have to 'pay'\n" " for higher-level programming constructs with memory or CPU. For example,\n" " writing a loop using `for` should result in roughly the same low level\n" " instructions as using the `.iter().fold()` construct.\n" "\n" -"* It may be worth mentioning that Rust enums are 'Algebraic Data Types', " -"also\n" +"* It may be worth mentioning that Rust enums are 'Algebraic Data Types', also\n" " known as 'sum types', which allow the type system to express things like\n" " `Option` and `Result`.\n" "\n" "* Remind people to read the errors --- many developers have gotten used to\n" " ignore lengthy compiler output. The Rust compiler is significantly more\n" -" talkative than other compilers. It will often provide you with " -"_actionable_\n" +" talkative than other compilers. It will often provide you with _actionable_\n" " feedback, ready to copy-paste into your code.\n" "\n" -"* The Rust standard library is small compared to languages like Java, " -"Python,\n" -" and Go. Rust does not come with several things you might consider standard " -"and\n" +"* The Rust standard library is small compared to languages like Java, Python,\n" +" and Go. Rust does not come with several things you might consider standard and\n" " essential:\n" "\n" " * a random number generator, but see [rand].\n" " * support for SSL or TLS, but see [rusttls].\n" " * support for JSON, but see [serde_json].\n" "\n" -" The reasoning behind this is that functionality in the standard library " -"cannot\n" +" The reasoning behind this is that functionality in the standard library cannot\n" " go away, so it has to be very stable. For the examples above, the Rust\n" -" community is still working on finding the best solution --- and perhaps " -"there\n" +" community is still working on finding the best solution --- and perhaps there\n" " isn't a single \"best solution\" for some of these things.\n" "\n" -" Rust comes with a built-in package manager in the form of Cargo and this " -"makes\n" -" it trivial to download and compile third-party crates. A consequence of " -"this\n" +" Rust comes with a built-in package manager in the form of Cargo and this makes\n" +" it trivial to download and compile third-party crates. A consequence of this\n" " is that the standard library can be smaller.\n" "\n" " Discovering good third-party crates can be a problem. Sites like\n" -" help with this by letting you compare health metrics " -"for\n" +" help with this by letting you compare health metrics for\n" " crates to find a good and trusted one.\n" " \n" "* [rust-analyzer] is a well supported LSP implementation used in major\n" @@ -2326,8 +2150,7 @@ msgstr "" #: src/basic-syntax.md:5 msgid "" "* Blocks and scopes are delimited by curly braces.\n" -"* Line comments are started with `//`, block comments are delimited by `/" -"* ...\n" +"* Line comments are started with `//`, block comments are delimited by `/* ...\n" " */`.\n" "* Keywords like `if` and `while` work the same.\n" "* Variable assignment is done with `=`, comparison is done with `==`." @@ -2342,18 +2165,18 @@ msgid "" "| | Types | " "Literals |\n" "|------------------------|--------------------------------------------|-------------------------------|\n" -"| Signed integers | `i8`, `i16`, `i32`, `i64`, `i128`, `isize` | " -"`-10`, `0`, `1_000`, `123i64` |\n" -"| Unsigned integers | `u8`, `u16`, `u32`, `u64`, `u128`, `usize` | `0`, " -"`123`, `10u16` |\n" -"| Floating point numbers | `f32`, `f64` | " -"`3.14`, `-10.0e20`, `2f32` |\n" -"| Strings | `&str` | " -"`\"foo\"`, `\"two\\nlines\"` |\n" -"| Unicode scalar values | `char` | " -"`'a'`, `'α'`, `'∞'` |\n" -"| Booleans | `bool` | " -"`true`, `false` |" +"| Signed integers | `i8`, `i16`, `i32`, `i64`, `i128`, `isize` | `-10`, `0`, `1_000`, " +"`123i64` |\n" +"| Unsigned integers | `u8`, `u16`, `u32`, `u64`, `u128`, `usize` | `0`, `123`, " +"`10u16` |\n" +"| Floating point numbers | `f32`, `f64` | `3.14`, `-10.0e20`, " +"`2f32` |\n" +"| Strings | `&str` | `\"foo\"`, " +"`\"two\\nlines\"` |\n" +"| Unicode scalar values | `char` | `'a'`, `'α'`, " +"`'∞'` |\n" +"| Booleans | `bool` | `true`, " +"`false` |" msgstr "" #: src/basic-syntax/scalar-types.md:12 @@ -2374,10 +2197,8 @@ msgstr "" #: src/basic-syntax/scalar-types.md:23 msgid "" -"- Raw strings allow you to create a `&str` value with escapes disabled: " -"`r\"\\n\"\n" -" == \"\\\\\\\\n\"`. You can embed double-quotes by using an equal amount of " -"`#` on\n" +"- Raw strings allow you to create a `&str` value with escapes disabled: `r\"\\n\"\n" +" == \"\\\\\\\\n\"`. You can embed double-quotes by using an equal amount of `#` on\n" " either side of the quotes:\n" "\n" " ```rust,editable\n" @@ -2403,13 +2224,10 @@ msgstr "" #: src/basic-syntax/compound-types.md:3 msgid "" -"| | Types | Literals " -"|\n" +"| | Types | Literals |\n" "|--------|-------------------------------|-----------------------------------|\n" -"| Arrays | `[T; N]` | `[20, 30, 40]`, `[0; 3]` " -"|\n" -"| Tuples | `()`, `(T,)`, `(T1, T2)`, ... | `()`, `('x',)`, `('x', 1.2)`, ... " -"|" +"| Arrays | `[T; N]` | `[20, 30, 40]`, `[0; 3]` |\n" +"| Tuples | `()`, `(T,)`, `(T1, T2)`, ... | `()`, `('x',)`, `('x', 1.2)`, ... |" msgstr "" #: src/basic-syntax/compound-types.md:8 @@ -2448,24 +2266,18 @@ msgstr "" #: src/basic-syntax/compound-types.md:34 msgid "" -"* Arrays have elements of the same type, `T`, and length, `N`, which is a " -"compile-time constant.\n" -" Note that the length of the array is *part of its type*, which means that " -"`[u8; 3]` and\n" +"* Arrays have elements of the same type, `T`, and length, `N`, which is a compile-time constant.\n" +" Note that the length of the array is *part of its type*, which means that `[u8; 3]` and\n" " `[u8; 4]` are considered two different types.\n" "\n" "* We can use literals to assign values to arrays.\n" "\n" -"* In the main function, the print statement asks for the debug " -"implementation with the `?` format\n" -" parameter: `{}` gives the default output, `{:?}` gives the debug output. " -"We\n" -" could also have used `{a}` and `{a:?}` without specifying the value after " -"the\n" +"* In the main function, the print statement asks for the debug implementation with the `?` format\n" +" parameter: `{}` gives the default output, `{:?}` gives the debug output. We\n" +" could also have used `{a}` and `{a:?}` without specifying the value after the\n" " format string.\n" "\n" -"* Adding `#`, eg `{a:#?}`, invokes a \"pretty printing\" format, which can " -"be easier to read." +"* Adding `#`, eg `{a:#?}`, invokes a \"pretty printing\" format, which can be easier to read." msgstr "" #: src/basic-syntax/compound-types.md:47 @@ -2478,15 +2290,11 @@ msgid "" "\n" "* Tuples group together values of different types into a compound type.\n" "\n" -"* Fields of a tuple can be accessed by the period and the index of the " -"value, e.g. `t.0`, `t.1`.\n" +"* Fields of a tuple can be accessed by the period and the index of the value, e.g. `t.0`, `t.1`.\n" "\n" -"* The empty tuple `()` is also known as the \"unit type\". It is both a " -"type, and\n" -" the only valid value of that type - that is to say both the type and its " -"value\n" -" are expressed as `()`. It is used to indicate, for example, that a " -"function or\n" +"* The empty tuple `()` is also known as the \"unit type\". It is both a type, and\n" +" the only valid value of that type - that is to say both the type and its value\n" +" are expressed as `()`. It is used to indicate, for example, that a function or\n" " expression has no return value, as we'll see in a future slide. \n" " * You can think of it as `void` that can be familiar to you from other \n" " programming languages." @@ -2518,22 +2326,17 @@ msgstr "" #: src/basic-syntax/references.md:16 msgid "" -"* We must dereference `ref_x` when assigning to it, similar to C and C++ " -"pointers.\n" +"* We must dereference `ref_x` when assigning to it, similar to C and C++ pointers.\n" "* Rust will auto-dereference in some cases, in particular when invoking\n" " methods (try `ref_x.count_ones()`).\n" -"* References that are declared as `mut` can be bound to different values " -"over their lifetime." +"* References that are declared as `mut` can be bound to different values over their lifetime." msgstr "" #: src/basic-syntax/references.md:25 msgid "" -"* Be sure to note the difference between `let mut ref_x: &i32` and `let " -"ref_x:\n" -" &mut i32`. The first one represents a mutable reference which can be bound " -"to\n" -" different values, while the second represents a reference to a mutable " -"value." +"* Be sure to note the difference between `let mut ref_x: &i32` and `let ref_x:\n" +" &mut i32`. The first one represents a mutable reference which can be bound to\n" +" different values, while the second represents a reference to a mutable value." msgstr "" #: src/basic-syntax/references-dangling.md:1 @@ -2595,30 +2398,25 @@ msgstr "" #: src/basic-syntax/slices.md:20 msgid "" -"* We create a slice by borrowing `a` and specifying the starting and ending " -"indexes in brackets.\n" +"* We create a slice by borrowing `a` and specifying the starting and ending indexes in brackets.\n" "\n" -"* If the slice starts at index 0, Rust’s range syntax allows us to drop the " -"starting index, meaning that `&a[0..a.len()]` and `&a[..a.len()]` are " -"identical.\n" +"* If the slice starts at index 0, Rust’s range syntax allows us to drop the starting index, " +"meaning that `&a[0..a.len()]` and `&a[..a.len()]` are identical.\n" " \n" -"* The same is true for the last index, so `&a[2..a.len()]` and `&a[2..]` are " -"identical.\n" +"* The same is true for the last index, so `&a[2..a.len()]` and `&a[2..]` are identical.\n" "\n" -"* To easily create a slice of the full array, we can therefore use " -"`&a[..]`.\n" +"* To easily create a slice of the full array, we can therefore use `&a[..]`.\n" "\n" -"* `s` is a reference to a slice of `i32`s. Notice that the type of `s` " -"(`&[i32]`) no longer mentions the array length. This allows us to perform " -"computation on slices of different sizes.\n" +"* `s` is a reference to a slice of `i32`s. Notice that the type of `s` (`&[i32]`) no longer " +"mentions the array length. This allows us to perform computation on slices of different sizes.\n" " \n" -"* Slices always borrow from another object. In this example, `a` has to " -"remain 'alive' (in scope) for at least as long as our slice. \n" +"* Slices always borrow from another object. In this example, `a` has to remain 'alive' (in scope) " +"for at least as long as our slice. \n" " \n" -"* The question about modifying `a[3]` can spark an interesting discussion, " -"but the answer is that for memory safety reasons\n" -" you cannot do it through `a` after you created a slice, but you can read " -"the data from both `a` and `s` safely. \n" +"* The question about modifying `a[3]` can spark an interesting discussion, but the answer is that " +"for memory safety reasons\n" +" you cannot do it through `a` after you created a slice, but you can read the data from both `a` " +"and `s` safely. \n" " More details will be explained in the borrow checker section." msgstr "" @@ -2660,32 +2458,25 @@ msgstr "" #: src/basic-syntax/string-slices.md:27 msgid "" -"* `&str` introduces a string slice, which is an immutable reference to UTF-8 " -"encoded string data \n" -" stored in a block of memory. String literals (`”Hello”`), are stored in " -"the program’s binary.\n" +"* `&str` introduces a string slice, which is an immutable reference to UTF-8 encoded string data \n" +" stored in a block of memory. String literals (`”Hello”`), are stored in the program’s binary.\n" "\n" -"* Rust’s `String` type is a wrapper around a vector of bytes. As with a " -"`Vec`, it is owned.\n" +"* Rust’s `String` type is a wrapper around a vector of bytes. As with a `Vec`, it is owned.\n" " \n" -"* As with many other types `String::from()` creates a string from a string " -"literal; `String::new()` \n" -" creates a new empty string, to which string data can be added using the " -"`push()` and `push_str()` methods.\n" +"* As with many other types `String::from()` creates a string from a string literal; `String::" +"new()` \n" +" creates a new empty string, to which string data can be added using the `push()` and " +"`push_str()` methods.\n" "\n" -"* The `format!()` macro is a convenient way to generate an owned string from " -"dynamic values. It \n" +"* The `format!()` macro is a convenient way to generate an owned string from dynamic values. It \n" " accepts the same format specification as `println!()`.\n" " \n" -"* You can borrow `&str` slices from `String` via `&` and optionally range " -"selection.\n" +"* You can borrow `&str` slices from `String` via `&` and optionally range selection.\n" " \n" -"* For C++ programmers: think of `&str` as `const char*` from C++, but the " -"one that always points \n" -" to a valid string in memory. Rust `String` is a rough equivalent of `std::" -"string` from C++ \n" -" (main difference: it can only contain UTF-8 encoded bytes and will never " -"use a small-string optimization).\n" +"* For C++ programmers: think of `&str` as `const char*` from C++, but the one that always points \n" +" to a valid string in memory. Rust `String` is a rough equivalent of `std::string` from C++ \n" +" (main difference: it can only contain UTF-8 encoded bytes and will never use a small-string " +"optimization).\n" " " msgstr "" @@ -2695,8 +2486,8 @@ msgstr "" #: src/basic-syntax/functions.md:3 msgid "" -"A Rust version of the famous [FizzBuzz](https://en.wikipedia.org/wiki/" -"Fizz_buzz) interview question:" +"A Rust version of the famous [FizzBuzz](https://en.wikipedia.org/wiki/Fizz_buzz) interview " +"question:" msgstr "" #: src/basic-syntax/functions.md:5 @@ -2732,16 +2523,16 @@ msgstr "" #: src/basic-syntax/functions.md:35 msgid "" -"* We refer in `main` to a function written below. Neither forward " -"declarations nor headers are necessary. \n" -"* Declaration parameters are followed by a type (the reverse of some " -"programming languages), then a return type.\n" -"* The last expression in a function body (or any block) becomes the return " -"value. Simply omit the `;` at the end of the expression.\n" -"* Some functions have no return value, and return the 'unit type', `()`. The " -"compiler will infer this if the `-> ()` return type is omitted.\n" -"* The range expression in the `for` loop in `print_fizzbuzz_to()` contains " -"`=n`, which causes it to include the upper bound." +"* We refer in `main` to a function written below. Neither forward declarations nor headers are " +"necessary. \n" +"* Declaration parameters are followed by a type (the reverse of some programming languages), then " +"a return type.\n" +"* The last expression in a function body (or any block) becomes the return value. Simply omit the " +"`;` at the end of the expression.\n" +"* Some functions have no return value, and return the 'unit type', `()`. The compiler will infer " +"this if the `-> ()` return type is omitted.\n" +"* The range expression in the `for` loop in `print_fizzbuzz_to()` contains `=n`, which causes it " +"to include the upper bound." msgstr "" #: src/basic-syntax/rustdoc.md:1 @@ -2749,23 +2540,20 @@ msgid "# Rustdoc" msgstr "" #: src/basic-syntax/rustdoc.md:3 -msgid "" -"All language items in Rust can be documented using special `///` syntax." +msgid "All language items in Rust can be documented using special `///` syntax." msgstr "" #: src/basic-syntax/rustdoc.md:5 msgid "" "```rust,editable\n" -"/// Determine whether the first argument is divisible by the second " -"argument.\n" +"/// Determine whether the first argument is divisible by the second argument.\n" "///\n" "/// If the second argument is zero, the result is false.\n" "fn is_divisible_by(lhs: u32, rhs: u32) -> bool {\n" " if rhs == 0 {\n" " return false; // Corner case, early return\n" " }\n" -" lhs % rhs == 0 // The last expression in a block is the return " -"value\n" +" lhs % rhs == 0 // The last expression in a block is the return value\n" "}\n" "```" msgstr "" @@ -2774,8 +2562,7 @@ msgstr "" msgid "" "The contents are treated as Markdown. All published Rust library crates are\n" "automatically documented at [`docs.rs`](https://docs.rs) using the\n" -"[rustdoc](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html) tool. It " -"is\n" +"[rustdoc](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html) tool. It is\n" "idiomatic to document all public items in an API using this pattern." msgstr "" @@ -2784,12 +2571,10 @@ msgid "" "* Show students the generated docs for the `rand` crate at\n" " [`docs.rs/rand`](https://docs.rs/rand).\n" "\n" -"* This course does not include rustdoc on slides, just to save space, but " -"in\n" +"* This course does not include rustdoc on slides, just to save space, but in\n" " real code they should be present.\n" "\n" -"* Inner doc comments are discussed later (in the page on modules) and need " -"not\n" +"* Inner doc comments are discussed later (in the page on modules) and need not\n" " be addressed here." msgstr "" @@ -2799,8 +2584,7 @@ msgstr "" #: src/basic-syntax/methods.md:3 msgid "" -"Methods are functions associated with a type. The `self` argument of a " -"method is\n" +"Methods are functions associated with a type. The `self` argument of a method is\n" "an instance of the type it is associated with:" msgstr "" @@ -2832,9 +2616,7 @@ msgid "" msgstr "" #: src/basic-syntax/methods.md:30 -msgid "" -"* We will look much more at methods in today's exercise and in tomorrow's " -"class." +msgid "* We will look much more at methods in today's exercise and in tomorrow's class." msgstr "" #: src/basic-syntax/methods.md:34 @@ -2889,10 +2671,8 @@ msgstr "" #: src/basic-syntax/functions-interlude.md:27 msgid "" -"* When using generics, the standard library's `Into` can provide a kind " -"of limited\n" -" polymorphism on argument types. We will see more details in a later " -"section." +"* When using generics, the standard library's `Into` can provide a kind of limited\n" +" polymorphism on argument types. We will see more details in a later section." msgstr "" #: src/exercises/day-1/morning.md:1 @@ -2917,8 +2697,7 @@ msgstr "" #: src/exercises/day-1/morning.md:13 msgid "" "* Use a local Rust installation, if possible. This way you can get\n" -" auto-completion in your editor. See the page about [Using Cargo] for " -"details\n" +" auto-completion in your editor. See the page about [Using Cargo] for details\n" " on installing Rust.\n" "\n" "* Alternatively, use the Rust Playground." @@ -2926,19 +2705,16 @@ msgstr "" #: src/exercises/day-1/morning.md:19 msgid "" -"The code snippets are not editable on purpose: the inline code snippets " -"lose\n" +"The code snippets are not editable on purpose: the inline code snippets lose\n" "their state if you navigate away from the page." msgstr "" #: src/exercises/day-1/morning.md:22 src/exercises/day-1/afternoon.md:11 #: src/exercises/day-2/morning.md:11 src/exercises/day-2/afternoon.md:7 #: src/exercises/day-3/morning.md:7 src/exercises/bare-metal/morning.md:7 -#: src/exercises/bare-metal/afternoon.md:7 -#: src/exercises/concurrency/morning.md:12 +#: src/exercises/bare-metal/afternoon.md:7 src/exercises/concurrency/morning.md:12 #: src/exercises/concurrency/afternoon.md:13 -msgid "" -"After looking at the exercises, you can look at the [solutions] provided." +msgid "After looking at the exercises, you can look at the [solutions] provided." msgstr "" #: src/exercises/day-1/implicit-conversions.md:1 @@ -2947,8 +2723,7 @@ msgstr "" #: src/exercises/day-1/implicit-conversions.md:3 msgid "" -"Rust will not automatically apply _implicit conversions_ between types " -"([unlike\n" +"Rust will not automatically apply _implicit conversions_ between types ([unlike\n" "C++][3]). You can see this in a program like this:" msgstr "" @@ -2971,18 +2746,15 @@ msgstr "" #: src/exercises/day-1/implicit-conversions.md:19 msgid "" "The Rust integer types all implement the [`From`][1] and [`Into`][2]\n" -"traits to let us convert between them. The `From` trait has a single " -"`from()`\n" +"traits to let us convert between them. The `From` trait has a single `from()`\n" "method and similarly, the `Into` trait has a single `into()` method.\n" -"Implementing these traits is how a type expresses that it can be converted " -"into\n" +"Implementing these traits is how a type expresses that it can be converted into\n" "another type." msgstr "" #: src/exercises/day-1/implicit-conversions.md:25 msgid "" -"The standard library has an implementation of `From for i16`, which " -"means\n" +"The standard library has an implementation of `From for i16`, which means\n" "that we can convert a variable `x` of type `i8` to an `i16` by calling \n" "`i16::from(x)`. Or, simpler, with `x.into()`, because `From for i16`\n" "implementation automatically create an implementation of `Into for i8`." @@ -2990,10 +2762,8 @@ msgstr "" #: src/exercises/day-1/implicit-conversions.md:30 msgid "" -"The same applies for your own `From` implementations for your own types, so " -"it is\n" -"sufficient to only implement `From` to get a respective `Into` " -"implementation automatically." +"The same applies for your own `From` implementations for your own types, so it is\n" +"sufficient to only implement `From` to get a respective `Into` implementation automatically." msgstr "" #: src/exercises/day-1/implicit-conversions.md:33 @@ -3005,8 +2775,7 @@ msgid "" "3. Change the types of `x` and `y` to other things (such as `f32`, `bool`,\n" " `i128`) to see which types you can convert to which other types. Try\n" " converting small types to big types and the other way around. Check the\n" -" [standard library documentation][1] to see if `From` is implemented " -"for\n" +" [standard library documentation][1] to see if `From` is implemented for\n" " the pairs you check." msgstr "" @@ -3026,9 +2795,7 @@ msgid "" msgstr "" #: src/exercises/day-1/for-loops.md:9 -msgid "" -"You can print such an array by asking for its debug representation with `{:?}" -"`:" +msgid "You can print such an array by asking for its debug representation with `{:?}`:" msgstr "" #: src/exercises/day-1/for-loops.md:11 @@ -3069,10 +2836,8 @@ msgstr "" #: src/exercises/day-1/for-loops.md:38 msgid "" -"Use the above to write a function `pretty_print` which pretty-print a matrix " -"and\n" -"a function `transpose` which will transpose a matrix (turn rows into " -"columns):" +"Use the above to write a function `pretty_print` which pretty-print a matrix and\n" +"a function `transpose` which will transpose a matrix (turn rows into columns):" msgstr "" #: src/exercises/day-1/for-loops.md:41 @@ -3138,8 +2903,7 @@ msgstr "" #: src/exercises/day-1/for-loops.md:87 msgid "" -"See the [`ndarray` crate](https://docs.rs/ndarray/) for a production " -"quality\n" +"See the [`ndarray` crate](https://docs.rs/ndarray/) for a production quality\n" "implementation." msgstr "" @@ -3155,8 +2919,7 @@ msgstr "" #: src/basic-syntax/variables.md:3 msgid "" -"Rust provides type safety via static typing. Variable bindings are immutable " -"by\n" +"Rust provides type safety via static typing. Variable bindings are immutable by\n" "default:" msgstr "" @@ -3174,10 +2937,10 @@ msgstr "" #: src/basic-syntax/variables.md:17 msgid "" -"* Due to type inference the `i32` is optional. We will gradually show the " -"types less and less as the course progresses.\n" -"* Note that since `println!` is a macro, `x` is not moved, even using the " -"function like syntax of `println!(\"x: {}\", x)`" +"* Due to type inference the `i32` is optional. We will gradually show the types less and less as " +"the course progresses.\n" +"* Note that since `println!` is a macro, `x` is not moved, even using the function like syntax of " +"`println!(\"x: {}\", x)`" msgstr "" #: src/basic-syntax/type-inference.md:1 @@ -3212,24 +2975,23 @@ msgstr "" #: src/basic-syntax/type-inference.md:26 msgid "" -"This slide demonstrates how the Rust compiler infers types based on " -"constraints given by variable declarations and usages." +"This slide demonstrates how the Rust compiler infers types based on constraints given by variable " +"declarations and usages." msgstr "" #: src/basic-syntax/type-inference.md:28 msgid "" -"It is very important to emphasize that variables declared like this are not " -"of some sort of dynamic \"any type\" that can\n" -"hold any data. The machine code generated by such declaration is identical " -"to the explicit declaration of a type.\n" +"It is very important to emphasize that variables declared like this are not of some sort of " +"dynamic \"any type\" that can\n" +"hold any data. The machine code generated by such declaration is identical to the explicit " +"declaration of a type.\n" "The compiler does the job for us and helps us write more concise code." msgstr "" #: src/basic-syntax/type-inference.md:32 msgid "" -"The following code tells the compiler to copy into a certain generic " -"container without the code ever explicitly specifying the contained type, " -"using `_` as a placeholder:" +"The following code tells the compiler to copy into a certain generic container without the code " +"ever explicitly specifying the contained type, using `_` as a placeholder:" msgstr "" #: src/basic-syntax/type-inference.md:34 @@ -3249,9 +3011,9 @@ msgstr "" #: src/basic-syntax/type-inference.md:46 msgid "" -"[`collect`](https://doc.rust-lang.org/stable/std/iter/trait.Iterator." -"html#method.collect) relies on `FromIterator`, which [`HashSet`](https://doc." -"rust-lang.org/std/iter/trait.FromIterator.html) implements." +"[`collect`](https://doc.rust-lang.org/stable/std/iter/trait.Iterator.html#method.collect) relies " +"on `FromIterator`, which [`HashSet`](https://doc.rust-lang.org/std/iter/trait.FromIterator.html) " +"implements." msgstr "" #: src/basic-syntax/static-and-const.md:1 @@ -3279,8 +3041,7 @@ msgid "" "fn compute_digest(text: &str) -> [u8; DIGEST_SIZE] {\n" " let mut digest = [ZERO.unwrap_or(0); DIGEST_SIZE];\n" " for (idx, &b) in text.as_bytes().iter().enumerate() {\n" -" digest[idx % DIGEST_SIZE] = digest[idx % DIGEST_SIZE]." -"wrapping_add(b);\n" +" digest[idx % DIGEST_SIZE] = digest[idx % DIGEST_SIZE].wrapping_add(b);\n" " }\n" " digest\n" "}\n" @@ -3317,25 +3078,22 @@ msgstr "" #: src/basic-syntax/static-and-const.md:41 msgid "" -"As noted in the [Rust RFC Book][1], these are not inlined upon use and have " -"an actual associated memory location. This is useful for unsafe and " -"embedded code, and the variable lives through the entirety of the program " -"execution." +"As noted in the [Rust RFC Book][1], these are not inlined upon use and have an actual associated " +"memory location. This is useful for unsafe and embedded code, and the variable lives through the " +"entirety of the program execution." msgstr "" #: src/basic-syntax/static-and-const.md:44 -msgid "" -"We will look at mutating static data in the [chapter on Unsafe Rust](../" -"unsafe.md)." +msgid "We will look at mutating static data in the [chapter on Unsafe Rust](../unsafe.md)." msgstr "" #: src/basic-syntax/static-and-const.md:48 msgid "" "* Mention that `const` behaves semantically similar to C++'s `constexpr`.\n" -"* `static`, on the other hand, is much more similar to a `const` or mutable " -"global variable in C++.\n" -"* It isn't super common that one would need a runtime evaluated constant, " -"but it is helpful and safer than using a static." +"* `static`, on the other hand, is much more similar to a `const` or mutable global variable in C+" +"+.\n" +"* It isn't super common that one would need a runtime evaluated constant, but it is helpful and " +"safer than using a static." msgstr "" #: src/basic-syntax/scopes-shadowing.md:1 @@ -3344,8 +3102,7 @@ msgstr "" #: src/basic-syntax/scopes-shadowing.md:3 msgid "" -"You can shadow variables, both those from outer scopes and variables from " -"the\n" +"You can shadow variables, both those from outer scopes and variables from the\n" "same scope:" msgstr "" @@ -3371,15 +3128,13 @@ msgstr "" #: src/basic-syntax/scopes-shadowing.md:25 msgid "" -"* Definition: Shadowing is different from mutation, because after shadowing " -"both variable's memory locations exist at the same time. Both are available " -"under the same name, depending where you use it in the code. \n" +"* Definition: Shadowing is different from mutation, because after shadowing both variable's memory " +"locations exist at the same time. Both are available under the same name, depending where you use " +"it in the code. \n" "* A shadowing variable can have a different type. \n" -"* Shadowing looks obscure at first, but is convenient for holding on to " -"values after `.unwrap()`.\n" -"* The following code demonstrates why the compiler can't simply reuse memory " -"locations when shadowing an immutable variable in a scope, even if the type " -"does not change." +"* Shadowing looks obscure at first, but is convenient for holding on to values after `.unwrap()`.\n" +"* The following code demonstrates why the compiler can't simply reuse memory locations when " +"shadowing an immutable variable in a scope, even if the type does not change." msgstr "" #: src/basic-syntax/scopes-shadowing.md:30 @@ -3405,8 +3160,7 @@ msgstr "" #: src/memory-management.md:5 msgid "" "* Full control via manual memory management: C, C++, Pascal, ...\n" -"* Full safety via automatic memory management at runtime: Java, Python, Go, " -"Haskell, ..." +"* Full safety via automatic memory management at runtime: Java, Python, Go, Haskell, ..." msgstr "" #: src/memory-management.md:8 @@ -3451,8 +3205,7 @@ msgstr "" #: src/memory-management/stack.md:3 msgid "" -"Creating a `String` puts fixed-sized data on the stack and dynamically " -"sized\n" +"Creating a `String` puts fixed-sized data on the stack and dynamically sized\n" "data on the heap:" msgstr "" @@ -3484,15 +3237,14 @@ msgstr "" #: src/memory-management/stack.md:28 msgid "" -"* Mention that a `String` is backed by a `Vec`, so it has a capacity and " -"length and can grow if mutable via reallocation on the heap.\n" +"* Mention that a `String` is backed by a `Vec`, so it has a capacity and length and can grow if " +"mutable via reallocation on the heap.\n" "\n" -"* If students ask about it, you can mention that the underlying memory is " -"heap allocated using the [System Allocator] and custom allocators can be " -"implemented using the [Allocator API]\n" +"* If students ask about it, you can mention that the underlying memory is heap allocated using the " +"[System Allocator] and custom allocators can be implemented using the [Allocator API]\n" "\n" -"* We can inspect the memory layout with `unsafe` code. However, you should " -"point out that this is rightfully unsafe!\n" +"* We can inspect the memory layout with `unsafe` code. However, you should point out that this is " +"rightfully unsafe!\n" "\n" " ```rust,editable\n" " fn main() {\n" @@ -3500,14 +3252,11 @@ msgid "" " s1.push(' ');\n" " s1.push_str(\"world\");\n" " // DON'T DO THIS AT HOME! For educational purposes only.\n" -" // String provides no guarantees about its layout, so this could " -"lead to\n" +" // String provides no guarantees about its layout, so this could lead to\n" " // undefined behavior.\n" " unsafe {\n" -" let (capacity, ptr, len): (usize, usize, usize) = std::mem::" -"transmute(s1);\n" -" println!(\"ptr = {ptr:#x}, len = {len}, capacity = " -"{capacity}\");\n" +" let (capacity, ptr, len): (usize, usize, usize) = std::mem::transmute(s1);\n" +" println!(\"ptr = {ptr:#x}, len = {len}, capacity = {capacity}\");\n" " }\n" " }\n" " ```" @@ -3523,8 +3272,7 @@ msgstr "" #: src/memory-management/manual.md:5 msgid "" -"If not done with care, this can lead to crashes, bugs, security " -"vulnerabilities, and memory leaks." +"If not done with care, this can lead to crashes, bugs, security vulnerabilities, and memory leaks." msgstr "" #: src/memory-management/manual.md:7 @@ -3550,8 +3298,7 @@ msgstr "" #: src/memory-management/manual.md:21 msgid "" -"Memory is leaked if the function returns early between `malloc` and `free`: " -"the\n" +"Memory is leaked if the function returns early between `malloc` and `free`: the\n" "pointer is lost and we cannot deallocate the memory." msgstr "" @@ -3560,22 +3307,19 @@ msgid "# Scope-Based Memory Management" msgstr "" #: src/memory-management/scope-based.md:3 -msgid "" -"Constructors and destructors let you hook into the lifetime of an object." +msgid "Constructors and destructors let you hook into the lifetime of an object." msgstr "" #: src/memory-management/scope-based.md:5 msgid "" "By wrapping a pointer in an object, you can free memory when the object is\n" -"destroyed. The compiler guarantees that this happens, even if an exception " -"is\n" +"destroyed. The compiler guarantees that this happens, even if an exception is\n" "raised." msgstr "" #: src/memory-management/scope-based.md:9 msgid "" -"This is often called _resource acquisition is initialization_ (RAII) and " -"gives\n" +"This is often called _resource acquisition is initialization_ (RAII) and gives\n" "you smart pointers." msgstr "" @@ -3601,8 +3345,7 @@ msgid "" msgstr "" #: src/memory-management/scope-based.md:25 -msgid "" -"Special move constructors are used when passing ownership to a function:" +msgid "Special move constructors are used when passing ownership to a function:" msgstr "" #: src/memory-management/scope-based.md:27 @@ -3619,16 +3362,14 @@ msgstr "" #: src/memory-management/garbage-collection.md:3 msgid "" -"An alternative to manual and scope-based memory management is automatic " -"memory\n" +"An alternative to manual and scope-based memory management is automatic memory\n" "management:" msgstr "" #: src/memory-management/garbage-collection.md:6 msgid "" "* The programmer never allocates or deallocates memory explicitly.\n" -"* A garbage collector finds unused memory and deallocates it for the " -"programmer." +"* A garbage collector finds unused memory and deallocates it for the programmer." msgstr "" #: src/memory-management/garbage-collection.md:9 @@ -3659,12 +3400,11 @@ msgstr "" #: src/memory-management/rust.md:5 msgid "" "* Safe and correct like Java, but without a garbage collector.\n" -"* Depending on which abstraction (or combination of abstractions) you " -"choose, can be a single unique pointer, reference counted, or atomically " -"reference counted.\n" +"* Depending on which abstraction (or combination of abstractions) you choose, can be a single " +"unique pointer, reference counted, or atomically reference counted.\n" "* Scope-based like C++, but the compiler enforces full adherence.\n" -"* A Rust user can choose the right abstraction for the situation, some even " -"have no cost at runtime like C." +"* A Rust user can choose the right abstraction for the situation, some even have no cost at " +"runtime like C." msgstr "" #: src/memory-management/rust.md:10 @@ -3673,13 +3413,11 @@ msgstr "" #: src/memory-management/rust.md:14 msgid "" -"* If asked how at this point, you can mention that in Rust this is usually " -"handled by RAII wrapper types such as [Box], [Vec], [Rc], or [Arc]. These " -"encapsulate ownership and memory allocation via various means, and prevent " -"the potential errors in C.\n" +"* If asked how at this point, you can mention that in Rust this is usually handled by RAII wrapper " +"types such as [Box], [Vec], [Rc], or [Arc]. These encapsulate ownership and memory allocation via " +"various means, and prevent the potential errors in C.\n" "\n" -"* You may be asked about destructors here, the [Drop] trait is the Rust " -"equivalent." +"* You may be asked about destructors here, the [Drop] trait is the Rust equivalent." msgstr "" #: src/memory-management/comparison.md:1 @@ -3737,8 +3475,7 @@ msgstr "" #: src/ownership.md:3 msgid "" -"All variable bindings have a _scope_ where they are valid and it is an error " -"to\n" +"All variable bindings have a _scope_ where they are valid and it is an error to\n" "use a variable outside its scope:" msgstr "" @@ -3795,8 +3532,8 @@ msgstr "" #: src/ownership/move-semantics.md:22 msgid "" -"* Mention that this is the opposite of the defaults in C++, which copies by " -"value unless you use `std::move` (and the move constructor is defined!).\n" +"* Mention that this is the opposite of the defaults in C++, which copies by value unless you use " +"`std::move` (and the move constructor is defined!).\n" "\n" "* In Rust, clones are explicit (by using `clone`)." msgstr "" @@ -3889,8 +3626,7 @@ msgstr "" #: src/ownership/double-free-modern-cpp.md:10 msgid "" -"* The heap data from `s1` is duplicated and `s2` gets its own independent " -"copy.\n" +"* The heap data from `s1` is duplicated and `s2` gets its own independent copy.\n" "* When `s1` and `s2` go out of scope, they each free their own memory." msgstr "" @@ -3970,17 +3706,14 @@ msgstr "" #: src/ownership/moves-function-calls.md:20 msgid "" -"* With the first call to `say_hello`, `main` gives up ownership of `name`. " -"Afterwards, `name` cannot be used anymore within `main`.\n" -"* The heap memory allocated for `name` will be freed at the end of the " -"`say_hello` function.\n" -"* `main` can retain ownership if it passes `name` as a reference (`&name`) " -"and if `say_hello` accepts a reference as a parameter.\n" -"* Alternatively, `main` can pass a clone of `name` in the first call (`name." -"clone()`).\n" -"* Rust makes it harder than C++ to inadvertently create copies by making " -"move semantics the default, and by forcing programmers to make clones " -"explicit." +"* With the first call to `say_hello`, `main` gives up ownership of `name`. Afterwards, `name` " +"cannot be used anymore within `main`.\n" +"* The heap memory allocated for `name` will be freed at the end of the `say_hello` function.\n" +"* `main` can retain ownership if it passes `name` as a reference (`&name`) and if `say_hello` " +"accepts a reference as a parameter.\n" +"* Alternatively, `main` can pass a clone of `name` in the first call (`name.clone()`).\n" +"* Rust makes it harder than C++ to inadvertently create copies by making move semantics the " +"default, and by forcing programmers to make clones explicit." msgstr "" #: src/ownership/copy-clone.md:1 @@ -3988,8 +3721,7 @@ msgid "# Copying and Cloning" msgstr "" #: src/ownership/copy-clone.md:3 -msgid "" -"While move semantics are the default, certain types are copied by default:" +msgid "While move semantics are the default, certain types are copied by default:" msgstr "" #: src/ownership/copy-clone.md:5 @@ -4039,12 +3771,10 @@ msgstr "" #: src/ownership/copy-clone.md:37 msgid "" -"* Copying refers to bitwise copies of memory regions and does not work on " -"arbitrary objects.\n" -"* Copying does not allow for custom logic (unlike copy constructors in C+" -"+).\n" -"* Cloning is a more general operation and also allows for custom behavior by " -"implementing the `Clone` trait.\n" +"* Copying refers to bitwise copies of memory regions and does not work on arbitrary objects.\n" +"* Copying does not allow for custom logic (unlike copy constructors in C++).\n" +"* Cloning is a more general operation and also allows for custom behavior by implementing the " +"`Clone` trait.\n" "* Copying does not work on types that implement the `Drop` trait." msgstr "" @@ -4054,19 +3784,19 @@ msgstr "" #: src/ownership/copy-clone.md:44 msgid "" -"* Add a `String` field to `struct Point`. It will not compile because " -"`String` is not a `Copy` type.\n" -"* Remove `Copy` from the `derive` attribute. The compiler error is now in " -"the `println!` for `p1`.\n" +"* Add a `String` field to `struct Point`. It will not compile because `String` is not a `Copy` " +"type.\n" +"* Remove `Copy` from the `derive` attribute. The compiler error is now in the `println!` for " +"`p1`.\n" "* Show that it works if you clone `p1` instead." msgstr "" #: src/ownership/copy-clone.md:48 msgid "" -"If students ask about `derive`, it is sufficient to say that this is a way " -"to generate code in Rust\n" -"at compile time. In this case the default implementations of `Copy` and " -"`Clone` traits are generated." +"If students ask about `derive`, it is sufficient to say that this is a way to generate code in " +"Rust\n" +"at compile time. In this case the default implementations of `Copy` and `Clone` traits are " +"generated." msgstr "" #: src/ownership/borrowing.md:1 @@ -4110,11 +3840,10 @@ msgstr "" #: src/ownership/borrowing.md:28 msgid "" -"* Demonstrate that the return from `add` is cheap because the compiler can " -"eliminate the copy operation. Change the above code to print stack addresses " -"and run it on the [Playground]. In the \"DEBUG\" optimization level, the " -"addresses should change, while they stay the same when changing to the " -"\"RELEASE\" setting:\n" +"* Demonstrate that the return from `add` is cheap because the compiler can eliminate the copy " +"operation. Change the above code to print stack addresses and run it on the [Playground]. In the " +"\"DEBUG\" optimization level, the addresses should change, while they stay the same when changing " +"to the \"RELEASE\" setting:\n" "\n" " ```rust,editable\n" " #[derive(Debug)]\n" @@ -4135,10 +3864,9 @@ msgid "" " }\n" " ```\n" "* The Rust compiler can do return value optimization (RVO).\n" -"* In C++, copy elision has to be defined in the language specification " -"because constructors can have side effects. In Rust, this is not an issue at " -"all. If RVO did not happen, Rust will always performs a simple and efficient " -"`memcpy` copy." +"* In C++, copy elision has to be defined in the language specification because constructors can " +"have side effects. In Rust, this is not an issue at all. If RVO did not happen, Rust will always " +"performs a simple and efficient `memcpy` copy." msgstr "" #: src/ownership/shared-unique-borrows.md:1 @@ -4175,13 +3903,13 @@ msgstr "" #: src/ownership/shared-unique-borrows.md:25 msgid "" -"* The above code does not compile because `a` is borrowed as mutable " -"(through `c`) and as immutable (through `b`) at the same time.\n" -"* Move the `println!` statement for `b` before the scope that introduces `c` " -"to make the code compile.\n" -"* After that change, the compiler realizes that `b` is only ever used before " -"the new mutable borrow of `a` through `c`. This is a feature of the borrow " -"checker called \"non-lexical lifetimes\"." +"* The above code does not compile because `a` is borrowed as mutable (through `c`) and as " +"immutable (through `b`) at the same time.\n" +"* Move the `println!` statement for `b` before the scope that introduces `c` to make the code " +"compile.\n" +"* After that change, the compiler realizes that `b` is only ever used before the new mutable " +"borrow of `a` through `c`. This is a feature of the borrow checker called \"non-lexical " +"lifetimes\"." msgstr "" #: src/ownership/lifetimes.md:1 @@ -4198,11 +3926,9 @@ msgid "" "* Lifetimes can also be explicit: `&'a Point`, `&'document str`.\n" "* Read `&'a Point` as \"a borrowed `Point` which is valid for at least the\n" " lifetime `a`\".\n" -"* Lifetimes are always inferred by the compiler: you cannot assign a " -"lifetime\n" +"* Lifetimes are always inferred by the compiler: you cannot assign a lifetime\n" " yourself.\n" -" * Lifetime annotations create constraints; the compiler verifies that " -"there is\n" +" * Lifetime annotations create constraints; the compiler verifies that there is\n" " a valid solution." msgstr "" @@ -4211,9 +3937,7 @@ msgid "# Lifetimes in Function Calls" msgstr "" #: src/ownership/lifetimes-function-calls.md:3 -msgid "" -"In addition to borrowing its arguments, a function can return a borrowed " -"value:" +msgid "In addition to borrowing its arguments, a function can return a borrowed value:" msgstr "" #: src/ownership/lifetimes-function-calls.md:5 @@ -4246,8 +3970,8 @@ msgstr "" #: src/ownership/lifetimes-function-calls.md:31 msgid "" -"* Move the declaration of `p2` and `p3` into a a new scope (`{ ... }`), " -"resulting in the following code:\n" +"* Move the declaration of `p2` and `p3` into a a new scope (`{ ... }`), resulting in the following " +"code:\n" " ```rust,ignore\n" " #[derive(Debug)]\n" " struct Point(i32, i32);\n" @@ -4268,17 +3992,15 @@ msgid "" " ```\n" " Note how this does not compile since `p3` outlives `p2`.\n" "\n" -"* Reset the workspace and change the function signature to `fn left_most<'a, " -"'b>(p1: &'a Point, p2: &'a Point) -> &'b Point`. This will not compile " -"because the relationship between the lifetimes `'a` and `'b` is unclear.\n" +"* Reset the workspace and change the function signature to `fn left_most<'a, 'b>(p1: &'a Point, " +"p2: &'a Point) -> &'b Point`. This will not compile because the relationship between the lifetimes " +"`'a` and `'b` is unclear.\n" "* Another way to explain it:\n" -" * Two references to two values are borrowed by a function and the function " -"returns\n" +" * Two references to two values are borrowed by a function and the function returns\n" " another reference.\n" -" * It must have come from one of those two inputs (or from a global " -"variable).\n" -" * Which one is it? The compiler needs to to know, so at the call site the " -"returned reference is not used\n" +" * It must have come from one of those two inputs (or from a global variable).\n" +" * Which one is it? The compiler needs to to know, so at the call site the returned reference is " +"not used\n" " for longer than a variable from where the reference came from." msgstr "" @@ -4287,8 +4009,7 @@ msgid "# Lifetimes in Data Structures" msgstr "" #: src/ownership/lifetimes-data-structures.md:3 -msgid "" -"If a data type stores borrowed data, it must be annotated with a lifetime:" +msgid "If a data type stores borrowed data, it must be annotated with a lifetime:" msgstr "" #: src/ownership/lifetimes-data-structures.md:5 @@ -4302,8 +4023,7 @@ msgid "" "}\n" "\n" "fn main() {\n" -" let text = String::from(\"The quick brown fox jumps over the lazy dog." -"\");\n" +" let text = String::from(\"The quick brown fox jumps over the lazy dog.\");\n" " let fox = Highlight(&text[4..19]);\n" " let dog = Highlight(&text[35..43]);\n" " // erase(text);\n" @@ -4315,19 +4035,16 @@ msgstr "" #: src/ownership/lifetimes-data-structures.md:25 msgid "" -"* In the above example, the annotation on `Highlight` enforces that the data " -"underlying the contained `&str` lives at least as long as any instance of " -"`Highlight` that uses that data.\n" -"* If `text` is consumed before the end of the lifetime of `fox` (or `dog`), " -"the borrow checker throws an error.\n" -"* Types with borrowed data force users to hold on to the original data. This " -"can be useful for creating lightweight views, but it generally makes them " -"somewhat harder to use.\n" +"* In the above example, the annotation on `Highlight` enforces that the data underlying the " +"contained `&str` lives at least as long as any instance of `Highlight` that uses that data.\n" +"* If `text` is consumed before the end of the lifetime of `fox` (or `dog`), the borrow checker " +"throws an error.\n" +"* Types with borrowed data force users to hold on to the original data. This can be useful for " +"creating lightweight views, but it generally makes them somewhat harder to use.\n" "* When possible, make data structures own their data directly.\n" -"* Some structs with multiple references inside can have more than one " -"lifetime annotation. This can be necessary if there is a need to describe " -"lifetime relationships between the references themselves, in addition to the " -"lifetime of the struct itself. Those are very advanced use cases." +"* Some structs with multiple references inside can have more than one lifetime annotation. This " +"can be necessary if there is a need to describe lifetime relationships between the references " +"themselves, in addition to the lifetime of the struct itself. Those are very advanced use cases." msgstr "" #: src/exercises/day-1/afternoon.md:1 @@ -4351,8 +4068,7 @@ msgstr "" #: src/exercises/day-1/book-library.md:3 msgid "" -"We will learn much more about structs and the `Vec` type tomorrow. For " -"now,\n" +"We will learn much more about structs and the `Vec` type tomorrow. For now,\n" "you just need to know part of its API:" msgstr "" @@ -4423,8 +4139,7 @@ msgid "" " //}\n" "\n" " //fn print_books(self) {\n" -" // todo!(\"Iterate over `self.books` and each book's title and " -"year\")\n" +" // todo!(\"Iterate over `self.books` and each book's title and year\")\n" " //}\n" "\n" " //fn oldest_book(self) -> Option<&Book> {\n" @@ -4442,8 +4157,7 @@ msgid "" " //println!(\"The library is empty: {}\", library.is_empty());\n" " //\n" " //library.add_book(Book::new(\"Lord of the Rings\", 1954));\n" -" //library.add_book(Book::new(\"Alice's Adventures in Wonderland\", " -"1865));\n" +" //library.add_book(Book::new(\"Alice's Adventures in Wonderland\", 1865));\n" " //\n" " //println!(\"The library is no longer empty: {}\", library.is_empty());\n" " //\n" @@ -4473,8 +4187,7 @@ msgstr "" msgid "" "The ownership model of Rust affects many APIs. An example of this is the\n" "[`Iterator`](https://doc.rust-lang.org/std/iter/trait.Iterator.html) and\n" -"[`IntoIterator`](https://doc.rust-lang.org/std/iter/trait.IntoIterator." -"html)\n" +"[`IntoIterator`](https://doc.rust-lang.org/std/iter/trait.IntoIterator.html)\n" "traits." msgstr "" @@ -4484,10 +4197,8 @@ msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:10 msgid "" -"Traits are like interfaces: they describe behavior (methods) for a type. " -"The\n" -"`Iterator` trait simply says that you can call `next` until you get `None` " -"back:" +"Traits are like interfaces: they describe behavior (methods) for a type. The\n" +"`Iterator` trait simply says that you can call `next` until you get `None` back:" msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:13 @@ -4547,8 +4258,7 @@ msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:50 msgid "" "The `Iterator` trait tells you how to _iterate_ once you have created an\n" -"iterator. The related trait `IntoIterator` tells you how to create the " -"iterator:" +"iterator. The related trait `IntoIterator` tells you how to create the iterator:" msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:53 @@ -4589,8 +4299,7 @@ msgstr "" msgid "" "```rust,editable,compile_fail\n" "fn main() {\n" -" let v: Vec = vec![String::from(\"foo\"), String::" -"from(\"bar\")];\n" +" let v: Vec = vec![String::from(\"foo\"), String::from(\"bar\")];\n" " let mut iter = v.into_iter();\n" "\n" " let v0: Option<..> = iter.next();\n" @@ -4605,8 +4314,7 @@ msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:85 msgid "" -"Now that we know both `Iterator` and `IntoIterator`, we can build `for` " -"loops.\n" +"Now that we know both `Iterator` and `IntoIterator`, we can build `for` loops.\n" "They call `into_iter()` on an expression and iterates over the resulting\n" "iterator:" msgstr "" @@ -4615,8 +4323,7 @@ msgstr "" msgid "" "```rust,editable\n" "fn main() {\n" -" let v: Vec = vec![String::from(\"foo\"), String::" -"from(\"bar\")];\n" +" let v: Vec = vec![String::from(\"foo\"), String::from(\"bar\")];\n" "\n" " for word in &v {\n" " println!(\"word: {word}\");\n" @@ -4635,14 +4342,13 @@ msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:105 msgid "" -"Experiment with the code above and then consult the documentation for " -"[`impl\n" +"Experiment with the code above and then consult the documentation for [`impl\n" "IntoIterator for\n" -"&Vec`](https://doc.rust-lang.org/std/vec/struct.Vec.html#impl-" -"IntoIterator-for-%26%27a%20Vec%3CT%2C%20A%3E)\n" +"&Vec`](https://doc.rust-lang.org/std/vec/struct.Vec.html#impl-IntoIterator-for-" +"%26%27a%20Vec%3CT%2C%20A%3E)\n" "and [`impl IntoIterator for\n" -"Vec`](https://doc.rust-lang.org/std/vec/struct.Vec.html#impl-IntoIterator-" -"for-Vec%3CT%2C%20A%3E)\n" +"Vec`](https://doc.rust-lang.org/std/vec/struct.Vec.html#impl-IntoIterator-for-" +"Vec%3CT%2C%20A%3E)\n" "to check your answers." msgstr "" @@ -4660,12 +4366,10 @@ msgid "" "\n" "* Pattern matching: destructuring enums, structs, and arrays.\n" "\n" -"* Control flow constructs: `if`, `if let`, `while`, `while let`, `break`, " -"and\n" +"* Control flow constructs: `if`, `if let`, `while`, `while let`, `break`, and\n" " `continue`.\n" "\n" -"* The Standard Library: `String`, `Option` and `Result`, `Vec`, `HashMap`, " -"`Rc`\n" +"* The Standard Library: `String`, `Option` and `Result`, `Vec`, `HashMap`, `Rc`\n" " and `Arc`.\n" "\n" "* Modules: visibility, paths, and filesystem hierarchy." @@ -4707,8 +4411,8 @@ msgid "" msgstr "" #: src/structs.md:31 src/enums.md:33 src/enums/sizes.md:29 src/methods.md:30 -#: src/methods/example.md:46 src/pattern-matching.md:25 -#: src/pattern-matching/match-guards.md:22 src/control-flow/blocks.md:42 +#: src/methods/example.md:46 src/pattern-matching.md:25 src/pattern-matching/match-guards.md:22 +#: src/control-flow/blocks.md:42 msgid "Key Points:" msgstr "" @@ -4717,18 +4421,13 @@ msgid "" "* Structs work like in C or C++.\n" " * Like in C++, and unlike in C, no typedef is needed to define a type.\n" " * Unlike in C++, there is no inheritance between structs.\n" -"* Methods are defined in an `impl` block, which we will see in following " -"slides.\n" -"* This may be a good time to let people know there are different types of " -"structs. \n" -" * Zero-sized structs `e.g., struct Foo;` might be used when implementing a " -"trait on some type but don’t have any data that you want to store in the " -"value itself. \n" -" * The next slide will introduce Tuple structs, used when the field names " -"are not important.\n" -"* The syntax `..peter` allows us to copy the majority of the fields from the " -"old struct without having to explicitly type it all out. It must always be " -"the last element." +"* Methods are defined in an `impl` block, which we will see in following slides.\n" +"* This may be a good time to let people know there are different types of structs. \n" +" * Zero-sized structs `e.g., struct Foo;` might be used when implementing a trait on some type " +"but don’t have any data that you want to store in the value itself. \n" +" * The next slide will introduce Tuple structs, used when the field names are not important.\n" +"* The syntax `..peter` allows us to copy the majority of the fields from the old struct without " +"having to explicitly type it all out. It must always be the last element." msgstr "" #: src/structs/tuple-structs.md:1 @@ -4779,16 +4478,15 @@ msgstr "" #: src/structs/tuple-structs.md:37 msgid "" -"* Newtypes are a great way to encode additional information about the value " -"in a primitive type, for example:\n" +"* Newtypes are a great way to encode additional information about the value in a primitive type, " +"for example:\n" " * The number is measured in some units: `Newtons` in the example above.\n" -" * The value passed some validation when it was created, so you no longer " -"have to validate it again at every use: 'PhoneNumber(String)` or " -"`OddNumber(u32)`.\n" -"* Demonstrate how to add a `f64` value to a `Newtons` type by accessing the " -"single field in the newtype.\n" -" * Rust generally doesn’t like inexplicit things, like automatic " -"unwrapping or for instance using booleans as integers.\n" +" * The value passed some validation when it was created, so you no longer have to validate it " +"again at every use: 'PhoneNumber(String)` or `OddNumber(u32)`.\n" +"* Demonstrate how to add a `f64` value to a `Newtons` type by accessing the single field in the " +"newtype.\n" +" * Rust generally doesn’t like inexplicit things, like automatic unwrapping or for instance " +"using booleans as integers.\n" " * Operator overloading is discussed on Day 3 (generics). " msgstr "" @@ -4826,8 +4524,8 @@ msgstr "" #: src/structs/field-shorthand.md:27 msgid "" -"* The `new` function could be written using `Self` as a type, as it is " -"interchangeable with the struct type name\n" +"* The `new` function could be written using `Self` as a type, as it is interchangeable with the " +"struct type name\n" "\n" " ```rust,editable\n" " #[derive(Debug)]\n" @@ -4841,8 +4539,8 @@ msgid "" " }\n" " }\n" " ``` \n" -"* Implement the `Default` trait for the struct. Define some fields and use " -"the default values for the other fields.\n" +"* Implement the `Default` trait for the struct. Define some fields and use the default values for " +"the other fields.\n" "\n" " ```rust,editable\n" " #[derive(Debug)]\n" @@ -4870,8 +4568,8 @@ msgid "" " ```\n" "\n" "* Methods are defined in the `impl` block.\n" -"* Use struct update syntax to define a new structure using `peter`. Note " -"that the variable `peter` will no longer be accessible afterwards.\n" +"* Use struct update syntax to define a new structure using `peter`. Note that the variable `peter` " +"will no longer be accessible afterwards.\n" "* Use `{:#?}` when printing structs to request the `Debug` representation." msgstr "" @@ -4916,15 +4614,14 @@ msgstr "" #: src/enums.md:35 msgid "" "* Enumerations allow you to collect a set of values under one type\n" -"* This page offers an enum type `CoinFlip` with two variants `Heads` and " -"`Tail`. You might note the namespace when using variants.\n" +"* This page offers an enum type `CoinFlip` with two variants `Heads` and `Tail`. You might note " +"the namespace when using variants.\n" "* This might be a good time to compare Structs and Enums:\n" -" * In both, you can have a simple version without fields (unit struct) or " -"one with different types of fields (variant payloads). \n" +" * In both, you can have a simple version without fields (unit struct) or one with different " +"types of fields (variant payloads). \n" " * In both, associated functions are defined within an `impl` block.\n" -" * You could even implement the different variants of an enum with separate " -"structs but then they wouldn’t be the same type as they would if they were " -"all defined in an enum. " +" * You could even implement the different variants of an enum with separate structs but then they " +"wouldn’t be the same type as they would if they were all defined in an enum. " msgstr "" #: src/enums/variant-payloads.md:1 @@ -4933,8 +4630,7 @@ msgstr "" #: src/enums/variant-payloads.md:3 msgid "" -"You can define richer enums where the variants carry data. You can then use " -"the\n" +"You can define richer enums where the variants carry data. You can then use the\n" "`match` statement to extract the data from each variant:" msgstr "" @@ -4970,26 +4666,22 @@ msgstr "" #: src/enums/variant-payloads.md:35 msgid "" -"* The values in the enum variants can only be accessed after being pattern " -"matched. The pattern binds references to the fields in the \"match arm\" " -"after the `=>`.\n" -" * The expression is matched against the patterns from top to bottom. There " -"is no fall-through like in C or C++.\n" -" * The match expression has a value. The value is the last expression in " -"the match arm which was executed.\n" -" * Starting from the top we look for what pattern matches the value then " -"run the code following the arrow. Once we find a match, we stop. \n" -"* Demonstrate what happens when the search is inexhaustive. Note the " -"advantage the Rust compiler provides by confirming when all cases are " -"handled. \n" +"* The values in the enum variants can only be accessed after being pattern matched. The pattern " +"binds references to the fields in the \"match arm\" after the `=>`.\n" +" * The expression is matched against the patterns from top to bottom. There is no fall-through " +"like in C or C++.\n" +" * The match expression has a value. The value is the last expression in the match arm which was " +"executed.\n" +" * Starting from the top we look for what pattern matches the value then run the code following " +"the arrow. Once we find a match, we stop. \n" +"* Demonstrate what happens when the search is inexhaustive. Note the advantage the Rust compiler " +"provides by confirming when all cases are handled. \n" "* `match` inspects a hidden discriminant field in the `enum`.\n" -"* It is possible to retrieve the discriminant by calling `std::mem::" -"discriminant()`\n" -" * This is useful, for example, if implementing `PartialEq` for structs " -"where comparing field values doesn't affect equality.\n" -"* `WebEvent::Click { ... }` is not exactly the same as `WebEvent::" -"Click(Click)` with a top level `struct Click { ... }`. The inlined version " -"cannot implement traits, for example. \n" +"* It is possible to retrieve the discriminant by calling `std::mem::discriminant()`\n" +" * This is useful, for example, if implementing `PartialEq` for structs where comparing field " +"values doesn't affect equality.\n" +"* `WebEvent::Click { ... }` is not exactly the same as `WebEvent::Click(Click)` with a top level " +"`struct Click { ... }`. The inlined version cannot implement traits, for example. \n" " " msgstr "" @@ -4998,9 +4690,7 @@ msgid "# Enum Sizes" msgstr "" #: src/enums/sizes.md:3 -msgid "" -"Rust enums are packed tightly, taking constraints due to alignment into " -"account:" +msgid "Rust enums are packed tightly, taking constraints due to alignment into account:" msgstr "" #: src/enums/sizes.md:5 @@ -5027,18 +4717,14 @@ msgid "" msgstr "" #: src/enums/sizes.md:25 -msgid "" -"* See the [Rust Reference](https://doc.rust-lang.org/reference/type-layout." -"html)." +msgid "* See the [Rust Reference](https://doc.rust-lang.org/reference/type-layout.html)." msgstr "" #: src/enums/sizes.md:31 msgid "" -" * Internally Rust is using a field (discriminant) to keep track of the enum " -"variant.\n" +" * Internally Rust is using a field (discriminant) to keep track of the enum variant.\n" "\n" -" * You can control the discriminant if needed (e.g., for compatibility with " -"C):\n" +" * You can control the discriminant if needed (e.g., for compatibility with C):\n" " \n" " ```rust,editable\n" " #[repr(u32)]\n" @@ -5055,41 +4741,35 @@ msgid "" " }\n" " ```\n" "\n" -" Without `repr`, the discriminant type takes 2 bytes, because 10001 fits " -"2\n" +" Without `repr`, the discriminant type takes 2 bytes, because 10001 fits 2\n" " bytes.\n" "\n" "\n" " * Try out other types such as\n" " \n" " * `dbg_size!(bool)`: size 1 bytes, align: 1 bytes,\n" -" * `dbg_size!(Option)`: size 1 bytes, align: 1 bytes (niche " -"optimization, see below),\n" -" * `dbg_size!(&i32)`: size 8 bytes, align: 8 bytes (on a 64-bit " -"machine),\n" -" * `dbg_size!(Option<&i32>)`: size 8 bytes, align: 8 bytes (null pointer " -"optimization, see below).\n" +" * `dbg_size!(Option)`: size 1 bytes, align: 1 bytes (niche optimization, see below),\n" +" * `dbg_size!(&i32)`: size 8 bytes, align: 8 bytes (on a 64-bit machine),\n" +" * `dbg_size!(Option<&i32>)`: size 8 bytes, align: 8 bytes (null pointer optimization, see " +"below).\n" "\n" " * Niche optimization: Rust will merge use unused bit patterns for the enum\n" " discriminant.\n" "\n" " * Null pointer optimization: For [some\n" -" types](https://doc.rust-lang.org/std/option/#representation), Rust " -"guarantees\n" +" types](https://doc.rust-lang.org/std/option/#representation), Rust guarantees\n" " that `size_of::()` equals `size_of::>()`.\n" "\n" -" Example code if you want to show how the bitwise representation *may* " -"look like in practice.\n" -" It's important to note that the compiler provides no guarantees " -"regarding this representation, therefore this is totally unsafe.\n" +" Example code if you want to show how the bitwise representation *may* look like in practice.\n" +" It's important to note that the compiler provides no guarantees regarding this " +"representation, therefore this is totally unsafe.\n" "\n" " ```rust,editable\n" " use std::mem::transmute;\n" "\n" " macro_rules! dbg_bits {\n" " ($e:expr, $bit_type:ty) => {\n" -" println!(\"- {}: {:#x}\", stringify!($e), transmute::<_, " -"$bit_type>($e));\n" +" println!(\"- {}: {:#x}\", stringify!($e), transmute::<_, $bit_type>($e));\n" " };\n" " }\n" "\n" @@ -5119,8 +4799,8 @@ msgid "" " }\n" " ```\n" "\n" -" More complex example if you want to discuss what happens when we chain " -"more than 256 `Option`s together.\n" +" More complex example if you want to discuss what happens when we chain more than 256 " +"`Option`s together.\n" "\n" " ```rust,editable\n" " #![recursion_limit = \"1000\"]\n" @@ -5129,13 +4809,11 @@ msgid "" " \n" " macro_rules! dbg_bits {\n" " ($e:expr, $bit_type:ty) => {\n" -" println!(\"- {}: {:#x}\", stringify!($e), transmute::<_, " -"$bit_type>($e));\n" +" println!(\"- {}: {:#x}\", stringify!($e), transmute::<_, $bit_type>($e));\n" " };\n" " }\n" "\n" -" // Macro to wrap a value in 2^n Some() where n is the number of \"@\" " -"signs.\n" +" // Macro to wrap a value in 2^n Some() where n is the number of \"@\" signs.\n" " // Increasing the recursion limit is required to evaluate this macro.\n" " macro_rules! many_options {\n" " ($value:expr) => { Some($value) };\n" @@ -5153,21 +4831,17 @@ msgid "" " unsafe {\n" " assert_eq!(many_options!(false), Some(false));\n" " assert_eq!(many_options!(false, @), Some(Some(false)));\n" -" assert_eq!(many_options!(false, @@), " -"Some(Some(Some(Some(false)))));\n" +" assert_eq!(many_options!(false, @@), Some(Some(Some(Some(false)))));\n" "\n" -" println!(\"Bitwise representation of a chain of 128 Option's." -"\");\n" +" println!(\"Bitwise representation of a chain of 128 Option's.\");\n" " dbg_bits!(many_options!(false, @@@@@@@), u8);\n" " dbg_bits!(many_options!(true, @@@@@@@), u8);\n" "\n" -" println!(\"Bitwise representation of a chain of 256 Option's." -"\");\n" +" println!(\"Bitwise representation of a chain of 256 Option's.\");\n" " dbg_bits!(many_options!(false, @@@@@@@@), u16);\n" " dbg_bits!(many_options!(true, @@@@@@@@), u16);\n" "\n" -" println!(\"Bitwise representation of a chain of 257 Option's." -"\");\n" +" println!(\"Bitwise representation of a chain of 257 Option's.\");\n" " dbg_bits!(many_options!(Some(false), @@@@@@@@), u16);\n" " dbg_bits!(many_options!(Some(true), @@@@@@@@), u16);\n" " dbg_bits!(many_options!(None::, @@@@@@@@), u16);\n" @@ -5178,8 +4852,7 @@ msgstr "" #: src/methods.md:3 msgid "" -"Rust allows you to associate functions with your new types. You do this with " -"an\n" +"Rust allows you to associate functions with your new types. You do this with an\n" "`impl` block:" msgstr "" @@ -5211,20 +4884,20 @@ msgstr "" #: src/methods.md:31 msgid "" "* It can be helpful to introduce methods by comparing them to functions.\n" -" * Methods are called on an instance of a type (such as a struct or enum), " -"the first parameter represents the instance as `self`.\n" -" * Developers may choose to use methods to take advantage of method " -"receiver syntax and to help keep them more organized. By using methods we " -"can keep all the implementation code in one predictable place.\n" +" * Methods are called on an instance of a type (such as a struct or enum), the first parameter " +"represents the instance as `self`.\n" +" * Developers may choose to use methods to take advantage of method receiver syntax and to help " +"keep them more organized. By using methods we can keep all the implementation code in one " +"predictable place.\n" "* Point out the use of the keyword `self`, a method receiver. \n" -" * Show that it is an abbreviated term for `self:&Self` and perhaps show " -"how the struct name could also be used. \n" -" * Explain that `Self` is a type alias for the type the `impl` block is in " -"and can be used elsewhere in the block.\n" -" * Note how `self` is used like other structs and dot notation can be used " -"to refer to individual fields.\n" -" * This might be a good time to demonstrate how the `&self` differs from " -"`self` by modifying the code and trying to run say_hello twice. \n" +" * Show that it is an abbreviated term for `self:&Self` and perhaps show how the struct name " +"could also be used. \n" +" * Explain that `Self` is a type alias for the type the `impl` block is in and can be used " +"elsewhere in the block.\n" +" * Note how `self` is used like other structs and dot notation can be used to refer to individual " +"fields.\n" +" * This might be a good time to demonstrate how the `&self` differs from `self` by modifying the " +"code and trying to run say_hello twice. \n" "* We describe the distinction between method receivers next.\n" " " msgstr "" @@ -5235,8 +4908,7 @@ msgstr "" #: src/methods/receiver.md:3 msgid "" -"The `&self` above indicates that the method borrows the object immutably. " -"There\n" +"The `&self` above indicates that the method borrows the object immutably. There\n" "are other possible receivers for a method:" msgstr "" @@ -5244,38 +4916,31 @@ msgstr "" msgid "" "* `&self`: borrows the object from the caller using a shared and immutable\n" " reference. The object can be used again afterwards.\n" -"* `&mut self`: borrows the object from the caller using a unique and " -"mutable\n" +"* `&mut self`: borrows the object from the caller using a unique and mutable\n" " reference. The object can be used again afterwards.\n" -"* `self`: takes ownership of the object and moves it away from the caller. " -"The\n" -" method becomes the owner of the object. The object will be dropped " -"(deallocated)\n" +"* `self`: takes ownership of the object and moves it away from the caller. The\n" +" method becomes the owner of the object. The object will be dropped (deallocated)\n" " when the method returns, unless its ownership is explicitly\n" " transmitted.\n" "* `mut self`: same as above, but while the method owns the object, it can\n" " mutate it too. Complete ownership does not automatically mean mutability.\n" -"* No receiver: this becomes a static method on the struct. Typically used " -"to\n" +"* No receiver: this becomes a static method on the struct. Typically used to\n" " create constructors which are called `new` by convention." msgstr "" #: src/methods/receiver.md:19 msgid "" "Beyond variants on `self`, there are also\n" -"[special wrapper types](https://doc.rust-lang.org/reference/special-types-" -"and-traits.html)\n" +"[special wrapper types](https://doc.rust-lang.org/reference/special-types-and-traits.html)\n" "allowed to be receiver types, such as `Box`." msgstr "" #: src/methods/receiver.md:25 msgid "" -"Consider emphasizing \"shared and immutable\" and \"unique and mutable\". " -"These constraints always come\n" -"together in Rust due to borrow checker rules, and `self` is no exception. It " -"isn't possible to\n" -"reference a struct from multiple locations and call a mutating (`&mut self`) " -"method on it." +"Consider emphasizing \"shared and immutable\" and \"unique and mutable\". These constraints always " +"come\n" +"together in Rust due to borrow checker rules, and `self` is no exception. It isn't possible to\n" +"reference a struct from multiple locations and call a mutating (`&mut self`) method on it." msgstr "" #: src/methods/example.md:1 src/concurrency/shared_state/example.md:1 @@ -5296,8 +4961,7 @@ msgid "" " Race { name: String::from(name), laps: Vec::new() }\n" " }\n" "\n" -" fn add_lap(&mut self, lap: i32) { // Exclusive borrowed read-write " -"access to self\n" +" fn add_lap(&mut self, lap: i32) { // Exclusive borrowed read-write access to self\n" " self.laps.push(lap);\n" " }\n" "\n" @@ -5310,8 +4974,7 @@ msgid "" "\n" " fn finish(self) { // Exclusive ownership of self\n" " let total = self.laps.iter().sum::();\n" -" println!(\"Race {} is finished, total lap time: {}\", self.name, " -"total);\n" +" println!(\"Race {} is finished, total lap time: {}\", self.name, total);\n" " }\n" "}\n" "\n" @@ -5331,16 +4994,15 @@ msgstr "" #: src/methods/example.md:47 msgid "" "* All four methods here use a different method receiver.\n" -" * You can point out how that changes what the function can do with the " -"variable values and if/how it can be used again in `main`.\n" -" * You can showcase the error that appears when trying to call `finish` " -"twice.\n" -"* Note that although the method receivers are different, the non-static " -"functions are called the same way in the main body. Rust enables automatic " -"referencing and dereferencing when calling methods. Rust automatically adds " -"in the `&`, `*`, `muts` so that that object matches the method signature.\n" -"* You might point out that `print_laps` is using a vector that is iterated " -"over. We describe vectors in more detail in the afternoon. " +" * You can point out how that changes what the function can do with the variable values and if/" +"how it can be used again in `main`.\n" +" * You can showcase the error that appears when trying to call `finish` twice.\n" +"* Note that although the method receivers are different, the non-static functions are called the " +"same way in the main body. Rust enables automatic referencing and dereferencing when calling " +"methods. Rust automatically adds in the `&`, `*`, `muts` so that that object matches the method " +"signature.\n" +"* You might point out that `print_laps` is using a vector that is iterated over. We describe " +"vectors in more detail in the afternoon. " msgstr "" #: src/pattern-matching.md:1 @@ -5349,8 +5011,7 @@ msgstr "" #: src/pattern-matching.md:3 msgid "" -"The `match` keyword let you match a value against one or more _patterns_. " -"The\n" +"The `match` keyword let you match a value against one or more _patterns_. The\n" "comparisons are done from top to bottom and the first match wins." msgstr "" @@ -5380,17 +5041,16 @@ msgstr "" #: src/pattern-matching.md:26 msgid "" -"* You might point out how some specific characters are being used when in a " -"pattern\n" +"* You might point out how some specific characters are being used when in a pattern\n" " * `|` as an `or`\n" " * `..` can expand as much as it needs to be\n" " * `1..=5` represents an inclusive range\n" " * `_` is a wild card\n" -"* It can be useful to show how binding works, by for instance replacing a " -"wildcard character with a variable, or removing the quotes around `q`.\n" +"* It can be useful to show how binding works, by for instance replacing a wildcard character with " +"a variable, or removing the quotes around `q`.\n" "* You can demonstrate matching on a reference.\n" -"* This might be a good time to bring up the concept of irrefutable patterns, " -"as the term can show up in error messages.\n" +"* This might be a good time to bring up the concept of irrefutable patterns, as the term can show " +"up in error messages.\n" " " msgstr "" @@ -5400,10 +5060,8 @@ msgstr "" #: src/pattern-matching/destructuring-enums.md:3 msgid "" -"Patterns can also be used to bind variables to parts of your values. This is " -"how\n" -"you inspect the structure of your types. Let us start with a simple `enum` " -"type:" +"Patterns can also be used to bind variables to parts of your values. This is how\n" +"you inspect the structure of your types. Let us start with a simple `enum` type:" msgstr "" #: src/pattern-matching/destructuring-enums.md:6 @@ -5434,20 +5092,17 @@ msgstr "" #: src/pattern-matching/destructuring-enums.md:29 msgid "" -"Here we have used the arms to _destructure_ the `Result` value. In the " -"first\n" -"arm, `half` is bound to the value inside the `Ok` variant. In the second " -"arm,\n" +"Here we have used the arms to _destructure_ the `Result` value. In the first\n" +"arm, `half` is bound to the value inside the `Ok` variant. In the second arm,\n" "`msg` is bound to the error message." msgstr "" #: src/pattern-matching/destructuring-enums.md:36 msgid "" -"* The `if`/`else` expression is returning an enum that is later unpacked " -"with a `match`.\n" -"* You can try adding a third variant to the enum definition and displaying " -"the errors when running the code. Point out the places where your code is " -"now inexhaustive and how the compiler tries to give you hints." +"* The `if`/`else` expression is returning an enum that is later unpacked with a `match`.\n" +"* You can try adding a third variant to the enum definition and displaying the errors when running " +"the code. Point out the places where your code is now inexhaustive and how the compiler tries to " +"give you hints." msgstr "" #: src/pattern-matching/destructuring-structs.md:1 @@ -5472,8 +5127,7 @@ msgid "" " match foo {\n" " Foo { x: (1, b), y } => println!(\"x.0 = 1, b = {b}, y = {y}\"),\n" " Foo { y: 2, x: i } => println!(\"y = 2, x = {i:?}\"),\n" -" Foo { y, .. } => println!(\"y = {y}, other fields were " -"ignored\"),\n" +" Foo { y, .. } => println!(\"y = {y}, other fields were ignored\"),\n" " }\n" "}\n" "```" @@ -5483,10 +5137,8 @@ msgstr "" msgid "" "* Change the literal values in `foo` to match with the other patterns.\n" "* Add a new field to `Foo` and make changes to the pattern as needed.\n" -"* The distinction between a capture and a constant expression can be hard " -"to\n" -" spot. Try changing the `2` in the second arm to a variable, and see that " -"it subtly\n" +"* The distinction between a capture and a constant expression can be hard to\n" +" spot. Try changing the `2` in the second arm to a variable, and see that it subtly\n" " doesn't work. Change it to a `const` and see it working again." msgstr "" @@ -5495,8 +5147,7 @@ msgid "# Destructuring Arrays" msgstr "" #: src/pattern-matching/destructuring-arrays.md:3 -msgid "" -"You can destructure arrays, tuples, and slices by matching on their elements:" +msgid "You can destructure arrays, tuples, and slices by matching on their elements:" msgstr "" #: src/pattern-matching/destructuring-arrays.md:5 @@ -5517,8 +5168,7 @@ msgstr "" #: src/pattern-matching/destructuring-arrays.md:21 msgid "" -"* Destructuring of slices of unknown length also works with patterns of " -"fixed length.\n" +"* Destructuring of slices of unknown length also works with patterns of fixed length.\n" "\n" "\n" " ```rust,editable\n" @@ -5532,8 +5182,7 @@ msgid "" " println!(\"Tell me about {slice:?}\");\n" " match slice {\n" " &[0, y, z] => println!(\"First is 0, y = {y}, and z = {z}\"),\n" -" &[1, ..] => println!(\"First is 1 and the rest were " -"ignored\"),\n" +" &[1, ..] => println!(\"First is 1 and the rest were ignored\"),\n" " _ => println!(\"All elements were ignored\"),\n" " }\n" " }\n" @@ -5541,8 +5190,7 @@ msgid "" " \n" "* Create a new pattern using `_` to represent an element. \n" "* Add more values to the array.\n" -"* Point out that how `..` will expand to account for different number of " -"elements.\n" +"* Point out that how `..` will expand to account for different number of elements.\n" "* Show matching against the tail with patterns `[.., b]` and `[a@..,b]`" msgstr "" @@ -5552,8 +5200,7 @@ msgstr "" #: src/pattern-matching/match-guards.md:3 msgid "" -"When matching, you can add a _guard_ to a pattern. This is an arbitrary " -"Boolean\n" +"When matching, you can add a _guard_ to a pattern. This is an arbitrary Boolean\n" "expression which will be executed if the pattern matches:" msgstr "" @@ -5576,17 +5223,14 @@ msgstr "" #: src/pattern-matching/match-guards.md:23 msgid "" -"* Match guards as a separate syntax feature are important and necessary when " -"we wish to concisely express more complex ideas than patterns alone would " -"allow.\n" -"* They are not the same as separate `if` expression inside of the match arm. " -"An `if` expression inside of the branch block (after `=>`) happens after the " -"match arm is selected. Failing the `if` condition inside of that block won't " -"result in other arms\n" +"* Match guards as a separate syntax feature are important and necessary when we wish to concisely " +"express more complex ideas than patterns alone would allow.\n" +"* They are not the same as separate `if` expression inside of the match arm. An `if` expression " +"inside of the branch block (after `=>`) happens after the match arm is selected. Failing the `if` " +"condition inside of that block won't result in other arms\n" "of the original `match` expression being considered. \n" "* You can use the variables defined in the pattern in your if expression.\n" -"* The condition defined in the guard applies to every expression in a " -"pattern with an `|`." +"* The condition defined in the guard applies to every expression in a pattern with an `|`." msgstr "" #: src/exercises/day-2/morning.md:1 @@ -5610,23 +5254,20 @@ msgstr "" #: src/exercises/day-2/health-statistics.md:3 msgid "" -"You're working on implementing a health-monitoring system. As part of that, " -"you\n" +"You're working on implementing a health-monitoring system. As part of that, you\n" "need to keep track of users' health statistics." msgstr "" #: src/exercises/day-2/health-statistics.md:6 msgid "" -"You'll start with some stubbed functions in an `impl` block as well as a " -"`User`\n" +"You'll start with some stubbed functions in an `impl` block as well as a `User`\n" "struct definition. Your goal is to implement the stubbed out methods on the\n" "`User` `struct` defined in the `impl` block." msgstr "" #: src/exercises/day-2/health-statistics.md:10 msgid "" -"Copy the code below to and fill in the " -"missing\n" +"Copy the code below to and fill in the missing\n" "methods:" msgstr "" @@ -5695,10 +5336,8 @@ msgstr "" #: src/exercises/day-2/points-polygons.md:3 msgid "" -"We will create a `Polygon` struct which contain some points. Copy the code " -"below\n" -"to and fill in the missing methods to make " -"the\n" +"We will create a `Polygon` struct which contain some points. Copy the code below\n" +"to and fill in the missing methods to make the\n" "tests pass:" msgstr "" @@ -5815,10 +5454,8 @@ msgstr "" #: src/exercises/day-2/points-polygons.md:117 msgid "" -"Since the method signatures are missing from the problem statements, the key " -"part\n" -"of the exercise is to specify those correctly. You don't have to modify the " -"tests." +"Since the method signatures are missing from the problem statements, the key part\n" +"of the exercise is to specify those correctly. You don't have to modify the tests." msgstr "" #: src/exercises/day-2/points-polygons.md:120 @@ -5827,10 +5464,10 @@ msgstr "" #: src/exercises/day-2/points-polygons.md:122 msgid "" -"* Derive a `Copy` trait for some structs, as in tests the methods sometimes " -"don't borrow their arguments.\n" -"* Discover that `Add` trait must be implemented for two objects to be " -"addable via \"+\". Note that we do not discuss generics until Day 3." +"* Derive a `Copy` trait for some structs, as in tests the methods sometimes don't borrow their " +"arguments.\n" +"* Discover that `Add` trait must be implemented for two objects to be addable via \"+\". Note that " +"we do not discuss generics until Day 3." msgstr "" #: src/control-flow.md:1 @@ -5840,10 +5477,8 @@ msgstr "" #: src/control-flow.md:3 msgid "" "As we have seen, `if` is an expression in Rust. It is used to conditionally\n" -"evaluate one of two blocks, but the blocks can have a value which then " -"becomes\n" -"the value of the `if` expression. Other control flow expressions work " -"similarly\n" +"evaluate one of two blocks, but the blocks can have a value which then becomes\n" +"the value of the `if` expression. Other control flow expressions work similarly\n" "in Rust." msgstr "" @@ -5853,8 +5488,7 @@ msgstr "" #: src/control-flow/blocks.md:3 msgid "" -"A block in Rust has a value and a type: the value is the last expression of " -"the\n" +"A block in Rust has a value and a type: the value is the last expression of the\n" "block:" msgstr "" @@ -5900,18 +5534,14 @@ msgid "" msgstr "" #: src/control-flow/blocks.md:38 -msgid "" -"However if the last expression ends with `;`, then the resulting value and " -"type is `()`." +msgid "However if the last expression ends with `;`, then the resulting value and type is `()`." msgstr "" #: src/control-flow/blocks.md:43 msgid "" -"* The point of this slide is to show that blocks have a type and value in " -"Rust. \n" -"* You can show how the value of the block changes by changing the last line " -"in the block. For instance, adding/removing a semicolon or using a " -"`return`.\n" +"* The point of this slide is to show that blocks have a type and value in Rust. \n" +"* You can show how the value of the block changes by changing the last line in the block. For " +"instance, adding/removing a semicolon or using a `return`.\n" " " msgstr "" @@ -5922,8 +5552,7 @@ msgstr "" #: src/control-flow/if-expressions.md:3 msgid "" "You use [`if`\n" -"expressions](https://doc.rust-lang.org/reference/expressions/if-expr.html#if-" -"expressions)\n" +"expressions](https://doc.rust-lang.org/reference/expressions/if-expr.html#if-expressions)\n" "exactly like `if` statements in other languages:" msgstr "" @@ -5963,9 +5592,8 @@ msgstr "" #: src/control-flow/if-expressions.md:35 msgid "" -"Because `if` is an expression and must have a particular type, both of its " -"branch blocks must have the same type. Consider showing what happens if you " -"add `;` after `x / 2` in the second example." +"Because `if` is an expression and must have a particular type, both of its branch blocks must have " +"the same type. Consider showing what happens if you add `;` after `x / 2` in the second example." msgstr "" #: src/control-flow/if-let-expressions.md:1 @@ -5975,10 +5603,8 @@ msgstr "" #: src/control-flow/if-let-expressions.md:3 msgid "" "The [`if let`\n" -"expression](https://doc.rust-lang.org/reference/expressions/if-expr.html#if-" -"let-expressions)\n" -"lets you execute different code depending on whether a value matches a " -"pattern:" +"expression](https://doc.rust-lang.org/reference/expressions/if-expr.html#if-let-expressions)\n" +"lets you execute different code depending on whether a value matches a pattern:" msgstr "" #: src/control-flow/if-let-expressions.md:7 @@ -5995,26 +5621,22 @@ msgid "" "```" msgstr "" -#: src/control-flow/if-let-expressions.md:18 -#: src/control-flow/while-let-expressions.md:21 +#: src/control-flow/if-let-expressions.md:18 src/control-flow/while-let-expressions.md:21 #: src/control-flow/match-expressions.md:23 msgid "" -"See [pattern matching](../pattern-matching.md) for more details on patterns " -"in\n" +"See [pattern matching](../pattern-matching.md) for more details on patterns in\n" "Rust." msgstr "" #: src/control-flow/if-let-expressions.md:23 msgid "" -"* `if let` can be more concise than `match`, e.g., when only one case is " -"interesting. In contrast, `match` requires all branches to be covered.\n" +"* `if let` can be more concise than `match`, e.g., when only one case is interesting. In contrast, " +"`match` requires all branches to be covered.\n" "* A common usage is handling `Some` values when working with `Option`.\n" -"* Unlike `match`, `if let` does not support guard clauses for pattern " -"matching.\n" -"* Since 1.65, a similar [let-else](https://doc.rust-lang.org/rust-by-example/" -"flow_control/let_else.html) construct allows to do a destructuring " -"assignment, or if it fails, have a non-returning block branch (panic/return/" -"break/continue):\n" +"* Unlike `match`, `if let` does not support guard clauses for pattern matching.\n" +"* Since 1.65, a similar [let-else](https://doc.rust-lang.org/rust-by-example/flow_control/let_else." +"html) construct allows to do a destructuring assignment, or if it fails, have a non-returning " +"block branch (panic/return/break/continue):\n" "\n" " ```rust,editable\n" " fn main() {\n" @@ -6036,8 +5658,8 @@ msgstr "" #: src/control-flow/while-expressions.md:3 msgid "" -"The [`while` keyword](https://doc.rust-lang.org/reference/expressions/loop-" -"expr.html#predicate-loops)\n" +"The [`while` keyword](https://doc.rust-lang.org/reference/expressions/loop-expr.html#predicate-" +"loops)\n" "works very similar to other languages:" msgstr "" @@ -6064,8 +5686,8 @@ msgstr "" #: src/control-flow/while-let-expressions.md:3 msgid "" -"Like with `if let`, there is a [`while let`](https://doc.rust-lang.org/" -"reference/expressions/loop-expr.html#predicate-pattern-loops)\n" +"Like with `if let`, there is a [`while let`](https://doc.rust-lang.org/reference/expressions/loop-" +"expr.html#predicate-pattern-loops)\n" "variant which repeatedly tests a value against a pattern:" msgstr "" @@ -6085,20 +5707,17 @@ msgstr "" #: src/control-flow/while-let-expressions.md:17 msgid "" -"Here the iterator returned by `v.iter()` will return a `Option` on " -"every\n" -"call to `next()`. It returns `Some(x)` until it is done, after which it " -"will\n" +"Here the iterator returned by `v.iter()` will return a `Option` on every\n" +"call to `next()`. It returns `Some(x)` until it is done, after which it will\n" "return `None`. The `while let` lets us keep iterating through all items." msgstr "" #: src/control-flow/while-let-expressions.md:26 msgid "" -"* Point out that the `while let` loop will keep going as long as the value " -"matches the pattern.\n" -"* You could rewrite the `while let` loop as an infinite loop with an if " -"statement that breaks when there is no value to unwrap for `iter.next()`. " -"The `while let` provides syntactic sugar for the above scenario.\n" +"* Point out that the `while let` loop will keep going as long as the value matches the pattern.\n" +"* You could rewrite the `while let` loop as an infinite loop with an if statement that breaks when " +"there is no value to unwrap for `iter.next()`. The `while let` provides syntactic sugar for the " +"above scenario.\n" " " msgstr "" @@ -6138,10 +5757,9 @@ msgstr "" msgid "" "* Index iteration is not a special syntax in Rust for just that case.\n" "* `(0..10)` is a range that implements an `Iterator` trait. \n" -"* `step_by` is a method that returns another `Iterator` that skips every " -"other element. \n" -"* Modify the elements in the vector and explain the compiler errors. Change " -"vector `v` to be mutable and the for loop to `for x in v.iter_mut()`." +"* `step_by` is a method that returns another `Iterator` that skips every other element. \n" +"* Modify the elements in the vector and explain the compiler errors. Change vector `v` to be " +"mutable and the for loop to `for x in v.iter_mut()`." msgstr "" #: src/control-flow/loop-expressions.md:1 @@ -6150,8 +5768,8 @@ msgstr "" #: src/control-flow/loop-expressions.md:3 msgid "" -"Finally, there is a [`loop` keyword](https://doc.rust-lang.org/reference/" -"expressions/loop-expr.html#infinite-loops)\n" +"Finally, there is a [`loop` keyword](https://doc.rust-lang.org/reference/expressions/loop-expr." +"html#infinite-loops)\n" "which creates an endless loop." msgstr "" @@ -6182,10 +5800,8 @@ msgstr "" #: src/control-flow/loop-expressions.md:27 msgid "" "* Break the `loop` with a value (e.g. `break 8`) and print it out.\n" -"* Note that `loop` is the only looping construct which returns a non-" -"trivial\n" -" value. This is because it's guaranteed to be entered at least once " -"(unlike\n" +"* Note that `loop` is the only looping construct which returns a non-trivial\n" +" value. This is because it's guaranteed to be entered at least once (unlike\n" " `while` and `for` loops)." msgstr "" @@ -6195,10 +5811,8 @@ msgstr "" #: src/control-flow/match-expressions.md:3 msgid "" -"The [`match` keyword](https://doc.rust-lang.org/reference/expressions/match-" -"expr.html)\n" -"is used to match a value against one or more patterns. In that sense, it " -"works\n" +"The [`match` keyword](https://doc.rust-lang.org/reference/expressions/match-expr.html)\n" +"is used to match a value against one or more patterns. In that sense, it works\n" "like a series of `if let` expressions:" msgstr "" @@ -6228,12 +5842,11 @@ msgstr "" msgid "" "* Save the match expression to a variable and print it out.\n" "* Remove `.as_deref()` and explain the error.\n" -" * `std::env::args().next()` returns an `Option`, but we cannot " -"match against `String`.\n" -" * `as_deref()` transforms an `Option` to `Option<&T::Target>`. In our " -"case, this turns `Option` into `Option<&str>`.\n" -" * We can now use pattern matching to match against the `&str` inside " -"`Option`." +" * `std::env::args().next()` returns an `Option`, but we cannot match against " +"`String`.\n" +" * `as_deref()` transforms an `Option` to `Option<&T::Target>`. In our case, this turns " +"`Option` into `Option<&str>`.\n" +" * We can now use pattern matching to match against the `&str` inside `Option`." msgstr "" #: src/control-flow/break-continue.md:1 @@ -6242,17 +5855,16 @@ msgstr "" #: src/control-flow/break-continue.md:3 msgid "" -"- If you want to exit a loop early, use [`break`](https://doc.rust-lang.org/" -"reference/expressions/loop-expr.html#break-expressions),\n" +"- If you want to exit a loop early, use [`break`](https://doc.rust-lang.org/reference/expressions/" +"loop-expr.html#break-expressions),\n" "- If you want to immediately start\n" -"the next iteration use [`continue`](https://doc.rust-lang.org/reference/" -"expressions/loop-expr.html#continue-expressions)." +"the next iteration use [`continue`](https://doc.rust-lang.org/reference/expressions/loop-expr." +"html#continue-expressions)." msgstr "" #: src/control-flow/break-continue.md:7 msgid "" -"Both `continue` and `break` can optionally take a label argument which is " -"used\n" +"Both `continue` and `break` can optionally take a label argument which is used\n" "to break out of nested loops:" msgstr "" @@ -6278,8 +5890,7 @@ msgid "" msgstr "" #: src/control-flow/break-continue.md:28 -msgid "" -"In this case we break the outer loop after 3 iterations of the inner loop." +msgid "In this case we break the outer loop after 3 iterations of the inner loop." msgstr "" #: src/std.md:1 @@ -6288,10 +5899,8 @@ msgstr "" #: src/std.md:3 msgid "" -"Rust comes with a standard library which helps establish a set of common " -"types\n" -"used by Rust library and programs. This way, two libraries can work " -"together\n" +"Rust comes with a standard library which helps establish a set of common types\n" +"used by Rust library and programs. This way, two libraries can work together\n" "smoothly because they both use the same `String` type." msgstr "" @@ -6301,8 +5910,7 @@ msgstr "" #: src/std.md:9 msgid "" -"* [`Option` and `Result`](std/option-result.md) types: used for optional " -"values\n" +"* [`Option` and `Result`](std/option-result.md) types: used for optional values\n" " and [error handling](error-handling.md).\n" "\n" "* [`String`](std/string.md): the default string type used for owned data.\n" @@ -6314,19 +5922,15 @@ msgid "" "\n" "* [`Box`](std/box.md): an owned pointer for heap-allocated data.\n" "\n" -"* [`Rc`](std/rc.md): a shared reference-counted pointer for heap-allocated " -"data." +"* [`Rc`](std/rc.md): a shared reference-counted pointer for heap-allocated data." msgstr "" #: src/std.md:25 msgid "" -" * In fact, Rust contains several layers of the Standard Library: `core`, " -"`alloc` and `std`. \n" -" * `core` includes the most basic types and functions that don't depend on " -"`libc`, allocator or\n" +" * In fact, Rust contains several layers of the Standard Library: `core`, `alloc` and `std`. \n" +" * `core` includes the most basic types and functions that don't depend on `libc`, allocator or\n" " even the presence of an operating system. \n" -" * `alloc` includes types which require a global heap allocator, such as " -"`Vec`, `Box` and `Arc`.\n" +" * `alloc` includes types which require a global heap allocator, such as `Vec`, `Box` and `Arc`.\n" " * Embedded Rust applications often only use `core`, and sometimes `alloc`." msgstr "" @@ -6356,12 +5960,10 @@ msgstr "" msgid "" "* `Option` and `Result` are widely used not just in the standard library.\n" "* `Option<&T>` has zero space overhead compared to `&T`.\n" -"* `Result` is the standard type to implement error handling as we will see " -"on Day 3.\n" +"* `Result` is the standard type to implement error handling as we will see on Day 3.\n" "* `binary_search` returns `Result`.\n" " * If found, `Result::Ok` holds the index where the element is found.\n" -" * Otherwise, `Result::Err` contains the index where such an element should " -"be inserted." +" * Otherwise, `Result::Err` contains the index where such an element should be inserted." msgstr "" #: src/std/string.md:1 @@ -6369,8 +5971,7 @@ msgid "# String" msgstr "" #: src/std/string.md:3 -msgid "" -"[`String`][1] is the standard heap-allocated growable UTF-8 string buffer:" +msgid "[`String`][1] is the standard heap-allocated growable UTF-8 string buffer:" msgstr "" #: src/std/string.md:5 @@ -6395,36 +5996,30 @@ msgstr "" #: src/std/string.md:22 msgid "" -"`String` implements [`Deref`][2], which means that you can " -"call all\n" +"`String` implements [`Deref`][2], which means that you can call all\n" "`str` methods on a `String`." msgstr "" #: src/std/string.md:30 msgid "" -"* `String::new` returns a new empty string, use `String::with_capacity` when " -"you know how much data you want to push to the string.\n" -"* `String::len` returns the size of the `String` in bytes (which can be " -"different from its length in characters).\n" -"* `String::chars` returns an iterator over the actual characters. Note that " -"a `char` can be different from what a human will consider a \"character\" " -"due to [grapheme clusters](https://docs.rs/unicode-segmentation/latest/" -"unicode_segmentation/struct.Graphemes.html).\n" -"* When people refer to strings they could either be talking about `&str` or " -"`String`. \n" -"* When a type implements `Deref`, the compiler will let you " -"transparently call methods from `T`.\n" -" * `String` implements `Deref` which transparently gives it " -"access to `str`'s methods.\n" +"* `String::new` returns a new empty string, use `String::with_capacity` when you know how much " +"data you want to push to the string.\n" +"* `String::len` returns the size of the `String` in bytes (which can be different from its length " +"in characters).\n" +"* `String::chars` returns an iterator over the actual characters. Note that a `char` can be " +"different from what a human will consider a \"character\" due to [grapheme clusters](https://docs." +"rs/unicode-segmentation/latest/unicode_segmentation/struct.Graphemes.html).\n" +"* When people refer to strings they could either be talking about `&str` or `String`. \n" +"* When a type implements `Deref`, the compiler will let you transparently call methods " +"from `T`.\n" +" * `String` implements `Deref` which transparently gives it access to `str`'s " +"methods.\n" " * Write and compare `let s3 = s1.deref();` and `let s3 = &*s1`;.\n" -"* `String` is implemented as a wrapper around a vector of bytes, many of the " -"operations you see supported on vectors are also supported on `String`, but " -"with some extra guarantees.\n" +"* `String` is implemented as a wrapper around a vector of bytes, many of the operations you see " +"supported on vectors are also supported on `String`, but with some extra guarantees.\n" "* Compare the different ways to index a `String`:\n" -" * To a character by using `s3.chars().nth(i).unwrap()` where `i` is in-" -"bound, out-of-bounds.\n" -" * To a substring by using `s3[0..4]`, where that slice is on character " -"boundaries or not." +" * To a character by using `s3.chars().nth(i).unwrap()` where `i` is in-bound, out-of-bounds.\n" +" * To a substring by using `s3[0..4]`, where that slice is on character boundaries or not." msgstr "" #: src/std/vec.md:1 @@ -6464,29 +6059,24 @@ msgstr "" #: src/std/vec.md:29 msgid "" -"`Vec` implements [`Deref`][2], which means that you can call " -"slice\n" +"`Vec` implements [`Deref`][2], which means that you can call slice\n" "methods on a `Vec`." msgstr "" #: src/std/vec.md:37 msgid "" -"* `Vec` is a type of collection, along with `String` and `HashMap`. The data " -"it contains is stored\n" -" on the heap. This means the amount of data doesn't need to be known at " -"compile time. It can grow\n" +"* `Vec` is a type of collection, along with `String` and `HashMap`. The data it contains is " +"stored\n" +" on the heap. This means the amount of data doesn't need to be known at compile time. It can " +"grow\n" " or shrink at runtime.\n" -"* Notice how `Vec` is a generic type too, but you don't have to specify " -"`T` explicitly. As always\n" -" with Rust type inference, the `T` was established during the first `push` " -"call.\n" -"* `vec![...]` is a canonical macro to use instead of `Vec::new()` and it " -"supports adding initial\n" +"* Notice how `Vec` is a generic type too, but you don't have to specify `T` explicitly. As " +"always\n" +" with Rust type inference, the `T` was established during the first `push` call.\n" +"* `vec![...]` is a canonical macro to use instead of `Vec::new()` and it supports adding initial\n" " elements to the vector.\n" -"* To index the vector you use `[` `]`, but they will panic if out of bounds. " -"Alternatively, using\n" -" `get` will return an `Option`. The `pop` function will remove the last " -"element.\n" +"* To index the vector you use `[` `]`, but they will panic if out of bounds. Alternatively, using\n" +" `get` will return an `Option`. The `pop` function will remove the last element.\n" "* Show iterating over a vector and mutating the value:\n" " `for e in &mut v { *e += 50; }`" msgstr "" @@ -6506,8 +6096,7 @@ msgid "" "\n" "fn main() {\n" " let mut page_counts = HashMap::new();\n" -" page_counts.insert(\"Adventures of Huckleberry Finn\".to_string(), " -"207);\n" +" page_counts.insert(\"Adventures of Huckleberry Finn\".to_string(), 207);\n" " page_counts.insert(\"Grimms' Fairy Tales\".to_string(), 751);\n" " page_counts.insert(\"Pride and Prejudice\".to_string(), 303);\n" "\n" @@ -6516,8 +6105,7 @@ msgid "" " page_counts.len());\n" " }\n" "\n" -" for book in [\"Pride and Prejudice\", \"Alice's Adventure in " -"Wonderland\"] {\n" +" for book in [\"Pride and Prejudice\", \"Alice's Adventure in Wonderland\"] {\n" " match page_counts.get(book) {\n" " Some(count) => println!(\"{book}: {count} pages\"),\n" " None => println!(\"{book} is unknown.\")\n" @@ -6525,10 +6113,8 @@ msgid "" " }\n" "\n" " // Use the .entry() method to insert a value if nothing is found.\n" -" for book in [\"Pride and Prejudice\", \"Alice's Adventure in " -"Wonderland\"] {\n" -" let page_count: &mut i32 = page_counts.entry(book.to_string())." -"or_insert(0);\n" +" for book in [\"Pride and Prejudice\", \"Alice's Adventure in Wonderland\"] {\n" +" let page_count: &mut i32 = page_counts.entry(book.to_string()).or_insert(0);\n" " *page_count += 1;\n" " }\n" "\n" @@ -6539,11 +6125,10 @@ msgstr "" #: src/std/hashmap.md:38 msgid "" -"* `HashMap` is not defined in the prelude and needs to be brought into " -"scope.\n" -"* Try the following lines of code. The first line will see if a book is in " -"the hashmap and if not return an alternative value. The second line will " -"insert the alternative value in the hashmap if the book is not found.\n" +"* `HashMap` is not defined in the prelude and needs to be brought into scope.\n" +"* Try the following lines of code. The first line will see if a book is in the hashmap and if not " +"return an alternative value. The second line will insert the alternative value in the hashmap if " +"the book is not found.\n" "\n" " ```rust,ignore\n" " let pc1 = page_counts\n" @@ -6554,8 +6139,8 @@ msgid "" " .or_insert(374);\n" " ```\n" "* Unlike `vec!`, there is unfortunately no standard `hashmap!` macro.\n" -" * Although, since Rust 1.56, HashMap implements [`From<[(K, V); N]>`][1], " -"which allows us to easily initialize a hash map from a literal array:\n" +" * Although, since Rust 1.56, HashMap implements [`From<[(K, V); N]>`][1], which allows us to " +"easily initialize a hash map from a literal array:\n" "\n" " ```rust,ignore\n" " let page_counts = HashMap::from([\n" @@ -6564,14 +6149,12 @@ msgid "" " ]);\n" " ```\n" "\n" -" * Alternatively HashMap can be built from any `Iterator` which yields key-" -"value tuples.\n" -"* We are showing `HashMap`, and avoid using `&str` as key to " -"make examples easier. Using references in collections can, of course, be " -"done,\n" +" * Alternatively HashMap can be built from any `Iterator` which yields key-value tuples.\n" +"* We are showing `HashMap`, and avoid using `&str` as key to make examples easier. " +"Using references in collections can, of course, be done,\n" " but it can lead into complications with the borrow checker.\n" -" * Try removing `to_string()` from the example above and see if it still " -"compiles. Where do you think we might run into issues?" +" * Try removing `to_string()` from the example above and see if it still compiles. Where do you " +"think we might run into issues?" msgstr "" #: src/std/box.md:1 @@ -6610,23 +6193,20 @@ msgstr "" #: src/std/box.md:26 msgid "" -"`Box` implements `Deref`, which means that you can [call " -"methods\n" +"`Box` implements `Deref`, which means that you can [call methods\n" "from `T` directly on a `Box`][2]." msgstr "" #: src/std/box.md:34 msgid "" -"* `Box` is like `std::unique_ptr` in C++, except that it's guaranteed to be " -"not null. \n" -"* In the above example, you can even leave out the `*` in the `println!` " -"statement thanks to `Deref`. \n" +"* `Box` is like `std::unique_ptr` in C++, except that it's guaranteed to be not null. \n" +"* In the above example, you can even leave out the `*` in the `println!` statement thanks to " +"`Deref`. \n" "* A `Box` can be useful when you:\n" -" * have a type whose size that can't be known at compile time, but the " -"Rust compiler wants to know an exact size.\n" -" * want to transfer ownership of a large amount of data. To avoid copying " -"large amounts of data on the stack, instead store the data on the heap in a " -"`Box` so only the pointer is moved." +" * have a type whose size that can't be known at compile time, but the Rust compiler wants to " +"know an exact size.\n" +" * want to transfer ownership of a large amount of data. To avoid copying large amounts of data " +"on the stack, instead store the data on the heap in a `Box` so only the pointer is moved." msgstr "" #: src/std/box-recursive.md:1 @@ -6634,8 +6214,7 @@ msgid "# Box with Recursive Data Structures" msgstr "" #: src/std/box-recursive.md:3 -msgid "" -"Recursive data types or data types with dynamic sizes need to use a `Box`:" +msgid "Recursive data types or data types with dynamic sizes need to use a `Box`:" msgstr "" #: src/std/box-recursive.md:5 src/std/box-niche.md:3 @@ -6648,8 +6227,7 @@ msgid "" "}\n" "\n" "fn main() {\n" -" let list: List = List::Cons(1, Box::new(List::Cons(2, Box::" -"new(List::Nil))));\n" +" let list: List = List::Cons(1, Box::new(List::Cons(2, Box::new(List::Nil))));\n" " println!(\"{list:?}\");\n" "}\n" "```" @@ -6659,38 +6237,30 @@ msgstr "" msgid "" "```bob\n" " Stack Heap\n" -".- - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - - " -"- -.\n" +".- - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - - - -.\n" ": : : :\n" -": " -"list : : :\n" -": +------+----+----+ : : +------+----+----+ +------+----+----" -"+ :\n" -": | Cons | 1 | o--+----+-----+--->| Cons | 2 | o--+--->| Nil | // | // " -"| :\n" -": +------+----+----+ : : +------+----+----+ +------+----+----" -"+ :\n" +": list : : :\n" +": +------+----+----+ : : +------+----+----+ +------+----+----+ :\n" +": | Cons | 1 | o--+----+-----+--->| Cons | 2 | o--+--->| Nil | // | // | :\n" +": +------+----+----+ : : +------+----+----+ +------+----+----+ :\n" ": : : :\n" ": : : :\n" -"'- - - - - - - - - - - - -' '- - - - - - - - - - - - - - - - - - - - - - " -"- -'\n" +"'- - - - - - - - - - - - -' '- - - - - - - - - - - - - - - - - - - - - - - -'\n" "```" msgstr "" #: src/std/box-recursive.md:33 msgid "" -"* If the `Box` was not used here and we attempted to embed a `List` directly " -"into the `List`,\n" -"the compiler would not compute a fixed size of the struct in memory, it " -"would look infinite.\n" +"* If the `Box` was not used here and we attempted to embed a `List` directly into the `List`,\n" +"the compiler would not compute a fixed size of the struct in memory, it would look infinite.\n" "\n" -"* `Box` solves this problem as it has the same size as a regular pointer and " -"just points at the next\n" +"* `Box` solves this problem as it has the same size as a regular pointer and just points at the " +"next\n" "element of the `List` in the heap.\n" "\n" -"* Remove the `Box` in the List definition and show the compiler error. " -"\"Recursive with indirection\" is a hint you might want to use a Box or " -"reference of some kind, instead of storing a value directly. \n" +"* Remove the `Box` in the List definition and show the compiler error. \"Recursive with " +"indirection\" is a hint you might want to use a Box or reference of some kind, instead of storing " +"a value directly. \n" " " msgstr "" @@ -6700,8 +6270,7 @@ msgstr "" #: src/std/box-niche.md:16 msgid "" -"A `Box` cannot be empty, so the pointer is always valid and non-`null`. " -"This\n" +"A `Box` cannot be empty, so the pointer is always valid and non-`null`. This\n" "allows the compiler to optimize the memory layout:" msgstr "" @@ -6709,21 +6278,15 @@ msgstr "" msgid "" "```bob\n" " Stack Heap\n" -".- - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - - " -"-.\n" +".- - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - - -.\n" ": : : :\n" -": " -"list : : :\n" -": +----+----+ : : +----+----+ +----+------" -"+ :\n" -": | 1 | o--+-----------+-----+--->| 2 | o--+--->| // | null " -"| :\n" -": +----+----+ : : +----+----+ +----+------" -"+ :\n" +": list : : :\n" +": +----+----+ : : +----+----+ +----+------+ :\n" +": | 1 | o--+-----------+-----+--->| 2 | o--+--->| // | null | :\n" +": +----+----+ : : +----+----+ +----+------+ :\n" ": : : :\n" ": : : :\n" -"`- - - - - - - - - - - - -' '- - - - - - - - - - - - - - - - - - - - - - " -"-'\n" +"`- - - - - - - - - - - - -' '- - - - - - - - - - - - - - - - - - - - - - -'\n" "```" msgstr "" @@ -6733,8 +6296,7 @@ msgstr "" #: src/std/rc.md:3 msgid "" -"[`Rc`][1] is a reference-counted shared pointer. Use this when you need to " -"refer\n" +"[`Rc`][1] is a reference-counted shared pointer. Use this when you need to refer\n" "to the same data from multiple places:" msgstr "" @@ -6755,30 +6317,26 @@ msgstr "" #: src/std/rc.md:18 msgid "" -"* If you need to mutate the data inside an `Rc`, you will need to wrap the " -"data in\n" +"* If you need to mutate the data inside an `Rc`, you will need to wrap the data in\n" " a type such as [`Cell` or `RefCell`][2].\n" "* See [`Arc`][3] if you are in a multi-threaded context.\n" -"* You can *downgrade* a shared pointer into a [`Weak`][4] pointer to create " -"cycles\n" +"* You can *downgrade* a shared pointer into a [`Weak`][4] pointer to create cycles\n" " that will get dropped." msgstr "" #: src/std/rc.md:31 msgid "" -"* `Rc`'s count ensures that its contained value is valid for as long as " -"there are references.\n" +"* `Rc`'s count ensures that its contained value is valid for as long as there are references.\n" "* Like C++'s `std::shared_ptr`.\n" -"* `Rc::clone` is cheap: it creates a pointer to the same allocation and " -"increases the reference count. Does not make a deep clone and can generally " -"be ignored when looking for performance issues in code.\n" -"* `make_mut` actually clones the inner value if necessary (\"clone-on-" -"write\") and returns a mutable reference.\n" +"* `Rc::clone` is cheap: it creates a pointer to the same allocation and increases the reference " +"count. Does not make a deep clone and can generally be ignored when looking for performance issues " +"in code.\n" +"* `make_mut` actually clones the inner value if necessary (\"clone-on-write\") and returns a " +"mutable reference.\n" "* Use `Rc::strong_count` to check the reference count.\n" -"* Compare the different datatypes mentioned. `Box` enables (im)mutable " -"borrows that are enforced at compile time. `RefCell` enables (im)mutable " -"borrows that are enforced at run time and will panic if it fails at " -"runtime.\n" +"* Compare the different datatypes mentioned. `Box` enables (im)mutable borrows that are enforced " +"at compile time. `RefCell` enables (im)mutable borrows that are enforced at run time and will " +"panic if it fails at runtime.\n" "* `Rc::downgrade` gives you a *weakly reference-counted* object to\n" " create cycles that will be dropped properly (likely in combination with\n" " `RefCell`)." @@ -6851,10 +6409,10 @@ msgstr "" #: src/modules.md:28 msgid "" -"* Packages provide functionality and include a `Cargo.toml` file that " -"describes how to build a bundle of 1+ crates.\n" -"* Crates are a tree of modules, where a binary crate creates an executable " -"and a library crate compiles to a library.\n" +"* Packages provide functionality and include a `Cargo.toml` file that describes how to build a " +"bundle of 1+ crates.\n" +"* Crates are a tree of modules, where a binary crate creates an executable and a library crate " +"compiles to a library.\n" "* Modules define organization, scope, and are the focus of this section." msgstr "" @@ -6870,8 +6428,7 @@ msgstr "" msgid "" "* Module items are private by default (hides implementation details).\n" "* Parent and sibling items are always visible.\n" -"* In other words, if an item is visible in module `foo`, it's visible in all " -"the\n" +"* In other words, if an item is visible in module `foo`, it's visible in all the\n" " descendants of `foo`." msgstr "" @@ -6911,18 +6468,16 @@ msgstr "" #: src/modules/visibility.md:41 msgid "" -"Additionally, there are advanced `pub(...)` specifiers to restrict the scope " -"of public visibility." +"Additionally, there are advanced `pub(...)` specifiers to restrict the scope of public visibility." msgstr "" #: src/modules/visibility.md:43 msgid "" -"* See the [Rust Reference](https://doc.rust-lang.org/reference/visibility-" -"and-privacy.html#pubin-path-pubcrate-pubsuper-and-pubself).\n" +"* See the [Rust Reference](https://doc.rust-lang.org/reference/visibility-and-privacy.html#pubin-" +"path-pubcrate-pubsuper-and-pubself).\n" "* Configuring `pub(crate)` visibility is a common pattern.\n" "* Less commonly, you can give visibility to a specific path.\n" -"* In any case, visibility must be granted to an ancestor module (and all of " -"its descendants)." +"* In any case, visibility must be granted to an ancestor module (and all of its descendants)." msgstr "" #: src/modules/paths.md:1 @@ -7005,16 +6560,14 @@ msgstr "" #: src/modules/filesystem.md:24 msgid "" -"Modules defined in files can be documented, too, using \"inner doc " -"comments\".\n" +"Modules defined in files can be documented, too, using \"inner doc comments\".\n" "These document the item that contains them -- in this case, a module." msgstr "" #: src/modules/filesystem.md:27 msgid "" "```rust,editable,compile_fail\n" -"//! This module implements the garden, including a highly performant " -"germination\n" +"//! This module implements the garden, including a highly performant germination\n" "//! implementation.\n" "\n" "// Re-export types from this module.\n" @@ -7031,8 +6584,8 @@ msgstr "" #: src/modules/filesystem.md:44 msgid "" -"* The change from `module/mod.rs` to `module.rs` doesn't preclude the use of " -"submodules in Rust 2018.\n" +"* The change from `module/mod.rs` to `module.rs` doesn't preclude the use of submodules in Rust " +"2018.\n" " (It was mandatory in Rust 2015.)\n" "\n" " The following is valid:\n" @@ -7045,12 +6598,10 @@ msgid "" " └── sub_module.rs\n" " ```\n" "\n" -"* The main reason for the change is to prevent many files named `mod.rs`, " -"which can be hard\n" +"* The main reason for the change is to prevent many files named `mod.rs`, which can be hard\n" " to distinguish in IDEs.\n" "\n" -"* Rust will look for modules in `modulename/mod.rs` and `modulename.rs`, but " -"this can be changed\n" +"* Rust will look for modules in `modulename/mod.rs` and `modulename.rs`, but this can be changed\n" " with a compiler directive:\n" "\n" " ```rust,ignore\n" @@ -7058,8 +6609,7 @@ msgid "" " mod some_module { }\n" " ```\n" "\n" -" This is useful, for example, if you would like to place tests for a module " -"in a file named\n" +" This is useful, for example, if you would like to place tests for a module in a file named\n" " `some_module_test.rs`, similar to the convention in Go." msgstr "" @@ -7077,10 +6627,8 @@ msgstr "" #: src/exercises/day-2/luhn.md:3 msgid "" -"The [Luhn algorithm](https://en.wikipedia.org/wiki/Luhn_algorithm) is used " -"to\n" -"validate credit card numbers. The algorithm takes a string as input and does " -"the\n" +"The [Luhn algorithm](https://en.wikipedia.org/wiki/Luhn_algorithm) is used to\n" +"validate credit card numbers. The algorithm takes a string as input and does the\n" "following to validate the credit card number:" msgstr "" @@ -7088,12 +6636,10 @@ msgstr "" msgid "" "* Ignore all spaces. Reject number with less than two digits.\n" "\n" -"* Moving from right to left, double every second digit: for the number " -"`1234`,\n" +"* Moving from right to left, double every second digit: for the number `1234`,\n" " we double `3` and `1`.\n" "\n" -"* After doubling a digit, sum the digits. So doubling `7` becomes `14` " -"which\n" +"* After doubling a digit, sum the digits. So doubling `7` becomes `14` which\n" " becomes `5`.\n" "\n" "* Sum all the undoubled and doubled digits.\n" @@ -7165,10 +6711,8 @@ msgstr "" #: src/exercises/day-2/strings-iterators.md:3 msgid "" -"In this exercise, you are implementing a routing component of a web server. " -"The\n" -"server is configured with a number of _path prefixes_ which are matched " -"against\n" +"In this exercise, you are implementing a routing component of a web server. The\n" +"server is configured with a number of _path prefixes_ which are matched against\n" "_request paths_. The path prefixes can contain a wildcard character which\n" "matches a full segment. See the unit tests below." msgstr "" @@ -7192,15 +6736,12 @@ msgid "" "#[test]\n" "fn test_matches_without_wildcard() {\n" " assert!(prefix_matches(\"/v1/publishers\", \"/v1/publishers\"));\n" -" assert!(prefix_matches(\"/v1/publishers\", \"/v1/publishers/" -"abc-123\"));\n" -" assert!(prefix_matches(\"/v1/publishers\", \"/v1/publishers/abc/" -"books\"));\n" +" assert!(prefix_matches(\"/v1/publishers\", \"/v1/publishers/abc-123\"));\n" +" assert!(prefix_matches(\"/v1/publishers\", \"/v1/publishers/abc/books\"));\n" "\n" " assert!(!prefix_matches(\"/v1/publishers\", \"/v1\"));\n" " assert!(!prefix_matches(\"/v1/publishers\", \"/v1/publishersBooks\"));\n" -" assert!(!prefix_matches(\"/v1/publishers\", \"/v1/parent/" -"publishers\"));\n" +" assert!(!prefix_matches(\"/v1/publishers\", \"/v1/parent/publishers\"));\n" "}\n" "\n" "#[test]\n" @@ -7218,8 +6759,7 @@ msgid "" " \"/v1/publishers/foo/books/book1\"\n" " ));\n" "\n" -" assert!(!prefix_matches(\"/v1/publishers/*/books\", \"/v1/" -"publishers\"));\n" +" assert!(!prefix_matches(\"/v1/publishers/*/books\", \"/v1/publishers\"));\n" " assert!(!prefix_matches(\n" " \"/v1/publishers/*/books\",\n" " \"/v1/publishers/foo/booksByAuthor\"\n" @@ -7241,8 +6781,7 @@ msgid "" "* Traits: deriving traits, default methods, and important standard library\n" " traits.\n" "\n" -"* Generics: generic data types, generic methods, monomorphization, and " -"trait\n" +"* Generics: generic data types, generic methods, monomorphization, and trait\n" " objects.\n" "\n" "* Error handling: panics, `Result`, and the try operator `?`.\n" @@ -7259,8 +6798,7 @@ msgstr "" #: src/generics.md:3 msgid "" -"Rust support generics, which lets you abstract an algorithm (such as " -"sorting)\n" +"Rust support generics, which lets you abstract an algorithm (such as sorting)\n" "over the types used in the algorithm." msgstr "" @@ -7327,14 +6865,13 @@ msgstr "" #: src/generics/methods.md:25 msgid "" -"* *Q:* Why `T` is specified twice in `impl Point {}`? Isn't that " -"redundant?\n" -" * This is because it is a generic implementation section for generic " -"type. They are independently generic.\n" +"* *Q:* Why `T` is specified twice in `impl Point {}`? Isn't that redundant?\n" +" * This is because it is a generic implementation section for generic type. They are " +"independently generic.\n" " * It means these methods are defined for any `T`.\n" " * It is possible to write `impl Point { .. }`. \n" -" * `Point` is still generic and you can use `Point`, but methods " -"in this block will only be available for `Point`." +" * `Point` is still generic and you can use `Point`, but methods in this block will only " +"be available for `Point`." msgstr "" #: src/generics/monomorphization.md:1 @@ -7381,8 +6918,7 @@ msgstr "" #: src/generics/monomorphization.md:31 msgid "" -"This is a zero-cost abstraction: you get exactly the same result as if you " -"had\n" +"This is a zero-cost abstraction: you get exactly the same result as if you had\n" "hand-coded the data structures without the abstraction." msgstr "" @@ -7391,8 +6927,7 @@ msgid "# Traits" msgstr "" #: src/traits.md:3 -msgid "" -"Rust lets you abstract over types with traits. They're similar to interfaces:" +msgid "Rust lets you abstract over types with traits. They're similar to interfaces:" msgstr "" #: src/traits.md:5 @@ -7416,8 +6951,7 @@ msgid "" "\n" "impl Pet for Cat {\n" " fn name(&self) -> String {\n" -" String::from(\"The cat\") // No name, cats won't respond to it " -"anyway.\n" +" String::from(\"The cat\") // No name, cats won't respond to it anyway.\n" " }\n" "}\n" "\n" @@ -7440,9 +6974,7 @@ msgid "# Trait Objects" msgstr "" #: src/traits/trait-objects.md:3 -msgid "" -"Trait objects allow for values of different types, for instance in a " -"collection:" +msgid "Trait objects allow for values of different types, for instance in a collection:" msgstr "" #: src/traits/trait-objects.md:5 @@ -7466,8 +6998,7 @@ msgid "" "\n" "impl Pet for Cat {\n" " fn name(&self) -> String {\n" -" String::from(\"The cat\") // No name, cats won't respond to it " -"anyway.\n" +" String::from(\"The cat\") // No name, cats won't respond to it anyway.\n" " }\n" "}\n" "\n" @@ -7491,70 +7022,45 @@ msgstr "" msgid "" "```bob\n" " Stack Heap\n" -".- - - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - " -"- -.\n" +".- - - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - - -.\n" ": : : :\n" -": " -"pets : : :\n" -": +-----------+-------+ : : +-----+-----" -"+ :\n" -": | ptr | o---+---+-----+-->| o o | o o " -"| :\n" -": | len | 2 | : : +-|-|-+-|-|-" -"+ :\n" -": | capacity | 2 | : : | | | | +---------------" -"+ :\n" -": +-----------+-------+ : : | | | '-->| name: \"Fido\" " -"| :\n" -": : : | | | +---------------" -"+ :\n" -"`- - - - - - - - - - - - - -' : | | " -"| :\n" -" : | | | +----------------------" -"+ : \n" -" : | | '---->| \"::name\" " -"| :\n" -" : | | +----------------------" -"+ : \n" -" : | " -"| : \n" -" : | | +-" -"+ : \n" -" : | '-->|" -"\\| : \n" -" : | +-" -"+ : \n" -" : " -"| : \n" -" : | +----------------------" -"+ : \n" -" : '---->| \"::name\" " -"| : \n" -" : +----------------------" -"+ :\n" +": pets : : :\n" +": +-----------+-------+ : : +-----+-----+ :\n" +": | ptr | o---+---+-----+-->| o o | o o | :\n" +": | len | 2 | : : +-|-|-+-|-|-+ :\n" +": | capacity | 2 | : : | | | | +---------------+ :\n" +": +-----------+-------+ : : | | | '-->| name: \"Fido\" | :\n" +": : : | | | +---------------+ :\n" +"`- - - - - - - - - - - - - -' : | | | :\n" +" : | | | +----------------------+ : \n" +" : | | '---->| \"::name\" | :\n" +" : | | +----------------------+ : \n" +" : | | : \n" +" : | | +-+ : \n" +" : | '-->|\\| : \n" +" : | +-+ : \n" +" : | : \n" +" : | +----------------------+ : \n" +" : '---->| \"::name\" | : \n" +" : +----------------------+ :\n" " : :\n" -" '- - - - - - - - - - - - - - - - - - - - - " -"- -'\n" +" '- - - - - - - - - - - - - - - - - - - - - - -'\n" "\n" "```" msgstr "" #: src/traits/trait-objects.md:72 msgid "" -"* Types that implement a given trait may be of different sizes. This makes " -"it impossible to have things like `Vec` in the example above.\n" -"* `dyn Pet` is a way to tell the compiler about a dynamically sized type " -"that implements `Pet`.\n" -"* In the example, `pets` holds *fat pointers* to objects that implement " -"`Pet`. The fat pointer consists of two components, a pointer to the actual " -"object and a pointer to the virtual method table for the `Pet` " -"implementation of that particular object.\n" +"* Types that implement a given trait may be of different sizes. This makes it impossible to have " +"things like `Vec` in the example above.\n" +"* `dyn Pet` is a way to tell the compiler about a dynamically sized type that implements `Pet`.\n" +"* In the example, `pets` holds *fat pointers* to objects that implement `Pet`. The fat pointer " +"consists of two components, a pointer to the actual object and a pointer to the virtual method " +"table for the `Pet` implementation of that particular object.\n" "* Compare these outputs in the above example:\n" " ```rust,ignore\n" -" println!(\"{} {}\", std::mem::size_of::(), std::mem::size_of::" -"());\n" -" println!(\"{} {}\", std::mem::size_of::<&Dog>(), std::mem::size_of::" -"<&Cat>());\n" +" println!(\"{} {}\", std::mem::size_of::(), std::mem::size_of::());\n" +" println!(\"{} {}\", std::mem::size_of::<&Dog>(), std::mem::size_of::<&Cat>());\n" " println!(\"{}\", std::mem::size_of::<&dyn Pet>());\n" " println!(\"{}\", std::mem::size_of::>());\n" " ```" @@ -7625,10 +7131,8 @@ msgstr "" #: src/traits/default-methods.md:32 msgid "" -"* Traits may specify pre-implemented (default) methods and methods that " -"users are required to\n" -" implement themselves. Methods with default implementations can rely on " -"required methods.\n" +"* Traits may specify pre-implemented (default) methods and methods that users are required to\n" +" implement themselves. Methods with default implementations can rely on required methods.\n" "\n" "* Move method `not_equal` to a new trait `NotEqual`.\n" "\n" @@ -7653,8 +7157,7 @@ msgid "" " }\n" " }\n" " ```\n" -" * With the blanket implementation, you no longer need `NotEqual` as a " -"super trait for `Equal`.\n" +" * With the blanket implementation, you no longer need `NotEqual` as a super trait for `Equal`.\n" " " msgstr "" @@ -7664,8 +7167,7 @@ msgstr "" #: src/traits/trait-bounds.md:3 msgid "" -"When working with generics, you often want to require the types to " -"implement\n" +"When working with generics, you often want to require the types to implement\n" "some trait, so that you can call this trait's methods." msgstr "" @@ -7721,8 +7223,8 @@ msgstr "" msgid "" "* It declutters the function signature if you have many parameters.\n" "* It has additional features making it more powerful.\n" -" * If someone asks, the extra feature is that the type on the left of \":" -"\" can be arbitrary, like `Option`.\n" +" * If someone asks, the extra feature is that the type on the left of \":\" can be arbitrary, " +"like `Option`.\n" " " msgstr "" @@ -7757,43 +7259,34 @@ msgid "* `impl Trait` allows you to work with types which you cannot name." msgstr "" #: src/traits/impl-trait.md:23 -msgid "" -"The meaning of `impl Trait` is a bit different in the different positions." +msgid "The meaning of `impl Trait` is a bit different in the different positions." msgstr "" #: src/traits/impl-trait.md:25 msgid "" -"* For a parameter, `impl Trait` is like an anonymous generic parameter with " -"a trait bound.\n" +"* For a parameter, `impl Trait` is like an anonymous generic parameter with a trait bound.\n" "\n" -"* For a return type, it means that the return type is some concrete type " -"that implements the trait,\n" -" without naming the type. This can be useful when you don't want to expose " -"the concrete type in a\n" +"* For a return type, it means that the return type is some concrete type that implements the " +"trait,\n" +" without naming the type. This can be useful when you don't want to expose the concrete type in " +"a\n" " public API.\n" "\n" -" Inference is hard in return position. A function returning `impl Foo` " -"picks\n" -" the concrete type it returns, without writing it out in the source. A " -"function\n" +" Inference is hard in return position. A function returning `impl Foo` picks\n" +" the concrete type it returns, without writing it out in the source. A function\n" " returning a generic type like `collect() -> B` can return any type\n" -" satisfying `B`, and the caller may need to choose one, such as with `let " -"x:\n" +" satisfying `B`, and the caller may need to choose one, such as with `let x:\n" " Vec<_> = foo.collect()` or with the turbofish, `foo.collect::>()`." msgstr "" #: src/traits/impl-trait.md:37 msgid "" -"This example is great, because it uses `impl Display` twice. It helps to " -"explain that\n" -"nothing here enforces that it is _the same_ `impl Display` type. If we used " -"a single \n" -"`T: Display`, it would enforce the constraint that input `T` and return `T` " -"type are the same type.\n" -"It would not work for this particular function, as the type we expect as " -"input is likely not\n" -"what `format!` returns. If we wanted to do the same via `: Display` syntax, " -"we'd need two\n" +"This example is great, because it uses `impl Display` twice. It helps to explain that\n" +"nothing here enforces that it is _the same_ `impl Display` type. If we used a single \n" +"`T: Display`, it would enforce the constraint that input `T` and return `T` type are the same " +"type.\n" +"It would not work for this particular function, as the type we expect as input is likely not\n" +"what `format!` returns. If we wanted to do the same via `: Display` syntax, we'd need two\n" "independent generic parameters." msgstr "" @@ -7802,9 +7295,7 @@ msgid "# Important Traits" msgstr "" #: src/traits/important-traits.md:3 -msgid "" -"We will now look at some of the most common traits of the Rust standard " -"library:" +msgid "We will now look at some of the most common traits of the Rust standard library:" msgstr "" #: src/traits/important-traits.md:5 @@ -7855,18 +7346,17 @@ msgstr "" #: src/traits/iterator.md:32 msgid "" -"* The `Iterator` trait implements many common functional programming " -"operations over collections \n" -" (e.g. `map`, `filter`, `reduce`, etc). This is the trait where you can " -"find all the documentation\n" -" about them. In Rust these functions should produce the code as efficient " -"as equivalent imperative\n" +"* The `Iterator` trait implements many common functional programming operations over collections \n" +" (e.g. `map`, `filter`, `reduce`, etc). This is the trait where you can find all the " +"documentation\n" +" about them. In Rust these functions should produce the code as efficient as equivalent " +"imperative\n" " implementations.\n" " \n" -"* `IntoIterator` is the trait that makes for loops work. It is implemented " -"by collection types such as\n" -" `Vec` and references to them such as `&Vec` and `&[T]`. Ranges also " -"implement it. This is why\n" +"* `IntoIterator` is the trait that makes for loops work. It is implemented by collection types " +"such as\n" +" `Vec` and references to them such as `&Vec` and `&[T]`. Ranges also implement it. This is " +"why\n" " you can iterate over a vector with `for i in some_vec { .. }` but\n" " `some_vec.next()` doesn't exist." msgstr "" @@ -7876,8 +7366,7 @@ msgid "# FromIterator" msgstr "" #: src/traits/from-iterator.md:3 -msgid "" -"[`FromIterator`][1] lets you build a collection from an [`Iterator`][2]." +msgid "[`FromIterator`][1] lets you build a collection from an [`Iterator`][2]." msgstr "" #: src/traits/from-iterator.md:5 @@ -7913,8 +7402,7 @@ msgid "# `From` and `Into`" msgstr "" #: src/traits/from-into.md:3 -msgid "" -"Types implement [`From`][1] and [`Into`][2] to facilitate type conversions:" +msgid "Types implement [`From`][1] and [`Into`][2] to facilitate type conversions:" msgstr "" #: src/traits/from-into.md:5 @@ -7931,8 +7419,7 @@ msgid "" msgstr "" #: src/traits/from-into.md:15 -msgid "" -"[`Into`][2] is automatically implemented when [`From`][1] is implemented:" +msgid "[`Into`][2] is automatically implemented when [`From`][1] is implemented:" msgstr "" #: src/traits/from-into.md:17 @@ -7950,12 +7437,11 @@ msgstr "" #: src/traits/from-into.md:29 msgid "" -"* That's why it is common to only implement `From`, as your type will get " -"`Into` implementation too.\n" -"* When declaring a function argument input type like \"anything that can be " -"converted into a `String`\", the rule is opposite, you should use `Into`.\n" -" Your function will accept types that implement `From` and those that " -"_only_ implement `Into`.\n" +"* That's why it is common to only implement `From`, as your type will get `Into` implementation " +"too.\n" +"* When declaring a function argument input type like \"anything that can be converted into a " +"`String`\", the rule is opposite, you should use `Into`.\n" +" Your function will accept types that implement `From` and those that _only_ implement `Into`.\n" " " msgstr "" @@ -7964,8 +7450,7 @@ msgid "# `Read` and `Write`" msgstr "" #: src/traits/read-write.md:3 -msgid "" -"Using [`Read`][1] and [`BufRead`][2], you can abstract over `u8` sources:" +msgid "Using [`Read`][1] and [`BufRead`][2], you can abstract over `u8` sources:" msgstr "" #: src/traits/read-write.md:5 @@ -8018,9 +7503,7 @@ msgid "# The `Drop` Trait" msgstr "" #: src/traits/drop.md:3 -msgid "" -"Values which implement [`Drop`][1] can specify code to run when they go out " -"of scope:" +msgid "Values which implement [`Drop`][1] can specify code to run when they go out of scope:" msgstr "" #: src/traits/drop.md:5 @@ -8060,8 +7543,7 @@ msgstr "" #: src/traits/drop.md:36 msgid "" "* Why doesn't `Drop::drop` take `self`?\n" -" * Short-answer: If it did, `std::mem::drop` would be called at the end " -"of\n" +" * Short-answer: If it did, `std::mem::drop` would be called at the end of\n" " the block, resulting in another call to `Drop::drop`, and a stack\n" " overflow!\n" "* Try replacing `drop(a)` with `a.drop()`." @@ -8113,16 +7595,14 @@ msgstr "" #: src/traits/default.md:40 msgid "" -" * It can be implemented directly or it can be derived via " -"`#[derive(Default)]`.\n" -" * Derived implementation will produce an instance where all fields are set " -"to their default values.\n" +" * It can be implemented directly or it can be derived via `#[derive(Default)]`.\n" +" * Derived implementation will produce an instance where all fields are set to their default " +"values.\n" " * This means all types in the struct must implement `Default` too.\n" -" * Standard Rust types often implement `Default` with reasonable values (e." -"g. `0`, `\"\"`, etc).\n" +" * Standard Rust types often implement `Default` with reasonable values (e.g. `0`, `\"\"`, etc).\n" " * The partial struct copy works nicely with default.\n" -" * Rust standard library is aware that types can implement `Default` and " -"provides convenience methods that use it." +" * Rust standard library is aware that types can implement `Default` and provides convenience " +"methods that use it." msgstr "" #: src/traits/operators.md:1 @@ -8157,18 +7637,14 @@ msgstr "" #: src/traits/operators.md:28 msgid "" -"* You could implement `Add` for `&Point`. In which situations is that " -"useful? \n" +"* You could implement `Add` for `&Point`. In which situations is that useful? \n" " * Answer: `Add:add` consumes `self`. If type `T` for which you are\n" -" overloading the operator is not `Copy`, you should consider " -"overloading\n" -" the operator for `&T` as well. This avoids unnecessary cloning on " -"the\n" +" overloading the operator is not `Copy`, you should consider overloading\n" +" the operator for `&T` as well. This avoids unnecessary cloning on the\n" " call site.\n" "* Why is `Output` an associated type? Could it be made a type parameter?\n" " * Short answer: Type parameters are controlled by the caller, but\n" -" associated types (like `Output`) are controlled by the implementor " -"of a\n" +" associated types (like `Output`) are controlled by the implementor of a\n" " trait." msgstr "" @@ -8178,8 +7654,7 @@ msgstr "" #: src/traits/closures.md:3 msgid "" -"Closures or lambda expressions have types which cannot be named. However, " -"they\n" +"Closures or lambda expressions have types which cannot be named. However, they\n" "implement special [`Fn`](https://doc.rust-lang.org/std/ops/trait.Fn.html),\n" "[`FnMut`](https://doc.rust-lang.org/std/ops/trait.FnMut.html), and\n" "[`FnOnce`](https://doc.rust-lang.org/std/ops/trait.FnOnce.html) traits:" @@ -8204,30 +7679,26 @@ msgid "" msgstr "" #: src/traits/closures.md:25 -msgid "" -"If you have an `FnOnce`, you may only call it once. It might consume " -"captured values." +msgid "If you have an `FnOnce`, you may only call it once. It might consume captured values." msgstr "" #: src/traits/closures.md:27 msgid "" -"An `FnMut` might mutate captured values, so you can call it multiple times " -"but not concurrently." +"An `FnMut` might mutate captured values, so you can call it multiple times but not concurrently." msgstr "" #: src/traits/closures.md:29 msgid "" -"An `Fn` neither consumes nor mutates captured values, or perhaps captures " -"nothing at all, so it can\n" +"An `Fn` neither consumes nor mutates captured values, or perhaps captures nothing at all, so it " +"can\n" "be called multiple times concurrently." msgstr "" #: src/traits/closures.md:32 msgid "" -"`FnMut` is a subtype of `FnOnce`. `Fn` is a subtype of `FnMut` and `FnOnce`. " -"I.e. you can use an\n" -"`FnMut` wherever an `FnOnce` is called for, and you can use an `Fn` wherever " -"an `FnMut` or `FnOnce`\n" +"`FnMut` is a subtype of `FnOnce`. `Fn` is a subtype of `FnMut` and `FnOnce`. I.e. you can use an\n" +"`FnMut` wherever an `FnOnce` is called for, and you can use an `Fn` wherever an `FnMut` or " +"`FnOnce`\n" "is called for." msgstr "" @@ -8380,8 +7851,7 @@ msgid "" "\n" "fn main() {\n" " let mut window = Window::new(\"Rust GUI Demo 1.23\");\n" -" window.add_widget(Box::new(Label::new(\"This is a small text GUI demo." -"\")));\n" +" window.add_widget(Box::new(Label::new(\"This is a small text GUI demo.\")));\n" " window.add_widget(Box::new(Button::new(\n" " \"Click me!\",\n" " Box::new(|| println!(\"You clicked the button!\")),\n" @@ -8411,8 +7881,7 @@ msgstr "" #: src/exercises/day-3/simple-gui.md:142 msgid "" "If you want to draw aligned text, you can use the\n" -"[fill/alignment](https://doc.rust-lang.org/std/fmt/index." -"html#fillalignment)\n" +"[fill/alignment](https://doc.rust-lang.org/std/fmt/index.html#fillalignment)\n" "formatting operators. In particular, notice how you can pad with different\n" "characters (here a `'/'`) and how you can control alignment:" msgstr "" @@ -8430,8 +7899,7 @@ msgid "" msgstr "" #: src/exercises/day-3/simple-gui.md:156 -msgid "" -"Using such alignment tricks, you can for example produce output like this:" +msgid "Using such alignment tricks, you can for example produce output like this:" msgstr "" #: src/exercises/day-3/simple-gui.md:158 @@ -8492,9 +7960,7 @@ msgid "# Catching the Stack Unwinding" msgstr "" #: src/error-handling/panic-unwind.md:3 -msgid "" -"By default, a panic will cause the stack to unwind. The unwinding can be " -"caught:" +msgid "By default, a panic will cause the stack to unwind. The unwinding can be caught:" msgstr "" #: src/error-handling/panic-unwind.md:5 @@ -8527,8 +7993,7 @@ msgstr "" #: src/error-handling/result.md:3 msgid "" -"We have already seen the `Result` enum. This is used pervasively when errors " -"are\n" +"We have already seen the `Result` enum. This is used pervasively when errors are\n" "expected as part of normal operation:" msgstr "" @@ -8556,16 +8021,14 @@ msgstr "" #: src/error-handling/result.md:27 msgid "" -" * As with `Option`, the successful value sits inside of `Result`, forcing " -"the developer to\n" -" explicitly extract it. This encourages error checking. In the case where " -"an error should never happen,\n" -" `unwrap()` or `expect()` can be called, and this is a signal of the " -"developer intent too. \n" -" * `Result` documentation is a recommended read. Not during the course, but " -"it is worth mentioning. \n" -" It contains a lot of convenience methods and functions that help " -"functional-style programming. \n" +" * As with `Option`, the successful value sits inside of `Result`, forcing the developer to\n" +" explicitly extract it. This encourages error checking. In the case where an error should never " +"happen,\n" +" `unwrap()` or `expect()` can be called, and this is a signal of the developer intent too. \n" +" * `Result` documentation is a recommended read. Not during the course, but it is worth " +"mentioning. \n" +" It contains a lot of convenience methods and functions that help functional-style " +"programming. \n" " " msgstr "" @@ -8575,8 +8038,7 @@ msgstr "" #: src/error-handling/try-operator.md:3 msgid "" -"The try-operator `?` is used to return errors to the caller. It lets you " -"turn\n" +"The try-operator `?` is used to return errors to the caller. It lets you turn\n" "the common" msgstr "" @@ -8633,12 +8095,11 @@ msgid "" "```" msgstr "" -#: src/error-handling/try-operator.md:50 -#: src/error-handling/converting-error-types-example.md:52 +#: src/error-handling/try-operator.md:50 src/error-handling/converting-error-types-example.md:52 msgid "" "* The `username` variable can be either `Ok(string)` or `Err(error)`.\n" -"* Use the `fs::write` call to test out the different scenarios: no file, " -"empty file, file with username." +"* Use the `fs::write` call to test out the different scenarios: no file, empty file, file with " +"username." msgstr "" #: src/error-handling/converting-error-types.md:1 @@ -8647,9 +8108,7 @@ msgid "# Converting Error Types" msgstr "" #: src/error-handling/converting-error-types.md:3 -msgid "" -"The effective expansion of `?` is a little more complicated than previously " -"indicated:" +msgid "The effective expansion of `?` is a little more complicated than previously indicated:" msgstr "" #: src/error-handling/converting-error-types.md:5 @@ -8675,8 +8134,7 @@ msgstr "" #: src/error-handling/converting-error-types.md:18 msgid "" -"The `From::from` call here means we attempt to convert the error type to " -"the\n" +"The `From::from` call here means we attempt to convert the error type to the\n" "type returned by the function:" msgstr "" @@ -8700,8 +8158,7 @@ msgid "" " fn fmt(&self, f: &mut Formatter) -> fmt::Result {\n" " match self {\n" " Self::IoError(e) => write!(f, \"IO error: {e}\"),\n" -" Self::EmptyUsername(filename) => write!(f, \"Found no username " -"in {filename}\"),\n" +" Self::EmptyUsername(filename) => write!(f, \"Found no username in {filename}\"),\n" " }\n" " }\n" "}\n" @@ -8731,12 +8188,11 @@ msgstr "" #: src/error-handling/converting-error-types-example.md:55 msgid "" -"It is good practice for all error types to implement `std::error::Error`, " -"which requires `Debug` and\n" -"`Display`. It's generally helpful for them to implement `Clone` and `Eq` too " -"where possible, to make\n" -"life easier for tests and consumers of your library. In this case we can't " -"easily do so, because\n" +"It is good practice for all error types to implement `std::error::Error`, which requires `Debug` " +"and\n" +"`Display`. It's generally helpful for them to implement `Clone` and `Eq` too where possible, to " +"make\n" +"life easier for tests and consumers of your library. In this case we can't easily do so, because\n" "`io::Error` doesn't implement them." msgstr "" @@ -8746,8 +8202,7 @@ msgstr "" #: src/error-handling/deriving-error-enums.md:3 msgid "" -"The [thiserror](https://docs.rs/thiserror/) crate is a popular way to create " -"an\n" +"The [thiserror](https://docs.rs/thiserror/) crate is a popular way to create an\n" "error enum like we did on the previous page:" msgstr "" @@ -8787,10 +8242,9 @@ msgstr "" #: src/error-handling/deriving-error-enums.md:39 msgid "" -"`thiserror`'s derive macro automatically implements `std::error::Error`, and " -"optionally `Display`\n" -"(if the `#[error(...)]` attributes are provided) and `From` (if the " -"`#[from]` attribute is added).\n" +"`thiserror`'s derive macro automatically implements `std::error::Error`, and optionally `Display`\n" +"(if the `#[error(...)]` attributes are provided) and `From` (if the `#[from]` attribute is " +"added).\n" "It also works for structs." msgstr "" @@ -8804,8 +8258,7 @@ msgstr "" #: src/error-handling/dynamic-errors.md:3 msgid "" -"Sometimes we want to allow any type of error to be returned without writing " -"our own enum covering\n" +"Sometimes we want to allow any type of error to be returned without writing our own enum covering\n" "all the different possibilities. `std::error::Error` makes this easy." msgstr "" @@ -8842,12 +8295,12 @@ msgstr "" #: src/error-handling/dynamic-errors.md:36 msgid "" -"This saves on code, but gives up the ability to cleanly handle different " -"error cases differently in\n" -"the program. As such it's generally not a good idea to use `Box` " -"in the public API of a\n" -"library, but it can be a good option in a program where you just want to " -"display the error message\n" +"This saves on code, but gives up the ability to cleanly handle different error cases differently " +"in\n" +"the program. As such it's generally not a good idea to use `Box` in the public API of " +"a\n" +"library, but it can be a good option in a program where you just want to display the error " +"message\n" "somewhere." msgstr "" @@ -8894,14 +8347,11 @@ msgstr "" #: src/error-handling/error-contexts.md:35 msgid "" "* `anyhow::Result` is a type alias for `Result`.\n" -"* `anyhow::Error` is essentially a wrapper around `Box`. As such " -"it's again generally not\n" -" a good choice for the public API of a library, but is widely used in " -"applications.\n" -"* Actual error type inside of it can be extracted for examination if " -"necessary.\n" -"* Functionality provided by `anyhow::Result` may be familiar to Go " -"developers, as it provides\n" +"* `anyhow::Error` is essentially a wrapper around `Box`. As such it's again generally " +"not\n" +" a good choice for the public API of a library, but is widely used in applications.\n" +"* Actual error type inside of it can be extracted for examination if necessary.\n" +"* Functionality provided by `anyhow::Result` may be familiar to Go developers, as it provides\n" " similar usage patterns and ergonomics to `(T, error)` from Go." msgstr "" @@ -9072,11 +8522,10 @@ msgstr "" #: src/testing/useful-crates.md:7 msgid "" -"* [googletest](https://docs.rs/googletest): Comprehensive test assertion " -"library in the tradition of GoogleTest for C++.\n" +"* [googletest](https://docs.rs/googletest): Comprehensive test assertion library in the tradition " +"of GoogleTest for C++.\n" "* [proptest](https://docs.rs/proptest): Property-based testing for Rust.\n" -"* [rstest](https://docs.rs/rstest): Support for fixtures and parameterised " -"tests." +"* [rstest](https://docs.rs/rstest): Support for fixtures and parameterised tests." msgstr "" #: src/unsafe.md:1 @@ -9090,21 +8539,18 @@ msgstr "" #: src/unsafe.md:5 msgid "" "* **Safe Rust:** memory safe, no undefined behavior possible.\n" -"* **Unsafe Rust:** can trigger undefined behavior if preconditions are " -"violated." +"* **Unsafe Rust:** can trigger undefined behavior if preconditions are violated." msgstr "" #: src/unsafe.md:8 msgid "" -"We will be seeing mostly safe Rust in this course, but it's important to " -"know\n" +"We will be seeing mostly safe Rust in this course, but it's important to know\n" "what Unsafe Rust is." msgstr "" #: src/unsafe.md:11 msgid "" -"Unsafe code is usually small and isolated, and its correctness should be " -"carefully\n" +"Unsafe code is usually small and isolated, and its correctness should be carefully\n" "documented. It is usually wrapped in a safe abstraction layer." msgstr "" @@ -9123,20 +8569,16 @@ msgstr "" #: src/unsafe.md:22 msgid "" -"We will briefly cover unsafe capabilities next. For full details, please " -"see\n" -"[Chapter 19.1 in the Rust Book](https://doc.rust-lang.org/book/ch19-01-" -"unsafe-rust.html)\n" +"We will briefly cover unsafe capabilities next. For full details, please see\n" +"[Chapter 19.1 in the Rust Book](https://doc.rust-lang.org/book/ch19-01-unsafe-rust.html)\n" "and the [Rustonomicon](https://doc.rust-lang.org/nomicon/)." msgstr "" #: src/unsafe.md:28 msgid "" -"Unsafe Rust does not mean the code is incorrect. It means that developers " -"have\n" +"Unsafe Rust does not mean the code is incorrect. It means that developers have\n" "turned off the compiler safety features and have to write correct code by\n" -"themselves. It means the compiler no longer enforces Rust's memory-safety " -"rules." +"themselves. It means the compiler no longer enforces Rust's memory-safety rules." msgstr "" #: src/unsafe/raw-pointers.md:1 @@ -9157,8 +8599,7 @@ msgid "" " let r2 = r1 as *const i32;\n" "\n" " // Safe because r1 and r2 were obtained from references and so are\n" -" // guaranteed to be non-null and properly aligned, the objects " -"underlying\n" +" // guaranteed to be non-null and properly aligned, the objects underlying\n" " // the references from which they were obtained are live throughout the\n" " // whole unsafe block, and they are not accessed either through the\n" " // references or concurrently through any other pointers.\n" @@ -9173,10 +8614,8 @@ msgstr "" #: src/unsafe/raw-pointers.md:27 msgid "" -"It is good practice (and required by the Android Rust style guide) to write " -"a comment for each\n" -"`unsafe` block explaining how the code inside it satisfies the safety " -"requirements of the unsafe\n" +"It is good practice (and required by the Android Rust style guide) to write a comment for each\n" +"`unsafe` block explaining how the code inside it satisfies the safety requirements of the unsafe\n" "operations it is doing." msgstr "" @@ -9189,12 +8628,10 @@ msgstr "" #: src/unsafe/raw-pointers.md:34 msgid "" " * The pointer must be non-null.\n" -" * The pointer must be _dereferenceable_ (within the bounds of a single " -"allocated object).\n" +" * The pointer must be _dereferenceable_ (within the bounds of a single allocated object).\n" " * The object must not have been deallocated.\n" " * There must not be concurrent accesses to the same location.\n" -" * If the pointer was obtained by casting a reference, the underlying object " -"must be live and no\n" +" * If the pointer was obtained by casting a reference, the underlying object must be live and no\n" " reference may be used to access the memory." msgstr "" @@ -9246,10 +8683,9 @@ msgstr "" #: src/unsafe/mutable-static-variables.md:32 msgid "" -"Using a mutable static is generally a bad idea, but there are some cases " -"where it might make sense\n" -"in low-level `no_std` code, such as implementing a heap allocator or working " -"with some C APIs." +"Using a mutable static is generally a bad idea, but there are some cases where it might make " +"sense\n" +"in low-level `no_std` code, such as implementing a heap allocator or working with some C APIs." msgstr "" #: src/unsafe/unions.md:1 @@ -9279,17 +8715,15 @@ msgstr "" #: src/unsafe/unions.md:21 msgid "" -"Unions are very rarely needed in Rust as you can usually use an enum. They " -"are occasionally needed\n" +"Unions are very rarely needed in Rust as you can usually use an enum. They are occasionally " +"needed\n" "for interacting with C library APIs." msgstr "" #: src/unsafe/unions.md:24 msgid "" -"If you just want to reinterpret bytes as a different type, you probably " -"want\n" -"[`std::mem::transmute`](https://doc.rust-lang.org/stable/std/mem/fn." -"transmute.html) or a safe\n" +"If you just want to reinterpret bytes as a different type, you probably want\n" +"[`std::mem::transmute`](https://doc.rust-lang.org/stable/std/mem/fn.transmute.html) or a safe\n" "wrapper such as the [`zerocopy`](https://crates.io/crates/zerocopy) crate." msgstr "" @@ -9299,8 +8733,7 @@ msgstr "" #: src/unsafe/calling-unsafe-functions.md:3 msgid "" -"A function or method can be marked `unsafe` if it has extra preconditions " -"you\n" +"A function or method can be marked `unsafe` if it has extra preconditions you\n" "must uphold to avoid undefined behaviour:" msgstr "" @@ -9310,8 +8743,7 @@ msgid "" "fn main() {\n" " let emojis = \"🗻∈🌏\";\n" "\n" -" // Safe because the indices are in the correct order, within the bounds " -"of\n" +" // Safe because the indices are in the correct order, within the bounds of\n" " // the string slice, and lie on UTF-8 sequence boundaries.\n" " unsafe {\n" " println!(\"emoji: {}\", emojis.get_unchecked(0..4));\n" @@ -9319,13 +8751,11 @@ msgid "" " println!(\"emoji: {}\", emojis.get_unchecked(7..11));\n" " }\n" "\n" -" println!(\"char count: {}\", count_chars(unsafe { emojis." -"get_unchecked(0..7) }));\n" +" println!(\"char count: {}\", count_chars(unsafe { emojis.get_unchecked(0..7) }));\n" "\n" " // Not upholding the UTF-8 encoding requirement breaks memory safety!\n" " // println!(\"emoji: {}\", unsafe { emojis.get_unchecked(0..3) });\n" -" // println!(\"char count: {}\", count_chars(unsafe { emojis." -"get_unchecked(0..3) }));\n" +" // println!(\"char count: {}\", count_chars(unsafe { emojis.get_unchecked(0..3) }));\n" "}\n" "\n" "fn count_chars(s: &str) -> usize {\n" @@ -9340,8 +8770,8 @@ msgstr "" #: src/unsafe/writing-unsafe-functions.md:3 msgid "" -"You can mark your own functions as `unsafe` if they require particular " -"conditions to avoid undefined\n" +"You can mark your own functions as `unsafe` if they require particular conditions to avoid " +"undefined\n" "behaviour." msgstr "" @@ -9374,17 +8804,13 @@ msgid "" msgstr "" #: src/unsafe/writing-unsafe-functions.md:33 -msgid "" -"We wouldn't actually use pointers for this because it can be done safely " -"with references." +msgid "We wouldn't actually use pointers for this because it can be done safely with references." msgstr "" #: src/unsafe/writing-unsafe-functions.md:35 msgid "" -"Note that unsafe code is allowed within an unsafe function without an " -"`unsafe` block. We can\n" -"prohibit this with `#[deny(unsafe_op_in_unsafe_fn)]`. Try adding it and see " -"what happens." +"Note that unsafe code is allowed within an unsafe function without an `unsafe` block. We can\n" +"prohibit this with `#[deny(unsafe_op_in_unsafe_fn)]`. Try adding it and see what happens." msgstr "" #: src/unsafe/extern-functions.md:1 @@ -9393,8 +8819,7 @@ msgstr "" #: src/unsafe/extern-functions.md:3 msgid "" -"Functions from other languages might violate the guarantees of Rust. " -"Calling\n" +"Functions from other languages might violate the guarantees of Rust. Calling\n" "them is thus unsafe:" msgstr "" @@ -9416,18 +8841,16 @@ msgstr "" #: src/unsafe/extern-functions.md:21 msgid "" -"This is usually only a problem for extern functions which do things with " -"pointers which might\n" -"violate Rust's memory model, but in general any C function might have " -"undefined behaviour under any\n" +"This is usually only a problem for extern functions which do things with pointers which might\n" +"violate Rust's memory model, but in general any C function might have undefined behaviour under " +"any\n" "arbitrary circumstances." msgstr "" #: src/unsafe/extern-functions.md:25 msgid "" "The `\"C\"` in this example is the ABI;\n" -"[other ABIs are available too](https://doc.rust-lang.org/reference/items/" -"external-blocks.html)." +"[other ABIs are available too](https://doc.rust-lang.org/reference/items/external-blocks.html)." msgstr "" #: src/unsafe/unsafe-traits.md:1 @@ -9436,16 +8859,14 @@ msgstr "" #: src/unsafe/unsafe-traits.md:3 msgid "" -"Like with functions, you can mark a trait as `unsafe` if the implementation " -"must guarantee\n" +"Like with functions, you can mark a trait as `unsafe` if the implementation must guarantee\n" "particular conditions to avoid undefined behaviour." msgstr "" #: src/unsafe/unsafe-traits.md:6 msgid "" "For example, the `zerocopy` crate has an unsafe trait that looks\n" -"[something like this](https://docs.rs/zerocopy/latest/zerocopy/trait.AsBytes." -"html):" +"[something like this](https://docs.rs/zerocopy/latest/zerocopy/trait.AsBytes.html):" msgstr "" #: src/unsafe/unsafe-traits.md:9 @@ -9460,8 +8881,7 @@ msgid "" "pub unsafe trait AsBytes {\n" " fn as_bytes(&self) -> &[u8] {\n" " unsafe {\n" -" slice::from_raw_parts(self as *const Self as *const u8, " -"size_of_val(self))\n" +" slice::from_raw_parts(self as *const Self as *const u8, size_of_val(self))\n" " }\n" " }\n" "}\n" @@ -9473,15 +8893,12 @@ msgstr "" #: src/unsafe/unsafe-traits.md:30 msgid "" -"There should be a `# Safety` section on the Rustdoc for the trait explaining " -"the requirements for\n" +"There should be a `# Safety` section on the Rustdoc for the trait explaining the requirements for\n" "the trait to be safely implemented." msgstr "" #: src/unsafe/unsafe-traits.md:33 -msgid "" -"The actual safety section for `AsBytes` is rather longer and more " -"complicated." +msgid "The actual safety section for `AsBytes` is rather longer and more complicated." msgstr "" #: src/unsafe/unsafe-traits.md:35 @@ -9524,22 +8941,17 @@ msgstr "" #: src/exercises/day-3/safe-ffi-wrapper.md:13 msgid "" -"You will also want to browse the [`std::ffi`] module. There you find a " -"number of\n" +"You will also want to browse the [`std::ffi`] module. There you find a number of\n" "string types which you need for the exercise:" msgstr "" #: src/exercises/day-3/safe-ffi-wrapper.md:16 msgid "" -"| Types | Encoding | " -"Use |\n" +"| Types | Encoding | Use |\n" "|----------------------------|----------------|--------------------------------|\n" -"| [`str`] and [`String`] | UTF-8 | Text processing in " -"Rust |\n" -"| [`CStr`] and [`CString`] | NUL-terminated | Communicating with C " -"functions |\n" -"| [`OsStr`] and [`OsString`] | OS-specific | Communicating with the " -"OS |" +"| [`str`] and [`String`] | UTF-8 | Text processing in Rust |\n" +"| [`CStr`] and [`CString`] | NUL-terminated | Communicating with C functions |\n" +"| [`OsStr`] and [`OsString`] | OS-specific | Communicating with the OS |" msgstr "" #: src/exercises/day-3/safe-ffi-wrapper.md:22 @@ -9548,19 +8960,14 @@ msgstr "" #: src/exercises/day-3/safe-ffi-wrapper.md:24 msgid "" -"- `&str` to `CString`: you need to allocate space for a trailing `\\0` " -"character,\n" +"- `&str` to `CString`: you need to allocate space for a trailing `\\0` character,\n" "- `CString` to `*const i8`: you need a pointer to call C functions,\n" -"- `*const i8` to `&CStr`: you need something which can find the trailing " -"`\\0` character,\n" -"- `&CStr` to `&[u8]`: a slice of bytes is the universal interface for \"some " -"unknow data\",\n" +"- `*const i8` to `&CStr`: you need something which can find the trailing `\\0` character,\n" +"- `&CStr` to `&[u8]`: a slice of bytes is the universal interface for \"some unknow data\",\n" "- `&[u8]` to `&OsStr`: `&OsStr` is a step towards `OsString`, use\n" -" [`OsStrExt`](https://doc.rust-lang.org/std/os/unix/ffi/trait.OsStrExt." -"html)\n" +" [`OsStrExt`](https://doc.rust-lang.org/std/os/unix/ffi/trait.OsStrExt.html)\n" " to create it,\n" -"- `&OsStr` to `OsString`: you need to clone the data in `&OsStr` to be able " -"to return it and call\n" +"- `&OsStr` to `OsString`: you need to clone the data in `&OsStr` to be able to return it and call\n" " `readdir` again." msgstr "" @@ -9570,8 +8977,7 @@ msgstr "" #: src/exercises/day-3/safe-ffi-wrapper.md:45 msgid "" -"Copy the code below to and fill in the " -"missing\n" +"Copy the code below to and fill in the missing\n" "functions and methods:" msgstr "" @@ -9590,12 +8996,10 @@ msgid "" " #[repr(C)]\n" " pub struct DIR {\n" " _data: [u8; 0],\n" -" _marker: core::marker::PhantomData<(*mut u8, core::marker::" -"PhantomPinned)>,\n" +" _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,\n" " }\n" "\n" -" // Layout as per readdir(3) and definitions in /usr/include/x86_64-linux-" -"gnu.\n" +" // Layout as per readdir(3) and definitions in /usr/include/x86_64-linux-gnu.\n" " #[cfg(not(target_os = \"macos\"))]\n" " #[repr(C)]\n" " pub struct dirent {\n" @@ -9671,20 +9075,16 @@ msgstr "" #: src/android.md:3 msgid "" -"Rust is supported for native platform development on Android. This means " -"that\n" +"Rust is supported for native platform development on Android. This means that\n" "you can write new operating system services in Rust, as well as extending\n" "existing services." msgstr "" #: src/android.md:7 msgid "" -"> We will attempt to call Rust from one of your own projects today. So try " -"to\n" -"> find a little corner of your code base where we can move some lines of " -"code to\n" -"> Rust. The fewer dependencies and \"exotic\" types the better. Something " -"that\n" +"> We will attempt to call Rust from one of your own projects today. So try to\n" +"> find a little corner of your code base where we can move some lines of code to\n" +"> Rust. The fewer dependencies and \"exotic\" types the better. Something that\n" "> parses some raw bytes would be ideal." msgstr "" @@ -9694,8 +9094,7 @@ msgstr "" #: src/android/setup.md:3 msgid "" -"We will be using an Android Virtual Device to test our code. Make sure you " -"have\n" +"We will be using an Android Virtual Device to test our code. Make sure you have\n" "access to one or create a new one with:" msgstr "" @@ -9729,22 +9128,21 @@ msgid "" "|\n" "|-------------------|----------------------------------------------------------------------------------------------------|\n" "| `rust_binary` | Produces a Rust " -"binary. " -"|\n" -"| `rust_library` | Produces a Rust library, and provides both `rlib` and " -"`dylib` variants. |\n" -"| `rust_ffi` | Produces a Rust C library usable by `cc` modules, and " -"provides both static and shared variants. |\n" -"| `rust_proc_macro` | Produces a `proc-macro` Rust library. These are " -"analogous to compiler plugins. |\n" -"| `rust_test` | Produces a Rust test binary that uses the standard " -"Rust test harness. |\n" +"binary. |\n" +"| `rust_library` | Produces a Rust library, and provides both `rlib` and `dylib` " +"variants. |\n" +"| `rust_ffi` | Produces a Rust C library usable by `cc` modules, and provides both static " +"and shared variants. |\n" +"| `rust_proc_macro` | Produces a `proc-macro` Rust library. These are analogous to compiler " +"plugins. |\n" +"| `rust_test` | Produces a Rust test binary that uses the standard Rust test " +"harness. |\n" "| `rust_fuzz` | Produces a Rust fuzz binary leveraging " "`libfuzzer`. |\n" -"| `rust_protobuf` | Generates source and produces a Rust library that " -"provides an interface for a particular protobuf. |\n" -"| `rust_bindgen` | Generates source and produces a Rust library " -"containing Rust bindings to C libraries. |" +"| `rust_protobuf` | Generates source and produces a Rust library that provides an interface for " +"a particular protobuf. |\n" +"| `rust_bindgen` | Generates source and produces a Rust library containing Rust bindings to C " +"libraries. |" msgstr "" #: src/android/build-rules.md:16 @@ -9757,8 +9155,7 @@ msgstr "" #: src/android/build-rules/binary.md:3 msgid "" -"Let us start with a simple application. At the root of an AOSP checkout, " -"create\n" +"Let us start with a simple application. At the root of an AOSP checkout, create\n" "the following files:" msgstr "" @@ -9887,8 +9284,7 @@ msgstr "" msgid "" "```shell\n" "$ m hello_rust_with_dep\n" -"$ adb push $ANDROID_PRODUCT_OUT/system/bin/hello_rust_with_dep /data/local/" -"tmp\n" +"$ adb push $ANDROID_PRODUCT_OUT/system/bin/hello_rust_with_dep /data/local/tmp\n" "$ adb shell /data/local/tmp/hello_rust_with_dep\n" "Hello Bob, it is very\n" "nice to meet you!\n" @@ -9902,8 +9298,7 @@ msgstr "" #: src/android/aidl.md:3 msgid "" "The [Android Interface Definition Language\n" -"(AIDL)](https://developer.android.com/guide/components/aidl) is supported in " -"Rust:" +"(AIDL)](https://developer.android.com/guide/components/aidl) is supported in Rust:" msgstr "" #: src/android/aidl.md:6 @@ -9921,8 +9316,7 @@ msgid "You declare the API of your service using an AIDL interface:" msgstr "" #: src/android/aidl/interface.md:5 -msgid "" -"*birthday_service/aidl/com/example/birthdayservice/IBirthdayService.aidl*:" +msgid "*birthday_service/aidl/com/example/birthdayservice/IBirthdayService.aidl*:" msgstr "" #: src/android/aidl/interface.md:7 @@ -9960,8 +9354,7 @@ msgstr "" #: src/android/aidl/interface.md:32 msgid "" -"Add `vendor_available: true` if your AIDL file is used by a binary in the " -"vendor\n" +"Add `vendor_available: true` if your AIDL file is used by a binary in the vendor\n" "partition." msgstr "" @@ -9981,8 +9374,8 @@ msgstr "" msgid "" "```rust,ignore\n" "//! Implementation of the `IBirthdayService` AIDL interface.\n" -"use com_example_birthdayservice::aidl::com::example::birthdayservice::" -"IBirthdayService::IBirthdayService;\n" +"use com_example_birthdayservice::aidl::com::example::birthdayservice::IBirthdayService::" +"IBirthdayService;\n" "use com_example_birthdayservice::binder;\n" "\n" "/// The `IBirthdayService` implementation.\n" @@ -9991,19 +9384,16 @@ msgid "" "impl binder::Interface for BirthdayService {}\n" "\n" "impl IBirthdayService for BirthdayService {\n" -" fn wishHappyBirthday(&self, name: &str, years: i32) -> binder::" -"Result {\n" +" fn wishHappyBirthday(&self, name: &str, years: i32) -> binder::Result {\n" " Ok(format!(\n" -" \"Happy Birthday {name}, congratulations with the {years} years!" -"\"\n" +" \"Happy Birthday {name}, congratulations with the {years} years!\"\n" " ))\n" " }\n" "}\n" "```" msgstr "" -#: src/android/aidl/implementation.md:26 src/android/aidl/server.md:28 -#: src/android/aidl/client.md:37 +#: src/android/aidl/implementation.md:26 src/android/aidl/server.md:28 src/android/aidl/client.md:37 msgid "*birthday_service/Android.bp*:" msgstr "" @@ -10039,8 +9429,8 @@ msgid "" "```rust,ignore\n" "//! Birthday service.\n" "use birthdayservice::BirthdayService;\n" -"use com_example_birthdayservice::aidl::com::example::birthdayservice::" -"IBirthdayService::BnBirthdayService;\n" +"use com_example_birthdayservice::aidl::com::example::birthdayservice::IBirthdayService::" +"BnBirthdayService;\n" "use com_example_birthdayservice::binder;\n" "\n" "const SERVICE_IDENTIFIER: &str = \"birthdayservice\";\n" @@ -10052,8 +9442,7 @@ msgid "" " birthday_service,\n" " binder::BinderFeatures::default(),\n" " );\n" -" binder::add_service(SERVICE_IDENTIFIER, birthday_service_binder." -"as_binder())\n" +" binder::add_service(SERVICE_IDENTIFIER, birthday_service_binder.as_binder())\n" " .expect(\"Failed to register service\");\n" " binder::ProcessState::join_thread_pool()\n" "}\n" @@ -10142,15 +9531,14 @@ msgstr "" msgid "" "```rust,ignore\n" "//! Birthday service.\n" -"use com_example_birthdayservice::aidl::com::example::birthdayservice::" -"IBirthdayService::IBirthdayService;\n" +"use com_example_birthdayservice::aidl::com::example::birthdayservice::IBirthdayService::" +"IBirthdayService;\n" "use com_example_birthdayservice::binder;\n" "\n" "const SERVICE_IDENTIFIER: &str = \"birthdayservice\";\n" "\n" "/// Connect to the BirthdayService.\n" -"pub fn connect() -> Result, binder::" -"StatusCode> {\n" +"pub fn connect() -> Result, binder::StatusCode> {\n" " binder::get_interface(SERVICE_IDENTIFIER)\n" "}\n" "\n" @@ -10165,8 +9553,7 @@ msgid "" " .unwrap_or(42);\n" "\n" " binder::ProcessState::start_thread_pool();\n" -" let service = connect().expect(\"Failed to connect to " -"BirthdayService\");\n" +" let service = connect().expect(\"Failed to connect to BirthdayService\");\n" " let msg = service.wishHappyBirthday(&name, years)?;\n" " println!(\"{msg}\");\n" " Ok(())\n" @@ -10214,8 +9601,7 @@ msgstr "" #: src/android/aidl/changing.md:3 msgid "" -"Let us extend the API with more functionality: we want to let clients " -"specify a\n" +"Let us extend the API with more functionality: we want to let clients specify a\n" "list of lines for the birthday card:" msgstr "" @@ -10238,8 +9624,7 @@ msgstr "" #: src/android/logging.md:3 msgid "" -"You should use the `log` crate to automatically log to `logcat` (on-device) " -"or\n" +"You should use the `log` crate to automatically log to `logcat` (on-device) or\n" "`stdout` (on-host):" msgstr "" @@ -10312,10 +9697,8 @@ msgid "" "```shell\n" "$ adb logcat -s rust\n" "09-08 08:38:32.454 2420 2420 D rust: hello_rust_logs: Starting program.\n" -"09-08 08:38:32.454 2420 2420 I rust: hello_rust_logs: Things are going " -"fine.\n" -"09-08 08:38:32.454 2420 2420 E rust: hello_rust_logs: Something went " -"wrong!\n" +"09-08 08:38:32.454 2420 2420 I rust: hello_rust_logs: Things are going fine.\n" +"09-08 08:38:32.454 2420 2420 E rust: hello_rust_logs: Something went wrong!\n" "```" msgstr "" @@ -10325,8 +9708,7 @@ msgstr "" #: src/android/interoperability.md:3 msgid "" -"Rust has excellent support for interoperability with other languages. This " -"means\n" +"Rust has excellent support for interoperability with other languages. This means\n" "that you can:" msgstr "" @@ -10393,8 +9775,7 @@ msgstr "" #: src/android/interoperability/with-c/bindgen.md:3 msgid "" -"The [bindgen](https://rust-lang.github.io/rust-bindgen/introduction.html) " -"tool\n" +"The [bindgen](https://rust-lang.github.io/rust-bindgen/introduction.html) tool\n" "can auto-generate bindings from a C header file." msgstr "" @@ -10535,8 +9916,7 @@ msgstr "" msgid "" "```shell\n" "$ m print_birthday_card\n" -"$ adb push $ANDROID_PRODUCT_OUT/system/bin/print_birthday_card /data/local/" -"tmp\n" +"$ adb push $ANDROID_PRODUCT_OUT/system/bin/print_birthday_card /data/local/tmp\n" "$ adb shell /data/local/tmp/print_birthday_card\n" "```" msgstr "" @@ -10680,10 +10060,9 @@ msgstr "" #: src/android/interoperability/with-c/rust.md:83 msgid "" -"`#[no_mangle]` disables Rust's usual name mangling, so the exported symbol " -"will just be the name of\n" -"the function. You can also use `#[export_name = \"some_name\"]` to specify " -"whatever name you want." +"`#[no_mangle]` disables Rust's usual name mangling, so the exported symbol will just be the name " +"of\n" +"the function. You can also use `#[export_name = \"some_name\"]` to specify whatever name you want." msgstr "" #: src/android/interoperability/cpp.md:1 @@ -10692,8 +10071,7 @@ msgstr "" #: src/android/interoperability/cpp.md:3 msgid "" -"The [CXX crate][1] makes it possible to do safe interoperability between " -"Rust\n" +"The [CXX crate][1] makes it possible to do safe interoperability between Rust\n" "and C++." msgstr "" @@ -10752,8 +10130,7 @@ msgid "" "```" msgstr "" -#: src/android/interoperability/java.md:32 -#: src/android/interoperability/java.md:62 +#: src/android/interoperability/java.md:32 src/android/interoperability/java.md:62 msgid "_interoperability/java/Android.bp_:" msgstr "" @@ -10821,16 +10198,14 @@ msgid "" msgstr "" #: src/exercises/android/morning.md:1 src/exercises/bare-metal/morning.md:1 -#: src/exercises/bare-metal/afternoon.md:1 -#: src/exercises/concurrency/morning.md:1 +#: src/exercises/bare-metal/afternoon.md:1 src/exercises/concurrency/morning.md:1 #: src/exercises/concurrency/afternoon.md:1 msgid "# Exercises" msgstr "" #: src/exercises/android/morning.md:3 msgid "" -"This is a group exercise: We will look at one of the projects you work with " -"and\n" +"This is a group exercise: We will look at one of the projects you work with and\n" "try to integrate some Rust into it. Some suggestions:" msgstr "" @@ -10843,8 +10218,7 @@ msgstr "" #: src/exercises/android/morning.md:12 msgid "" -"No solution is provided here since this is open-ended: it relies on someone " -"in\n" +"No solution is provided here since this is open-ended: it relies on someone in\n" "the class having a piece of code which you can turn in to Rust on the fly." msgstr "" @@ -10854,17 +10228,17 @@ msgstr "" #: src/bare-metal.md:3 msgid "" -"This is a standalone one-day course about bare-metal Rust, aimed at people " -"who are familiar with the\n" -"basics of Rust (perhaps from completing the Comprehensive Rust course), and " -"ideally also have some\n" +"This is a standalone one-day course about bare-metal Rust, aimed at people who are familiar with " +"the\n" +"basics of Rust (perhaps from completing the Comprehensive Rust course), and ideally also have " +"some\n" "experience with bare-metal programming in some other language such as C." msgstr "" #: src/bare-metal.md:7 msgid "" -"Today we will talk about 'bare-metal' Rust: running Rust code without an OS " -"underneath us. This will\n" +"Today we will talk about 'bare-metal' Rust: running Rust code without an OS underneath us. This " +"will\n" "be divided into several parts:" msgstr "" @@ -10878,25 +10252,24 @@ msgstr "" #: src/bare-metal.md:15 msgid "" -"For the microcontroller part of the course we will use the [BBC micro:bit]" -"(https://microbit.org/) v2\n" -"as an example. It's a [development board](https://tech.microbit.org/" -"hardware/) based on the Nordic\n" -"nRF51822 microcontroller with some LEDs and buttons, an I2C-connected " -"accelerometer and compass, and\n" +"For the microcontroller part of the course we will use the [BBC micro:bit](https://microbit.org/) " +"v2\n" +"as an example. It's a [development board](https://tech.microbit.org/hardware/) based on the " +"Nordic\n" +"nRF51822 microcontroller with some LEDs and buttons, an I2C-connected accelerometer and compass, " +"and\n" "an on-board SWD debugger." msgstr "" #: src/bare-metal.md:20 -msgid "" -"To get started, install some tools we'll need later. On gLinux or Debian:" +msgid "To get started, install some tools we'll need later. On gLinux or Debian:" msgstr "" #: src/bare-metal.md:22 msgid "" "```bash\n" -"sudo apt install gcc-aarch64-linux-gnu gdb-multiarch libudev-dev picocom pkg-" -"config qemu-system-arm\n" +"sudo apt install gcc-aarch64-linux-gnu gdb-multiarch libudev-dev picocom pkg-config qemu-system-" +"arm\n" "rustup update\n" "rustup target add aarch64-unknown-none thumbv7em-none-eabihf\n" "rustup component add llvm-tools-preview\n" @@ -10905,15 +10278,13 @@ msgid "" msgstr "" #: src/bare-metal.md:30 -msgid "" -"And give users in the `plugdev` group access to the micro:bit programmer:" +msgid "And give users in the `plugdev` group access to the micro:bit programmer:" msgstr "" #: src/bare-metal.md:32 msgid "" "```bash\n" -"echo 'SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0d28\", MODE=\"0664\", " -"GROUP=\"plugdev\"' |\\\n" +"echo 'SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0d28\", MODE=\"0664\", GROUP=\"plugdev\"' |\\\n" " sudo tee /etc/udev/rules.d/50-microbit.rules\n" "sudo udevadm control --reload-rules\n" "```" @@ -11053,13 +10424,12 @@ msgid "" "* This will compile to an empty binary.\n" "* `std` provides a panic handler; without it we must provide our own.\n" "* It can also be provided by another crate, such as `panic-halt`.\n" -"* Depending on the target, you may need to compile with `panic = \"abort\"` " -"to avoid an error about\n" +"* Depending on the target, you may need to compile with `panic = \"abort\"` to avoid an error " +"about\n" " `eh_personality`.\n" -"* Note that there is no `main` or any other entry point; it's up to you to " -"define your own entry\n" -" point. This will typically involve a linker script and some assembly code " -"to set things up ready\n" +"* Note that there is no `main` or any other entry point; it's up to you to define your own entry\n" +" point. This will typically involve a linker script and some assembly code to set things up " +"ready\n" " for Rust code to run." msgstr "" @@ -11070,8 +10440,7 @@ msgstr "" #: src/bare-metal/alloc.md:3 msgid "" "To use `alloc` you must implement a\n" -"[global (heap) allocator](https://doc.rust-lang.org/stable/std/alloc/trait." -"GlobalAlloc.html)." +"[global (heap) allocator](https://doc.rust-lang.org/stable/std/alloc/trait.GlobalAlloc.html)." msgstr "" #: src/bare-metal/alloc.md:6 @@ -11093,8 +10462,7 @@ msgid "" "static mut HEAP: [u8; 65536] = [0; 65536];\n" "\n" "pub fn entry() {\n" -" // Safe because `HEAP` is only used here and `entry` is only called " -"once.\n" +" // Safe because `HEAP` is only used here and `entry` is only called once.\n" " unsafe {\n" " // Give the allocator some memory to allocate.\n" " HEAP_ALLOCATOR\n" @@ -11111,19 +10479,15 @@ msgstr "" #: src/bare-metal/alloc.md:39 msgid "" -"* `buddy_system_allocator` is a third-party crate implementing a basic buddy " -"system allocator. Other\n" -" crates are available, or you can write your own or hook into your existing " -"allocator.\n" -"* The const parameter of `LockedHeap` is the max order of the allocator; i." -"e. in this case it can\n" +"* `buddy_system_allocator` is a third-party crate implementing a basic buddy system allocator. " +"Other\n" +" crates are available, or you can write your own or hook into your existing allocator.\n" +"* The const parameter of `LockedHeap` is the max order of the allocator; i.e. in this case it can\n" " allocate regions of up to 2**32 bytes.\n" -"* If any crate in your dependency tree depends on `alloc` then you must have " -"exactly one global\n" -" allocator defined in your binary. Usually this is done in the top-level " -"binary crate.\n" -"* `extern crate panic_halt as _` is necessary to ensure that the " -"`panic_halt` crate is linked in so\n" +"* If any crate in your dependency tree depends on `alloc` then you must have exactly one global\n" +" allocator defined in your binary. Usually this is done in the top-level binary crate.\n" +"* `extern crate panic_halt as _` is necessary to ensure that the `panic_halt` crate is linked in " +"so\n" " we get its panic handler.\n" "* This example will build but not run, as it doesn't have an entry point." msgstr "" @@ -11134,8 +10498,8 @@ msgstr "" #: src/bare-metal/microcontrollers.md:3 msgid "" -"The `cortex_m_rt` crate provides (among other things) a reset handler for " -"Cortex M microcontrollers." +"The `cortex_m_rt` crate provides (among other things) a reset handler for Cortex M " +"microcontrollers." msgstr "" #: src/bare-metal/microcontrollers.md:5 @@ -11158,15 +10522,13 @@ msgid "" msgstr "" #: src/bare-metal/microcontrollers.md:21 -msgid "" -"Next we'll look at how to access peripherals, with increasing levels of " -"abstraction." +msgid "Next we'll look at how to access peripherals, with increasing levels of abstraction." msgstr "" #: src/bare-metal/microcontrollers.md:25 msgid "" -"* The `cortex_m_rt::entry` macro requires that the function have type `fn() -" -"> !`, because returning\n" +"* The `cortex_m_rt::entry` macro requires that the function have type `fn() -> !`, because " +"returning\n" " to the reset handler doesn't make sense.\n" "* Run the example with `cargo embed --bin minimal`" msgstr "" @@ -11177,8 +10539,7 @@ msgstr "" #: src/bare-metal/microcontrollers/mmio.md:3 msgid "" -"Most microcontrollers access peripherals via memory-mapped IO. Let's try " -"turning on an LED on our\n" +"Most microcontrollers access peripherals via memory-mapped IO. Let's try turning on an LED on our\n" "micro:bit:" msgstr "" @@ -11213,29 +10574,23 @@ msgid "" "#[entry]\n" "fn main() -> ! {\n" " // Configure GPIO 0 pins 21 and 28 as push-pull outputs.\n" -" let pin_cnf_21 = (GPIO_P0 + PIN_CNF + 21 * size_of::()) as *mut " -"u32;\n" -" let pin_cnf_28 = (GPIO_P0 + PIN_CNF + 28 * size_of::()) as *mut " -"u32;\n" -" // Safe because the pointers are to valid peripheral control registers, " -"and\n" +" let pin_cnf_21 = (GPIO_P0 + PIN_CNF + 21 * size_of::()) as *mut u32;\n" +" let pin_cnf_28 = (GPIO_P0 + PIN_CNF + 28 * size_of::()) as *mut u32;\n" +" // Safe because the pointers are to valid peripheral control registers, and\n" " // no aliases exist.\n" " unsafe {\n" " pin_cnf_21.write_volatile(\n" -" DIR_OUTPUT | INPUT_DISCONNECT | PULL_DISABLED | DRIVE_S0S1 | " -"SENSE_DISABLED,\n" +" DIR_OUTPUT | INPUT_DISCONNECT | PULL_DISABLED | DRIVE_S0S1 | SENSE_DISABLED,\n" " );\n" " pin_cnf_28.write_volatile(\n" -" DIR_OUTPUT | INPUT_DISCONNECT | PULL_DISABLED | DRIVE_S0S1 | " -"SENSE_DISABLED,\n" +" DIR_OUTPUT | INPUT_DISCONNECT | PULL_DISABLED | DRIVE_S0S1 | SENSE_DISABLED,\n" " );\n" " }\n" "\n" " // Set pin 28 low and pin 21 high to turn the LED on.\n" " let gpio0_outset = (GPIO_P0 + OUTSET) as *mut u32;\n" " let gpio0_outclr = (GPIO_P0 + OUTCLR) as *mut u32;\n" -" // Safe because the pointers are to valid peripheral control registers, " -"and\n" +" // Safe because the pointers are to valid peripheral control registers, and\n" " // no aliases exist.\n" " unsafe {\n" " gpio0_outclr.write_volatile(1 << 28);\n" @@ -11249,14 +10604,11 @@ msgstr "" #: src/bare-metal/microcontrollers/mmio.md:64 msgid "" -"* GPIO 0 pin 21 is connected to the first column of the LED matrix, and pin " -"28 to the first row." +"* GPIO 0 pin 21 is connected to the first column of the LED matrix, and pin 28 to the first row." msgstr "" -#: src/bare-metal/microcontrollers/mmio.md:66 -#: src/bare-metal/microcontrollers/pacs.md:59 -#: src/bare-metal/microcontrollers/hals.md:43 -#: src/bare-metal/microcontrollers/board-support.md:34 +#: src/bare-metal/microcontrollers/mmio.md:66 src/bare-metal/microcontrollers/pacs.md:59 +#: src/bare-metal/microcontrollers/hals.md:43 src/bare-metal/microcontrollers/board-support.md:34 msgid "Run the example with:" msgstr "" @@ -11273,10 +10625,9 @@ msgstr "" #: src/bare-metal/microcontrollers/pacs.md:3 msgid "" -"[`svd2rust`](https://crates.io/crates/svd2rust) generates mostly-safe Rust " -"wrappers for\n" -"memory-mapped peripherals from [CMSIS-SVD](https://www.keil.com/pack/doc/" -"CMSIS/SVD/html/index.html)\n" +"[`svd2rust`](https://crates.io/crates/svd2rust) generates mostly-safe Rust wrappers for\n" +"memory-mapped peripherals from [CMSIS-SVD](https://www.keil.com/pack/doc/CMSIS/SVD/html/index." +"html)\n" "files." msgstr "" @@ -11325,19 +10676,16 @@ msgstr "" #: src/bare-metal/microcontrollers/pacs.md:49 msgid "" -"* SVD (System View Description) files are XML files typically provided by " -"silicon vendors which\n" +"* SVD (System View Description) files are XML files typically provided by silicon vendors which\n" " describe the memory map of the device.\n" -" * They are organised by peripheral, register, field and value, with names, " -"descriptions, addresses\n" +" * They are organised by peripheral, register, field and value, with names, descriptions, " +"addresses\n" " and so on.\n" -" * SVD files are often buggy and incomplete, so there are various projects " -"which patch the\n" +" * SVD files are often buggy and incomplete, so there are various projects which patch the\n" " mistakes, add missing details, and publish the generated crates.\n" "* `cortex-m-rt` provides the vector table, among other things.\n" "* If you `cargo install cargo-binutils` then you can run\n" -" `cargo objdump --bin pac -- -d --no-show-raw-insn` to see the resulting " -"binary." +" `cargo objdump --bin pac -- -d --no-show-raw-insn` to see the resulting binary." msgstr "" #: src/bare-metal/microcontrollers/pacs.md:61 @@ -11353,10 +10701,10 @@ msgstr "" #: src/bare-metal/microcontrollers/hals.md:3 msgid "" -"[HAL crates](https://github.com/rust-embedded/awesome-embedded-rust#hal-" -"implementation-crates) for\n" -"many microcontrollers provide wrappers around various peripherals. These " -"generally implement traits\n" +"[HAL crates](https://github.com/rust-embedded/awesome-embedded-rust#hal-implementation-crates) " +"for\n" +"many microcontrollers provide wrappers around various peripherals. These generally implement " +"traits\n" "from [`embedded-hal`](https://crates.io/crates/embedded-hal)." msgstr "" @@ -11395,10 +10743,9 @@ msgstr "" #: src/bare-metal/microcontrollers/hals.md:39 msgid "" -" * `set_low` and `set_high` are methods on the `embedded_hal` `OutputPin` " -"trait.\n" -" * HAL crates exist for many Cortex-M and RISC-V devices, including various " -"STM32, GD32, nRF, NXP,\n" +" * `set_low` and `set_high` are methods on the `embedded_hal` `OutputPin` trait.\n" +" * HAL crates exist for many Cortex-M and RISC-V devices, including various STM32, GD32, nRF, " +"NXP,\n" " MSP430, AVR and PIC microcontrollers." msgstr "" @@ -11415,8 +10762,7 @@ msgstr "" #: src/bare-metal/microcontrollers/board-support.md:3 msgid "" -"Board support crates provide a further level of wrapping for a specific " -"board for convenience." +"Board support crates provide a further level of wrapping for a specific board for convenience." msgstr "" #: src/bare-metal/microcontrollers/board-support.md:5 @@ -11445,11 +10791,9 @@ msgstr "" #: src/bare-metal/microcontrollers/board-support.md:28 msgid "" -" * In this case the board support crate is just providing more useful names, " -"and a bit of\n" +" * In this case the board support crate is just providing more useful names, and a bit of\n" " initialisation.\n" -" * The crate may also include drivers for some on-board devices outside of " -"the microcontroller\n" +" * The crate may also include drivers for some on-board devices outside of the microcontroller\n" " itself.\n" " * `microbit-v2` includes a simple driver for the LED matrix." msgstr "" @@ -11481,17 +10825,14 @@ msgid "" " // ...\n" " }\n" " let mut pin_output: P0_01> = pin_input\n" -" .into_open_drain_output(OpenDrainConfig::Disconnect0Standard1, " -"Level::Low);\n" +" .into_open_drain_output(OpenDrainConfig::Disconnect0Standard1, Level::Low);\n" " pin_output.set_high().unwrap();\n" " // pin_input.is_high(); // Error, moved.\n" "\n" " let _pin2: P0_02> = gpio0\n" " .p0_02\n" -" .into_open_drain_output(OpenDrainConfig::Disconnect0Standard1, " -"Level::Low);\n" -" let _pin3: P0_03> = gpio0.p0_03." -"into_push_pull_output(Level::Low);\n" +" .into_open_drain_output(OpenDrainConfig::Disconnect0Standard1, Level::Low);\n" +" let _pin3: P0_03> = gpio0.p0_03.into_push_pull_output(Level::Low);\n" "\n" " loop {}\n" "}\n" @@ -11500,21 +10841,17 @@ msgstr "" #: src/bare-metal/microcontrollers/type-state.md:32 msgid "" -" * Pins don't implement `Copy` or `Clone`, so only one instance of each can " -"exist. Once a pin is\n" +" * Pins don't implement `Copy` or `Clone`, so only one instance of each can exist. Once a pin is\n" " moved out of the port struct nobody else can take it.\n" -" * Changing the configuration of a pin consumes the old pin instance, so you " -"can’t keep use the old\n" +" * Changing the configuration of a pin consumes the old pin instance, so you can’t keep use the " +"old\n" " instance afterwards.\n" -" * The type of a value indicates the state that it is in: e.g. in this case, " -"the configuration state\n" -" of a GPIO pin. This encodes the state machine into the type system, and " -"ensures that you don't\n" -" try to use a pin in a certain way without properly configuring it first. " -"Illegal state\n" +" * The type of a value indicates the state that it is in: e.g. in this case, the configuration " +"state\n" +" of a GPIO pin. This encodes the state machine into the type system, and ensures that you don't\n" +" try to use a pin in a certain way without properly configuring it first. Illegal state\n" " transitions are caught at compile time.\n" -" * You can call `is_high` on an input pin and `set_high` on an output pin, " -"but not vice-versa.\n" +" * You can call `is_high` on an input pin and `set_high` on an output pin, but not vice-versa.\n" " * Many HAL crates follow this pattern." msgstr "" @@ -11524,8 +10861,7 @@ msgstr "" #: src/bare-metal/microcontrollers/embedded-hal.md:3 msgid "" -"The [`embedded-hal`](https://crates.io/crates/embedded-hal) crate provides a " -"number of traits\n" +"The [`embedded-hal`](https://crates.io/crates/embedded-hal) crate provides a number of traits\n" "covering common microcontroller peripherals." msgstr "" @@ -11542,19 +10878,16 @@ msgstr "" #: src/bare-metal/microcontrollers/embedded-hal.md:13 msgid "" "Other crates then implement\n" -"[drivers](https://github.com/rust-embedded/awesome-embedded-rust#driver-" -"crates) in terms of these\n" -"traits, e.g. an accelerometer driver might need an I2C or SPI bus " -"implementation." +"[drivers](https://github.com/rust-embedded/awesome-embedded-rust#driver-crates) in terms of these\n" +"traits, e.g. an accelerometer driver might need an I2C or SPI bus implementation." msgstr "" #: src/bare-metal/microcontrollers/embedded-hal.md:19 msgid "" -" * There are implementations for many microcontrollers, as well as other " -"platforms such as Linux on\n" +" * There are implementations for many microcontrollers, as well as other platforms such as Linux " +"on\n" "Raspberry Pi.\n" -" * There is work in progress on an `async` version of `embedded-hal`, but it " -"isn't stable yet." +" * There is work in progress on an `async` version of `embedded-hal`, but it isn't stable yet." msgstr "" #: src/bare-metal/microcontrollers/probe-rs.md:1 @@ -11563,50 +10896,39 @@ msgstr "" #: src/bare-metal/microcontrollers/probe-rs.md:3 msgid "" -"[probe-rs](https://probe.rs/) is a handy toolset for embedded debugging, " -"like OpenOCD but better\n" +"[probe-rs](https://probe.rs/) is a handy toolset for embedded debugging, like OpenOCD but better\n" "integrated." msgstr "" #: src/bare-metal/microcontrollers/probe-rs.md:6 msgid "" -"* SWD and JTAG via CMSIS-DAP, ST-" -"Link and J-Link probes\n" -"* GDB stub and Microsoft DAP " -"server\n" +"* SWD and JTAG via CMSIS-DAP, ST-Link and J-Link probes\n" +"* GDB stub and Microsoft DAP server\n" "* Cargo integration" msgstr "" #: src/bare-metal/microcontrollers/probe-rs.md:10 msgid "" "`cargo-embed` is a cargo subcommand to build and flash binaries, log\n" -"RTT output and connect GDB. It's " -"configured by an\n" +"RTT output and connect GDB. It's configured by an\n" "`Embed.toml` file in your project directory." msgstr "" #: src/bare-metal/microcontrollers/probe-rs.md:16 msgid "" -"* [CMSIS-DAP](https://arm-software.github.io/CMSIS_5/DAP/html/index.html) is " -"an Arm standard\n" -" protocol over USB for an in-circuit debugger to access the CoreSight Debug " -"Access Port of various\n" -" Arm Cortex processors. It's what the on-board debugger on the BBC micro:" -"bit uses.\n" -"* ST-Link is a range of in-circuit debuggers from ST Microelectronics, J-" -"Link is a range from\n" +"* [CMSIS-DAP](https://arm-software.github.io/CMSIS_5/DAP/html/index.html) is an Arm standard\n" +" protocol over USB for an in-circuit debugger to access the CoreSight Debug Access Port of " +"various\n" +" Arm Cortex processors. It's what the on-board debugger on the BBC micro:bit uses.\n" +"* ST-Link is a range of in-circuit debuggers from ST Microelectronics, J-Link is a range from\n" " SEGGER.\n" -"* The Debug Access Port is usually either a 5-pin JTAG interface or 2-pin " -"Serial Wire Debug.\n" -"* probe-rs is a library which you can integrate into your own tools if you " -"want to.\n" -"* The [Microsoft Debug Adapter Protocol](https://microsoft.github.io/debug-" -"adapter-protocol/) lets\n" -" VSCode and other IDEs debug code running on any supported " -"microcontroller.\n" +"* The Debug Access Port is usually either a 5-pin JTAG interface or 2-pin Serial Wire Debug.\n" +"* probe-rs is a library which you can integrate into your own tools if you want to.\n" +"* The [Microsoft Debug Adapter Protocol](https://microsoft.github.io/debug-adapter-protocol/) " +"lets\n" +" VSCode and other IDEs debug code running on any supported microcontroller.\n" "* cargo-embed is a binary built using the probe-rs library.\n" -"* RTT (Real Time Transfers) is a mechanism to transfer data between the " -"debug host and the target\n" +"* RTT (Real Time Transfers) is a mechanism to transfer data between the debug host and the target\n" " through a number of ringbuffers." msgstr "" @@ -11647,8 +10969,8 @@ msgstr "" #: src/bare-metal/microcontrollers/debugging.md:21 msgid "" "```sh\n" -"gdb-multiarch target/thumbv7em-none-eabihf/debug/board_support --eval-" -"command=\"target remote :1337\"\n" +"gdb-multiarch target/thumbv7em-none-eabihf/debug/board_support --eval-command=\"target " +"remote :1337\"\n" "```" msgstr "" @@ -11668,8 +10990,7 @@ msgid "" "```" msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md:1 -#: src/bare-metal/aps/other-projects.md:1 +#: src/bare-metal/microcontrollers/other-projects.md:1 src/bare-metal/aps/other-projects.md:1 msgid "# Other projects" msgstr "" @@ -11677,39 +10998,32 @@ msgstr "" msgid "" " * [RTIC](https://rtic.rs/)\n" " * \"Real-Time Interrupt-driven Concurrency\"\n" -" * Shared resource management, message passing, task scheduling, timer " -"queue\n" +" * Shared resource management, message passing, task scheduling, timer queue\n" " * [Embassy](https://embassy.dev/)\n" " * `async` executors with priorities, timers, networking, USB\n" " * [TockOS](https://www.tockos.org/documentation/getting-started)\n" -" * Security-focused RTOS with preemptive scheduling and Memory Protection " -"Unit support\n" +" * Security-focused RTOS with preemptive scheduling and Memory Protection Unit support\n" " * [Hubris](https://hubris.oxide.computer/)\n" -" * Microkernel RTOS from Oxide Computer Company with memory protection, " -"unprivileged drivers, IPC\n" +" * Microkernel RTOS from Oxide Computer Company with memory protection, unprivileged drivers, " +"IPC\n" " * [Bindings for FreeRTOS](https://github.com/lobaro/FreeRTOS-rust)\n" " * Some platforms have `std` implementations, e.g.\n" -" [esp-idf](https://esp-rs.github.io/book/overview/using-the-standard-" -"library.html)." +" [esp-idf](https://esp-rs.github.io/book/overview/using-the-standard-library.html)." msgstr "" #: src/bare-metal/microcontrollers/other-projects.md:18 msgid "" " * RTIC can be considered either an RTOS or a concurrency framework.\n" " * It doesn't include any HALs.\n" -" * It uses the Cortex-M NVIC (Nested Virtual Interrupt Controller) for " -"scheduling rather than a\n" +" * It uses the Cortex-M NVIC (Nested Virtual Interrupt Controller) for scheduling rather than a\n" " proper kernel.\n" " * Cortex-M only.\n" " * Google uses TockOS on the Haven microcontroller for Titan security keys.\n" -" * FreeRTOS is mostly written in C, but there are Rust bindings for writing " -"applications." +" * FreeRTOS is mostly written in C, but there are Rust bindings for writing applications." msgstr "" #: src/exercises/bare-metal/morning.md:3 -msgid "" -"We will read the direction from an I2C compass, and log the readings to a " -"serial port." +msgid "We will read the direction from an I2C compass, and log the readings to a serial port." msgstr "" #: src/exercises/bare-metal/compass.md:1 @@ -11718,8 +11032,8 @@ msgstr "" #: src/exercises/bare-metal/compass.md:3 msgid "" -"We will read the direction from an I2C compass, and log the readings to a " -"serial port. If you have\n" +"We will read the direction from an I2C compass, and log the readings to a serial port. If you " +"have\n" "time, try displaying it on the LEDs somehow too, or use the buttons somehow." msgstr "" @@ -11729,33 +11043,28 @@ msgstr "" #: src/exercises/bare-metal/compass.md:8 msgid "" -"- Check the documentation for the [`lsm303agr`](https://docs.rs/lsm303agr/" -"latest/lsm303agr/) and\n" -" [`microbit-v2`](https://docs.rs/microbit-v2/latest/microbit/) crates, as " -"well as the\n" +"- Check the documentation for the [`lsm303agr`](https://docs.rs/lsm303agr/latest/lsm303agr/) and\n" +" [`microbit-v2`](https://docs.rs/microbit-v2/latest/microbit/) crates, as well as the\n" " [micro:bit hardware](https://tech.microbit.org/hardware/).\n" -"- The LSM303AGR Inertial Measurement Unit is connected to the internal I2C " -"bus.\n" +"- The LSM303AGR Inertial Measurement Unit is connected to the internal I2C bus.\n" "- TWI is another name for I2C, so the I2C master peripheral is called TWIM.\n" -"- The LSM303AGR driver needs something implementing the `embedded_hal::" -"blocking::i2c::WriteRead`\n" +"- The LSM303AGR driver needs something implementing the `embedded_hal::blocking::i2c::WriteRead`\n" " trait. The\n" -" [`microbit::hal::Twim`](https://docs.rs/microbit-v2/latest/microbit/hal/" -"struct.Twim.html) struct\n" +" [`microbit::hal::Twim`](https://docs.rs/microbit-v2/latest/microbit/hal/struct.Twim.html) " +"struct\n" " implements this.\n" -"- You have a [`microbit::Board`](https://docs.rs/microbit-v2/latest/microbit/" -"struct.Board.html)\n" +"- You have a [`microbit::Board`](https://docs.rs/microbit-v2/latest/microbit/struct.Board.html)\n" " struct with fields for the various pins and peripherals.\n" "- You can also look at the\n" -" [nRF52833 datasheet](https://infocenter.nordicsemi.com/pdf/" -"nRF52833_PS_v1.5.pdf) if you want, but\n" +" [nRF52833 datasheet](https://infocenter.nordicsemi.com/pdf/nRF52833_PS_v1.5.pdf) if you want, " +"but\n" " it shouldn't be necessary for this exercise." msgstr "" #: src/exercises/bare-metal/compass.md:23 msgid "" -"Download the [exercise template](../../comprehensive-rust-exercises.zip) and " -"look in the `compass`\n" +"Download the [exercise template](../../comprehensive-rust-exercises.zip) and look in the " +"`compass`\n" "directory for the following files." msgstr "" @@ -11764,8 +11073,7 @@ msgid "`src/main.rs`:" msgstr "" #: src/exercises/bare-metal/compass.md:28 src/exercises/bare-metal/rtc.md:21 -#: src/exercises/concurrency/dining-philosophers.md:17 -#: src/exercises/concurrency/link-checker.md:55 +#: src/exercises/concurrency/dining-philosophers.md:17 src/exercises/concurrency/link-checker.md:55 #: src/exercises/concurrency/dining-philosophers-async.md:11 msgid "" msgstr "" @@ -11812,10 +11120,8 @@ msgid "`Cargo.toml` (you shouldn't need to change this):" msgstr "" #: src/exercises/bare-metal/compass.md:66 src/exercises/bare-metal/rtc.md:387 -#: src/exercises/concurrency/dining-philosophers.md:63 -#: src/exercises/concurrency/link-checker.md:35 -#: src/exercises/concurrency/dining-philosophers-async.md:60 -#: src/exercises/concurrency/chat-app.md:17 +#: src/exercises/concurrency/dining-philosophers.md:63 src/exercises/concurrency/link-checker.md:35 +#: src/exercises/concurrency/dining-philosophers-async.md:60 src/exercises/concurrency/chat-app.md:17 msgid "" msgstr "" @@ -11892,8 +11198,7 @@ msgid "" msgstr "" #: src/exercises/bare-metal/compass.md:118 -msgid "" -"Or on Mac OS something like (the device name may be slightly different):" +msgid "Or on Mac OS something like (the device name may be slightly different):" msgstr "" #: src/exercises/bare-metal/compass.md:120 @@ -11913,21 +11218,18 @@ msgstr "" #: src/bare-metal/aps.md:3 msgid "" -"So far we've talked about microcontrollers, such as the Arm Cortex-M series. " -"Now let's try writing\n" +"So far we've talked about microcontrollers, such as the Arm Cortex-M series. Now let's try " +"writing\n" "something for Cortex-A. For simplicity we'll just work with QEMU's aarch64\n" "['virt'](https://qemu-project.gitlab.io/qemu/system/arm/virt.html) board." msgstr "" #: src/bare-metal/aps.md:9 msgid "" -"* Broadly speaking, microcontrollers don't have an MMU or multiple levels of " -"privilege (exception\n" +"* Broadly speaking, microcontrollers don't have an MMU or multiple levels of privilege (exception\n" " levels on Arm CPUs, rings on x86), while application processors do.\n" -"* QEMU supports emulating various different machines or board models for " -"each architecture. The\n" -" 'virt' board doesn't correspond to any particular real hardware, but is " -"designed purely for\n" +"* QEMU supports emulating various different machines or board models for each architecture. The\n" +" 'virt' board doesn't correspond to any particular real hardware, but is designed purely for\n" " virtual machines." msgstr "" @@ -11937,10 +11239,8 @@ msgstr "" #: src/bare-metal/aps/inline-assembly.md:3 msgid "" -"Sometimes we need to use assembly to do things that aren't possible with " -"Rust code. For example,\n" -"to make an HVC to tell the firmware " -"to power off the system:" +"Sometimes we need to use assembly to do things that aren't possible with Rust code. For example,\n" +"to make an HVC to tell the firmware to power off the system:" msgstr "" #: src/bare-metal/aps/inline-assembly.md:6 @@ -11981,36 +11281,31 @@ msgstr "" #: src/bare-metal/aps/inline-assembly.md:39 msgid "" -"(If you actually want to do this, use the [`smccc`][1] crate which has " -"wrappers for all these functions.)" +"(If you actually want to do this, use the [`smccc`][1] crate which has wrappers for all these " +"functions.)" msgstr "" #: src/bare-metal/aps/inline-assembly.md:43 msgid "" -"* PSCI is the Arm Power State Coordination Interface, a standard set of " -"functions to manage system\n" -" and CPU power states, among other things. It is implemented by EL3 " -"firmware and hypervisors on\n" +"* PSCI is the Arm Power State Coordination Interface, a standard set of functions to manage " +"system\n" +" and CPU power states, among other things. It is implemented by EL3 firmware and hypervisors on\n" " many systems.\n" -"* The `0 => _` syntax means initialise the register to 0 before running the " -"inline assembly code,\n" -" and ignore its contents afterwards. We need to use `inout` rather than " -"`in` because the call could\n" +"* The `0 => _` syntax means initialise the register to 0 before running the inline assembly code,\n" +" and ignore its contents afterwards. We need to use `inout` rather than `in` because the call " +"could\n" " potentially clobber the contents of the registers.\n" -"* This `main` function needs to be `#[no_mangle]` and `extern \"C\"` because " -"it is called from our\n" +"* This `main` function needs to be `#[no_mangle]` and `extern \"C\"` because it is called from " +"our\n" " entry point in `entry.S`.\n" -"* `_x0`–`_x3` are the values of registers `x0`–`x3`, which are " -"conventionally used by the bootloader\n" -" to pass things like a pointer to the device tree. According to the " -"standard aarch64 calling\n" -" convention (which is what `extern \"C\"` specifies to use), registers `x0`–" -"`x7` are used for the\n" -" first 8 arguments passed to a function, so `entry.S` doesn't need to do " -"anything special except\n" +"* `_x0`–`_x3` are the values of registers `x0`–`x3`, which are conventionally used by the " +"bootloader\n" +" to pass things like a pointer to the device tree. According to the standard aarch64 calling\n" +" convention (which is what `extern \"C\"` specifies to use), registers `x0`–`x7` are used for " +"the\n" +" first 8 arguments passed to a function, so `entry.S` doesn't need to do anything special except\n" " make sure it doesn't change these registers.\n" -"* Run the example in QEMU with `make qemu_psci` under `src/bare-metal/aps/" -"examples`." +"* Run the example in QEMU with `make qemu_psci` under `src/bare-metal/aps/examples`." msgstr "" #: src/bare-metal/aps/mmio.md:1 @@ -12021,24 +11316,20 @@ msgstr "" msgid "" " * Use `pointer::read_volatile` and `pointer::write_volatile`.\n" " * Never hold a reference.\n" -" * `addr_of!` lets you get fields of structs without creating an " -"intermediate reference." +" * `addr_of!` lets you get fields of structs without creating an intermediate reference." msgstr "" #: src/bare-metal/aps/mmio.md:9 msgid "" -" * Volatile access: read or write operations may have side-effects, so " -"prevent the compiler or\n" +" * Volatile access: read or write operations may have side-effects, so prevent the compiler or\n" " hardware from reordering, duplicating or eliding them.\n" -" * Usually if you write and then read, e.g. via a mutable reference, the " -"compiler may assume that\n" -" the value read is the same as the value just written, and not bother " -"actually reading memory.\n" -" * Some existing crates for volatile access to hardware do hold references, " -"but this is unsound.\n" +" * Usually if you write and then read, e.g. via a mutable reference, the compiler may assume " +"that\n" +" the value read is the same as the value just written, and not bother actually reading " +"memory.\n" +" * Some existing crates for volatile access to hardware do hold references, but this is unsound.\n" " Whenever a reference exist, the compiler may choose to dereference it.\n" -" * Use the `addr_of!` macro to get struct field pointers from a pointer to " -"the struct." +" * Use the `addr_of!` macro to get struct field pointers from a pointer to the struct." msgstr "" #: src/bare-metal/aps/uart.md:1 @@ -12046,9 +11337,7 @@ msgid "# Let's write a UART driver" msgstr "" #: src/bare-metal/aps/uart.md:3 -msgid "" -"The QEMU 'virt' machine has a [PL011][1] UART, so let's write a driver for " -"that." +msgid "The QEMU 'virt' machine has a [PL011][1] UART, so let's write a driver for that." msgstr "" #: src/bare-metal/aps/uart.md:5 @@ -12065,16 +11354,13 @@ msgid "" "}\n" "\n" "impl Uart {\n" -" /// Constructs a new instance of the UART driver for a PL011 device at " -"the\n" +" /// Constructs a new instance of the UART driver for a PL011 device at the\n" " /// given base address.\n" " ///\n" " /// # Safety\n" " ///\n" -" /// The given base address must point to the 8 MMIO control registers of " -"a\n" -" /// PL011 device, which must be mapped into the address space of the " -"process\n" +" /// The given base address must point to the 8 MMIO control registers of a\n" +" /// PL011 device, which must be mapped into the address space of the process\n" " /// as device memory and not have any other aliases.\n" " pub unsafe fn new(base_address: *mut u8) -> Self {\n" " Self { base_address }\n" @@ -12099,8 +11385,7 @@ msgid "" " fn read_flag_register(&self) -> u8 {\n" " // Safe because we know that the base address points to the control\n" " // registers of a PL011 device which is appropriately mapped.\n" -" unsafe { self.base_address.add(FLAG_REGISTER_OFFSET)." -"read_volatile() }\n" +" unsafe { self.base_address.add(FLAG_REGISTER_OFFSET).read_volatile() }\n" " }\n" "}\n" "```" @@ -12108,22 +11393,19 @@ msgstr "" #: src/bare-metal/aps/uart.md:55 msgid "" -"* Note that `Uart::new` is unsafe while the other methods are safe. This is " -"because as long as the\n" -" caller of `Uart::new` guarantees that its safety requirements are met (i." -"e. that there is only\n" -" ever one instance of the driver for a given UART, and nothing else " -"aliasing its address space),\n" -" then it is always safe to call `write_byte` later because we can assume " -"the necessary\n" +"* Note that `Uart::new` is unsafe while the other methods are safe. This is because as long as " +"the\n" +" caller of `Uart::new` guarantees that its safety requirements are met (i.e. that there is only\n" +" ever one instance of the driver for a given UART, and nothing else aliasing its address space),\n" +" then it is always safe to call `write_byte` later because we can assume the necessary\n" " preconditions.\n" -"* We could have done it the other way around (making `new` safe but " -"`write_byte` unsafe), but that\n" -" would be much less convenient to use as every place that calls " -"`write_byte` would need to reason\n" +"* We could have done it the other way around (making `new` safe but `write_byte` unsafe), but " +"that\n" +" would be much less convenient to use as every place that calls `write_byte` would need to " +"reason\n" " about the safety\n" -"* This is a common pattern for writing safe wrappers of unsafe code: moving " -"the burden of proof for\n" +"* This is a common pattern for writing safe wrappers of unsafe code: moving the burden of proof " +"for\n" " soundness from a large number of places to a smaller number of places." msgstr "" @@ -12136,9 +11418,7 @@ msgid "# More traits" msgstr "" #: src/bare-metal/aps/uart/traits.md:3 -msgid "" -"We derived the `Debug` trait. It would be useful to implement a few more " -"traits too." +msgid "We derived the `Debug` trait. It would be useful to implement a few more traits too." msgstr "" #: src/bare-metal/aps/uart/traits.md:5 @@ -12163,10 +11443,8 @@ msgstr "" #: src/bare-metal/aps/uart/traits.md:24 msgid "" -"* Implementing `Write` lets us use the `write!` and `writeln!` macros with " -"our `Uart` type.\n" -"* Run the example in QEMU with `make qemu_minimal` under `src/bare-metal/aps/" -"examples`." +"* Implementing `Write` lets us use the `write!` and `writeln!` macros with our `Uart` type.\n" +"* Run the example in QEMU with `make qemu_minimal` under `src/bare-metal/aps/examples`." msgstr "" #: src/bare-metal/aps/better-uart.md:1 @@ -12175,10 +11453,9 @@ msgstr "" #: src/bare-metal/aps/better-uart.md:3 msgid "" -"The PL011 actually has [a bunch more registers][1], and adding offsets to " -"construct pointers to access\n" -"them is error-prone and hard to read. Plus, some of them are bit fields " -"which would be nice to\n" +"The PL011 actually has [a bunch more registers][1], and adding offsets to construct pointers to " +"access\n" +"them is error-prone and hard to read. Plus, some of them are bit fields which would be nice to\n" "access in a structured way." msgstr "" @@ -12212,8 +11489,7 @@ msgstr "" #: src/bare-metal/aps/better-uart/bitflags.md:3 msgid "" -"The [`bitflags`](https://crates.io/crates/bitflags) crate is useful for " -"working with bitflags." +"The [`bitflags`](https://crates.io/crates/bitflags) crate is useful for working with bitflags." msgstr "" #: src/bare-metal/aps/better-uart/bitflags.md:5 @@ -12251,8 +11527,8 @@ msgstr "" #: src/bare-metal/aps/better-uart/bitflags.md:37 msgid "" -"* The `bitflags!` macro creates a newtype something like `Flags(u16)`, along " -"with a bunch of method\n" +"* The `bitflags!` macro creates a newtype something like `Flags(u16)`, along with a bunch of " +"method\n" " implementations to get and set flags." msgstr "" @@ -12261,8 +11537,7 @@ msgid "# Multiple registers" msgstr "" #: src/bare-metal/aps/better-uart/registers.md:3 -msgid "" -"We can use a struct to represent the memory layout of the UART's registers." +msgid "We can use a struct to represent the memory layout of the UART's registers." msgstr "" #: src/bare-metal/aps/better-uart/registers.md:5 @@ -12304,12 +11579,10 @@ msgstr "" #: src/bare-metal/aps/better-uart/registers.md:41 msgid "" -"* [`#[repr(C)]`](https://doc.rust-lang.org/reference/type-layout.html#the-c-" -"representation) tells\n" -" the compiler to lay the struct fields out in order, following the same " -"rules as C. This is\n" -" necessary for our struct to have a predictable layout, as default Rust " -"representation allows the\n" +"* [`#[repr(C)]`](https://doc.rust-lang.org/reference/type-layout.html#the-c-representation) tells\n" +" the compiler to lay the struct fields out in order, following the same rules as C. This is\n" +" necessary for our struct to have a predictable layout, as default Rust representation allows " +"the\n" " compiler to (among other things) reorder fields however it sees fit." msgstr "" @@ -12331,16 +11604,13 @@ msgid "" "}\n" "\n" "impl Uart {\n" -" /// Constructs a new instance of the UART driver for a PL011 device at " -"the\n" +" /// Constructs a new instance of the UART driver for a PL011 device at the\n" " /// given base address.\n" " ///\n" " /// # Safety\n" " ///\n" -" /// The given base address must point to the 8 MMIO control registers of " -"a\n" -" /// PL011 device, which must be mapped into the address space of the " -"process\n" +" /// The given base address must point to the 8 MMIO control registers of a\n" +" /// PL011 device, which must be mapped into the address space of the process\n" " /// as device memory and not have any other aliases.\n" " pub unsafe fn new(base_address: *mut u32) -> Self {\n" " Self {\n" @@ -12364,14 +11634,12 @@ msgid "" " while self.read_flag_register().contains(Flags::BUSY) {}\n" " }\n" "\n" -" /// Reads and returns a pending byte, or `None` if nothing has been " -"received.\n" +" /// Reads and returns a pending byte, or `None` if nothing has been received.\n" " pub fn read_byte(&self) -> Option {\n" " if self.read_flag_register().contains(Flags::RXFE) {\n" " None\n" " } else {\n" -" let data = unsafe { addr_of!((*self.registers).dr)." -"read_volatile() };\n" +" let data = unsafe { addr_of!((*self.registers).dr).read_volatile() };\n" " // TODO: Check for error conditions in bits 8-11.\n" " Some(data as u8)\n" " }\n" @@ -12388,20 +11656,18 @@ msgstr "" #: src/bare-metal/aps/better-uart/driver.md:64 msgid "" -"* Note the use of `addr_of!` / `addr_of_mut!` to get pointers to individual " -"fields without creating\n" +"* Note the use of `addr_of!` / `addr_of_mut!` to get pointers to individual fields without " +"creating\n" " an intermediate reference, which would be unsound." msgstr "" -#: src/bare-metal/aps/better-uart/using.md:1 -#: src/bare-metal/aps/logging/using.md:1 +#: src/bare-metal/aps/better-uart/using.md:1 src/bare-metal/aps/logging/using.md:1 msgid "# Using it" msgstr "" #: src/bare-metal/aps/better-uart/using.md:3 msgid "" -"Let's write a small program using our driver to write to the serial console, " -"and echo incoming\n" +"Let's write a small program using our driver to write to the serial console, and echo incoming\n" "bytes." msgstr "" @@ -12426,8 +11692,7 @@ msgid "" "\n" "#[no_mangle]\n" "extern \"C\" fn main(x0: u64, x1: u64, x2: u64, x3: u64) {\n" -" // Safe because `PL011_BASE_ADDRESS` is the base address of a PL011 " -"device,\n" +" // Safe because `PL011_BASE_ADDRESS` is the base address of a PL011 device,\n" " // and nothing else accesses that address range.\n" " let mut uart = unsafe { Uart::new(PL011_BASE_ADDRESS) };\n" "\n" @@ -12454,17 +11719,16 @@ msgstr "" #: src/bare-metal/aps/better-uart/using.md:51 msgid "" -"* As in the [inline assembly](../inline-assembly.md) example, this `main` " -"function is called from our\n" +"* As in the [inline assembly](../inline-assembly.md) example, this `main` function is called from " +"our\n" " entry point code in `entry.S`. See the speaker notes there for details.\n" -"* Run the example in QEMU with `make qemu` under `src/bare-metal/aps/" -"examples`." +"* Run the example in QEMU with `make qemu` under `src/bare-metal/aps/examples`." msgstr "" #: src/bare-metal/aps/logging.md:3 msgid "" -"It would be nice to be able to use the logging macros from the [`log`][1] " -"crate. We can do this by\n" +"It would be nice to be able to use the logging macros from the [`log`][1] crate. We can do this " +"by\n" "implementing the `Log` trait." msgstr "" @@ -12503,8 +11767,7 @@ msgid "" "}\n" "\n" "/// Initialises UART logger.\n" -"pub fn init(uart: Uart, max_level: LevelFilter) -> Result<(), " -"SetLoggerError> {\n" +"pub fn init(uart: Uart, max_level: LevelFilter) -> Result<(), SetLoggerError> {\n" " LOGGER.uart.lock().replace(uart);\n" "\n" " log::set_logger(&LOGGER)?;\n" @@ -12515,9 +11778,7 @@ msgid "" msgstr "" #: src/bare-metal/aps/logging.md:50 -msgid "" -"* The unwrap in `log` is safe because we initialise `LOGGER` before calling " -"`set_logger`." +msgid "* The unwrap in `log` is safe because we initialise `LOGGER` before calling `set_logger`." msgstr "" #: src/bare-metal/aps/logging/using.md:3 @@ -12545,8 +11806,7 @@ msgid "" "\n" "#[no_mangle]\n" "extern \"C\" fn main(x0: u64, x1: u64, x2: u64, x3: u64) {\n" -" // Safe because `PL011_BASE_ADDRESS` is the base address of a PL011 " -"device,\n" +" // Safe because `PL011_BASE_ADDRESS` is the base address of a PL011 device,\n" " // and nothing else accesses that address range.\n" " let uart = unsafe { Uart::new(PL011_BASE_ADDRESS) };\n" " logger::init(uart, LevelFilter::Trace).unwrap();\n" @@ -12570,8 +11830,7 @@ msgstr "" #: src/bare-metal/aps/logging/using.md:46 msgid "" "* Note that our panic handler can now log details of panics.\n" -"* Run the example in QEMU with `make qemu_logger` under `src/bare-metal/aps/" -"examples`." +"* Run the example in QEMU with `make qemu_logger` under `src/bare-metal/aps/examples`." msgstr "" #: src/bare-metal/aps/other-projects.md:3 @@ -12580,10 +11839,9 @@ msgid "" " * \"coreboot without the C\"\n" " * Supports x86, aarch64 and RISC-V.\n" " * Relies on LinuxBoot rather than having many drivers itself.\n" -" * [Rust RaspberryPi OS tutorial](https://github.com/rust-embedded/rust-" -"raspberrypi-OS-tutorials)\n" -" * Initialisation, UART driver, simple bootloader, JTAG, exception levels, " -"exception handling, page tables\n" +" * [Rust RaspberryPi OS tutorial](https://github.com/rust-embedded/rust-raspberrypi-OS-tutorials)\n" +" * Initialisation, UART driver, simple bootloader, JTAG, exception levels, exception handling, " +"page tables\n" " * Not all very well written, so beware.\n" " * [`cargo-call-stack`](https://crates.io/crates/cargo-call-stack)\n" " * Static analysis to determine maximum stack usage." @@ -12594,9 +11852,7 @@ msgid "# Useful crates" msgstr "" #: src/bare-metal/useful-crates.md:3 -msgid "" -"We'll go over a few crates which solve some common problems in bare-metal " -"programming." +msgid "We'll go over a few crates which solve some common problems in bare-metal programming." msgstr "" #: src/bare-metal/useful-crates/zerocopy.md:1 @@ -12605,8 +11861,7 @@ msgstr "" #: src/bare-metal/useful-crates/zerocopy.md:3 msgid "" -"The [`zerocopy`][1] crate (from Fuchsia) provides traits and macros for " -"safely converting between\n" +"The [`zerocopy`][1] crate (from Fuchsia) provides traits and macros for safely converting between\n" "byte sequences and other types." msgstr "" @@ -12649,23 +11904,22 @@ msgstr "" #: src/bare-metal/useful-crates/zerocopy.md:40 msgid "" -"This is not suitable for MMIO (as it doesn't use volatile reads and writes), " -"but can be useful for\n" -"working with structures shared with hardware e.g. by DMA, or sent over some " -"external interface." +"This is not suitable for MMIO (as it doesn't use volatile reads and writes), but can be useful " +"for\n" +"working with structures shared with hardware e.g. by DMA, or sent over some external interface." msgstr "" #: src/bare-metal/useful-crates/zerocopy.md:45 msgid "" -"* `FromBytes` can be implemented for types for which any byte pattern is " -"valid, and so can safely be\n" +"* `FromBytes` can be implemented for types for which any byte pattern is valid, and so can safely " +"be\n" " converted from an untrusted sequence of bytes.\n" -"* Attempting to derive `FromBytes` for these types would fail, because " -"`RequestType` doesn't use all\n" +"* Attempting to derive `FromBytes` for these types would fail, because `RequestType` doesn't use " +"all\n" " possible u32 values as discriminants, so not all byte patterns are valid.\n" "* `zerocopy::byteorder` has types for byte-order aware numeric primitives.\n" -"* Run the example with `cargo run` under `src/bare-metal/useful-crates/" -"zerocopy-example/`. (It won't\n" +"* Run the example with `cargo run` under `src/bare-metal/useful-crates/zerocopy-example/`. (It " +"won't\n" " run in the Playground because of the crate dependency.)" msgstr "" @@ -12675,8 +11929,8 @@ msgstr "" #: src/bare-metal/useful-crates/aarch64-paging.md:3 msgid "" -"The [`aarch64-paging`][1] crate lets you create page tables according to the " -"AArch64 Virtual Memory\n" +"The [`aarch64-paging`][1] crate lets you create page tables according to the AArch64 Virtual " +"Memory\n" "System Architecture." msgstr "" @@ -12705,12 +11959,11 @@ msgstr "" #: src/bare-metal/useful-crates/aarch64-paging.md:28 msgid "" -"* For now it only supports EL1, but support for other exception levels " -"should be straightforward to\n" +"* For now it only supports EL1, but support for other exception levels should be straightforward " +"to\n" " add.\n" "* This is used in Android for the [Protected VM Firmware][2].\n" -"* There's no easy way to run this example, as it needs to run on real " -"hardware or under QEMU." +"* There's no easy way to run this example, as it needs to run on real hardware or under QEMU." msgstr "" #: src/bare-metal/useful-crates/buddy_system_allocator.md:1 @@ -12719,12 +11972,10 @@ msgstr "" #: src/bare-metal/useful-crates/buddy_system_allocator.md:3 msgid "" -"[`buddy_system_allocator`][1] is a third-party crate implementing a basic " -"buddy system allocator.\n" -"It can be used both for [`LockedHeap`][2] implementing [`GlobalAlloc`][3] so " -"you can use the\n" -"standard `alloc` crate (as we saw [before][4]), or for allocating other " -"address space. For example,\n" +"[`buddy_system_allocator`][1] is a third-party crate implementing a basic buddy system allocator.\n" +"It can be used both for [`LockedHeap`][2] implementing [`GlobalAlloc`][3] so you can use the\n" +"standard `alloc` crate (as we saw [before][4]), or for allocating other address space. For " +"example,\n" "we might want to allocate MMIO space for PCI BARs:" msgstr "" @@ -12750,8 +12001,8 @@ msgstr "" #: src/bare-metal/useful-crates/buddy_system_allocator.md:26 msgid "" "* PCI BARs always have alignment equal to their size.\n" -"* Run the example with `cargo run` under `src/bare-metal/useful-crates/" -"allocator-example/`. (It won't\n" +"* Run the example with `cargo run` under `src/bare-metal/useful-crates/allocator-example/`. (It " +"won't\n" " run in the Playground because of the crate dependency.)" msgstr "" @@ -12761,12 +12012,10 @@ msgstr "" #: src/bare-metal/useful-crates/tinyvec.md:3 msgid "" -"Sometimes you want something which can be resized like a `Vec`, but without " -"heap allocation.\n" -"[`tinyvec`][1] provides this: a vector backed by an array or slice, which " -"could be statically\n" -"allocated or on the stack, which keeps track of how many elements are used " -"and panics if you try to\n" +"Sometimes you want something which can be resized like a `Vec`, but without heap allocation.\n" +"[`tinyvec`][1] provides this: a vector backed by an array or slice, which could be statically\n" +"allocated or on the stack, which keeps track of how many elements are used and panics if you try " +"to\n" "use more than are allocated." msgstr "" @@ -12788,10 +12037,8 @@ msgstr "" #: src/bare-metal/useful-crates/tinyvec.md:23 msgid "" -"* `tinyvec` requires that the element type implement `Default` for " -"initialisation.\n" -"* The Rust Playground includes `tinyvec`, so this example will run fine " -"inline." +"* `tinyvec` requires that the element type implement `Default` for initialisation.\n" +"* The Rust Playground includes `tinyvec`, so this example will run fine inline." msgstr "" #: src/bare-metal/useful-crates/spin.md:1 @@ -12800,17 +12047,13 @@ msgstr "" #: src/bare-metal/useful-crates/spin.md:3 msgid "" -"`std::sync::Mutex` and the other synchronisation primitives from `std::sync` " -"are not available in\n" -"`core` or `alloc`. How can we manage synchronisation or interior mutability, " -"such as for sharing\n" +"`std::sync::Mutex` and the other synchronisation primitives from `std::sync` are not available in\n" +"`core` or `alloc`. How can we manage synchronisation or interior mutability, such as for sharing\n" "state between different CPUs?" msgstr "" #: src/bare-metal/useful-crates/spin.md:7 -msgid "" -"The [`spin`][1] crate provides spinlock-based equivalents of many of these " -"primitives." +msgid "The [`spin`][1] crate provides spinlock-based equivalents of many of these primitives." msgstr "" #: src/bare-metal/useful-crates/spin.md:9 @@ -12831,11 +12074,10 @@ msgstr "" #: src/bare-metal/useful-crates/spin.md:23 msgid "" "* Be careful to avoid deadlock if you take locks in interrupt handlers.\n" -"* `spin` also has a ticket lock mutex implementation; equivalents of " -"`RwLock`, `Barrier` and `Once`\n" +"* `spin` also has a ticket lock mutex implementation; equivalents of `RwLock`, `Barrier` and " +"`Once`\n" " from `std::sync`; and `Lazy` for lazy initialisation.\n" -"* The [`once_cell`][2] crate also has some useful types for late " -"initialisation with a slightly\n" +"* The [`once_cell`][2] crate also has some useful types for late initialisation with a slightly\n" " different approach to `spin::once::Once`.\n" "* The Rust Playground includes `spin`, so this example will run fine inline." msgstr "" @@ -12846,10 +12088,9 @@ msgstr "" #: src/bare-metal/android.md:3 msgid "" -"To build a bare-metal Rust binary in AOSP, you need to use a " -"`rust_ffi_static` Soong rule to build\n" -"your Rust code, then a `cc_binary` with a linker script to produce the " -"binary itself, and then a\n" +"To build a bare-metal Rust binary in AOSP, you need to use a `rust_ffi_static` Soong rule to " +"build\n" +"your Rust code, then a `cc_binary` with a linker script to produce the binary itself, and then a\n" "`raw_binary` to convert the ELF to a raw binary ready to be run." msgstr "" @@ -12901,10 +12142,9 @@ msgstr "" #: src/bare-metal/android/vmbase.md:3 msgid "" -"For VMs running under crosvm on aarch64, the [vmbase][1] library provides a " -"linker script and useful\n" -"defaults for the build rules, along with an entry point, UART console " -"logging and more." +"For VMs running under crosvm on aarch64, the [vmbase][1] library provides a linker script and " +"useful\n" +"defaults for the build rules, along with an entry point, UART console logging and more." msgstr "" #: src/bare-metal/android/vmbase.md:6 @@ -12925,10 +12165,9 @@ msgstr "" #: src/bare-metal/android/vmbase.md:21 msgid "" -"* The `main!` macro marks your main function, to be called from the `vmbase` " -"entry point.\n" -"* The `vmbase` entry point handles console initialisation, and issues a " -"PSCI_SYSTEM_OFF to shutdown\n" +"* The `main!` macro marks your main function, to be called from the `vmbase` entry point.\n" +"* The `vmbase` entry point handles console initialisation, and issues a PSCI_SYSTEM_OFF to " +"shutdown\n" " the VM if your main function returns." msgstr "" @@ -12942,34 +12181,32 @@ msgstr "" #: src/exercises/bare-metal/rtc.md:3 msgid "" -"The QEMU aarch64 virt machine has a [PL031][1] real-time clock at 0x9010000. " -"For this exercise, you\n" +"The QEMU aarch64 virt machine has a [PL031][1] real-time clock at 0x9010000. For this exercise, " +"you\n" "should write a driver for it." msgstr "" #: src/exercises/bare-metal/rtc.md:6 msgid "" -"1. Use it to print the current time to the serial console. You can use the " -"[`chrono`][2] crate for\n" +"1. Use it to print the current time to the serial console. You can use the [`chrono`][2] crate " +"for\n" " date/time formatting.\n" -"2. Use the match register and raw interrupt status to busy-wait until a " -"given time, e.g. 3 seconds\n" +"2. Use the match register and raw interrupt status to busy-wait until a given time, e.g. 3 " +"seconds\n" " in the future. (Call [`core::hint::spin_loop`][3] inside the loop.)\n" -"3. _Extension if you have time:_ Enable and handle the interrupt generated " -"by the RTC match. You can\n" -" use the driver provided in the [`arm-gic`][4] crate to configure the Arm " -"Generic Interrupt Controller.\n" +"3. _Extension if you have time:_ Enable and handle the interrupt generated by the RTC match. You " +"can\n" +" use the driver provided in the [`arm-gic`][4] crate to configure the Arm Generic Interrupt " +"Controller.\n" " - Use the RTC interrupt, which is wired to the GIC as `IntId::spi(2)`.\n" -" - Once the interrupt is enabled, you can put the core to sleep via " -"`arm_gic::wfi()`, which will cause the core to sleep until it receives an " -"interrupt.\n" +" - Once the interrupt is enabled, you can put the core to sleep via `arm_gic::wfi()`, which will " +"cause the core to sleep until it receives an interrupt.\n" " " msgstr "" #: src/exercises/bare-metal/rtc.md:16 msgid "" -"Download the [exercise template](../../comprehensive-rust-exercises.zip) and " -"look in the `rtc`\n" +"Download the [exercise template](../../comprehensive-rust-exercises.zip) and look in the `rtc`\n" "directory for the following files." msgstr "" @@ -12999,20 +12236,17 @@ msgid "" "\n" "#[no_mangle]\n" "extern \"C\" fn main(x0: u64, x1: u64, x2: u64, x3: u64) {\n" -" // Safe because `PL011_BASE_ADDRESS` is the base address of a PL011 " -"device,\n" +" // Safe because `PL011_BASE_ADDRESS` is the base address of a PL011 device,\n" " // and nothing else accesses that address range.\n" " let uart = unsafe { Uart::new(PL011_BASE_ADDRESS) };\n" " logger::init(uart, LevelFilter::Trace).unwrap();\n" "\n" " info!(\"main({:#x}, {:#x}, {:#x}, {:#x})\", x0, x1, x2, x3);\n" "\n" -" // Safe because `GICD_BASE_ADDRESS` and `GICR_BASE_ADDRESS` are the " -"base\n" +" // Safe because `GICD_BASE_ADDRESS` and `GICR_BASE_ADDRESS` are the base\n" " // addresses of a GICv3 distributor and redistributor respectively, and\n" " // nothing else accesses those address ranges.\n" -" let mut gic = unsafe { GicV3::new(GICD_BASE_ADDRESS, " -"GICR_BASE_ADDRESS) };\n" +" let mut gic = unsafe { GicV3::new(GICD_BASE_ADDRESS, GICR_BASE_ADDRESS) };\n" " gic.setup();\n" "\n" " // TODO: Create instance of RTC driver and print current time.\n" @@ -13032,9 +12266,7 @@ msgid "" msgstr "" #: src/exercises/bare-metal/rtc.md:75 -msgid "" -"`src/exceptions.rs` (you should only need to change this for the 3rd part of " -"the exercise):" +msgid "`src/exceptions.rs` (you should only need to change this for the 3rd part of the exercise):" msgstr "" #: src/exercises/bare-metal/rtc.md:77 @@ -13072,8 +12304,7 @@ msgid "" "#[no_mangle]\n" "extern \"C\" fn irq_current(_elr: u64, _spsr: u64) {\n" " trace!(\"irq_current\");\n" -" let intid = GicV3::get_and_acknowledge_interrupt().expect(\"No pending " -"interrupt\");\n" +" let intid = GicV3::get_and_acknowledge_interrupt().expect(\"No pending interrupt\");\n" " info!(\"IRQ {intid:?}\");\n" "}\n" "\n" @@ -13173,8 +12404,7 @@ msgid "" "}\n" "\n" "/// Initialises UART logger.\n" -"pub fn init(uart: Uart, max_level: LevelFilter) -> Result<(), " -"SetLoggerError> {\n" +"pub fn init(uart: Uart, max_level: LevelFilter) -> Result<(), SetLoggerError> {\n" " LOGGER.uart.lock().replace(uart);\n" "\n" " log::set_logger(&LOGGER)?;\n" @@ -13302,16 +12532,13 @@ msgid "" "}\n" "\n" "impl Uart {\n" -" /// Constructs a new instance of the UART driver for a PL011 device at " -"the\n" +" /// Constructs a new instance of the UART driver for a PL011 device at the\n" " /// given base address.\n" " ///\n" " /// # Safety\n" " ///\n" -" /// The given base address must point to the MMIO control registers of " -"a\n" -" /// PL011 device, which must be mapped into the address space of the " -"process\n" +" /// The given base address must point to the MMIO control registers of a\n" +" /// PL011 device, which must be mapped into the address space of the process\n" " /// as device memory and not have any other aliases.\n" " pub unsafe fn new(base_address: *mut u32) -> Self {\n" " Self {\n" @@ -13335,14 +12562,12 @@ msgid "" " while self.read_flag_register().contains(Flags::BUSY) {}\n" " }\n" "\n" -" /// Reads and returns a pending byte, or `None` if nothing has been " -"received.\n" +" /// Reads and returns a pending byte, or `None` if nothing has been received.\n" " pub fn read_byte(&self) -> Option {\n" " if self.read_flag_register().contains(Flags::RXFE) {\n" " None\n" " } else {\n" -" let data = unsafe { addr_of!((*self.registers).dr)." -"read_volatile() };\n" +" let data = unsafe { addr_of!((*self.registers).dr).read_volatile() };\n" " // TODO: Check for error conditions in bits 8-11.\n" " Some(data as u8)\n" " }\n" @@ -13485,29 +12710,24 @@ msgid "" ".set .L_TCR_TG0_4KB, 0x0 << 14\n" "/* 4 KiB granule size for TTBR1_EL1. */\n" ".set .L_TCR_TG1_4KB, 0x2 << 30\n" -"/* Disable translation table walk for TTBR1_EL1, generating a translation " -"fault instead. */\n" +"/* Disable translation table walk for TTBR1_EL1, generating a translation fault instead. */\n" ".set .L_TCR_EPD1, 0x1 << 23\n" "/* Translation table walks for TTBR0_EL1 are inner sharable. */\n" ".set .L_TCR_SH_INNER, 0x3 << 12\n" "/*\n" -" * Translation table walks for TTBR0_EL1 are outer write-back read-allocate " -"write-allocate\n" +" * Translation table walks for TTBR0_EL1 are outer write-back read-allocate write-allocate\n" " * cacheable.\n" " */\n" ".set .L_TCR_RGN_OWB, 0x1 << 10\n" "/*\n" -" * Translation table walks for TTBR0_EL1 are inner write-back read-allocate " -"write-allocate\n" +" * Translation table walks for TTBR0_EL1 are inner write-back read-allocate write-allocate\n" " * cacheable.\n" " */\n" ".set .L_TCR_RGN_IWB, 0x1 << 8\n" "/* Size offset for TTBR0_EL1 is 2**39 bytes (512 GiB). */\n" ".set .L_TCR_T0SZ_512, 64 - 39\n" -".set .Ltcrval, .L_TCR_TG0_4KB | .L_TCR_TG1_4KB | .L_TCR_EPD1 | ." -"L_TCR_RGN_OWB\n" -".set .Ltcrval, .Ltcrval | .L_TCR_RGN_IWB | .L_TCR_SH_INNER | ." -"L_TCR_T0SZ_512\n" +".set .Ltcrval, .L_TCR_TG0_4KB | .L_TCR_TG1_4KB | .L_TCR_EPD1 | .L_TCR_RGN_OWB\n" +".set .Ltcrval, .Ltcrval | .L_TCR_RGN_IWB | .L_TCR_SH_INNER | .L_TCR_T0SZ_512\n" "\n" "/* Stage 1 instruction access cacheability is unaffected. */\n" ".set .L_SCTLR_ELx_I, 0x1 << 12\n" @@ -13523,27 +12743,23 @@ msgid "" ".set .L_SCTLR_EL1_SED, 0x1 << 8\n" "/* Various IT instructions are disabled at EL0 in aarch32 mode. */\n" ".set .L_SCTLR_EL1_ITD, 0x1 << 7\n" -".set .L_SCTLR_EL1_RES1, (0x1 << 11) | (0x1 << 20) | (0x1 << 22) | (0x1 << " -"28) | (0x1 << 29)\n" -".set .Lsctlrval, .L_SCTLR_ELx_M | .L_SCTLR_ELx_C | .L_SCTLR_ELx_SA | ." -"L_SCTLR_EL1_ITD | .L_SCTLR_EL1_SED\n" -".set .Lsctlrval, .Lsctlrval | .L_SCTLR_ELx_I | .L_SCTLR_EL1_SPAN | ." -"L_SCTLR_EL1_RES1\n" +".set .L_SCTLR_EL1_RES1, (0x1 << 11) | (0x1 << 20) | (0x1 << 22) | (0x1 << 28) | (0x1 << 29)\n" +".set .Lsctlrval, .L_SCTLR_ELx_M | .L_SCTLR_ELx_C | .L_SCTLR_ELx_SA | .L_SCTLR_EL1_ITD | ." +"L_SCTLR_EL1_SED\n" +".set .Lsctlrval, .Lsctlrval | .L_SCTLR_ELx_I | .L_SCTLR_EL1_SPAN | .L_SCTLR_EL1_RES1\n" "\n" "/**\n" -" * This is a generic entry point for an image. It carries out the operations " -"required to prepare the\n" -" * loaded image to be run. Specifically, it zeroes the bss section using " -"registers x25 and above,\n" -" * prepares the stack, enables floating point, and sets up the exception " -"vector. It preserves x0-x3\n" +" * This is a generic entry point for an image. It carries out the operations required to prepare " +"the\n" +" * loaded image to be run. Specifically, it zeroes the bss section using registers x25 and above,\n" +" * prepares the stack, enables floating point, and sets up the exception vector. It preserves x0-" +"x3\n" " * for the Rust entry point, as these may contain boot parameters.\n" " */\n" ".section .init.entry, \"ax\"\n" ".global entry\n" "entry:\n" -"\t/* Load and apply the memory management configuration, ready to enable MMU " -"and caches. */\n" +"\t/* Load and apply the memory management configuration, ready to enable MMU and caches. */\n" "\tadrp x30, idmap\n" "\tmsr ttbr0_el1, x30\n" "\n" @@ -13560,8 +12776,7 @@ msgid "" "\tmov_i x30, .Lsctlrval\n" "\n" "\t/*\n" -"\t * Ensure everything before this point has completed, then invalidate any " -"potentially stale\n" +"\t * Ensure everything before this point has completed, then invalidate any potentially stale\n" "\t * local TLB entries before they start being used.\n" "\t */\n" "\tisb\n" @@ -13571,8 +12786,7 @@ msgid "" "\tisb\n" "\n" "\t/*\n" -"\t * Configure sctlr_el1 to enable MMU and cache and don't proceed until " -"this has completed.\n" +"\t * Configure sctlr_el1 to enable MMU and cache and don't proceed until this has completed.\n" "\t */\n" "\tmsr sctlr_el1, x30\n" "\tisb\n" @@ -13637,14 +12851,11 @@ msgid "" "\n" "/**\n" " * Saves the volatile registers onto the stack. This currently takes 14\n" -" * instructions, so it can be used in exception handlers with 18 " -"instructions\n" +" * instructions, so it can be used in exception handlers with 18 instructions\n" " * left.\n" " *\n" -" * On return, x0 and x1 are initialised to elr_el2 and spsr_el2 " -"respectively,\n" -" * which can be used as the first and second arguments of a subsequent " -"call.\n" +" * On return, x0 and x1 are initialised to elr_el2 and spsr_el2 respectively,\n" +" * which can be used as the first and second arguments of a subsequent call.\n" " */\n" ".macro save_volatile_to_stack\n" "\t/* Reserve stack space and save registers x0-x18, x29 & x30. */\n" @@ -13671,8 +12882,7 @@ msgid "" "\n" "/**\n" " * Restores the volatile registers from the stack. This currently takes 14\n" -" * instructions, so it can be used in exception handlers while still leaving " -"18\n" +" * instructions, so it can be used in exception handlers while still leaving 18\n" " * instructions left; if paired with save_volatile_to_stack, there are 4\n" " * instructions to spare.\n" " */\n" @@ -13699,15 +12909,12 @@ msgid "" ".endm\n" "\n" "/**\n" -" * This is a generic handler for exceptions taken at the current EL while " -"using\n" -" * SP0. It behaves similarly to the SPx case by first switching to SPx, " -"doing\n" +" * This is a generic handler for exceptions taken at the current EL while using\n" +" * SP0. It behaves similarly to the SPx case by first switching to SPx, doing\n" " * the work, then switching back to SP0 before returning.\n" " *\n" " * Switching to SPx and calling the Rust handler takes 16 instructions. To\n" -" * restore and return we need an additional 16 instructions, so we can " -"implement\n" +" * restore and return we need an additional 16 instructions, so we can implement\n" " * the whole handler within the allotted 32 instructions.\n" " */\n" ".macro current_exception_sp0 handler:req\n" @@ -13720,18 +12927,15 @@ msgid "" ".endm\n" "\n" "/**\n" -" * This is a generic handler for exceptions taken at the current EL while " -"using\n" -" * SPx. It saves volatile registers, calls the Rust handler, restores " -"volatile\n" +" * This is a generic handler for exceptions taken at the current EL while using\n" +" * SPx. It saves volatile registers, calls the Rust handler, restores volatile\n" " * registers, then returns.\n" " *\n" " * This also works for exceptions taken from EL0, if we don't care about\n" " * non-volatile registers.\n" " *\n" " * Saving state and jumping to the Rust handler takes 15 instructions, and\n" -" * restoring and returning also takes 15 instructions, so we can fit the " -"whole\n" +" * restoring and returning also takes 15 instructions, so we can fit the whole\n" " * handler in 30 instructions, under the limit of 32.\n" " */\n" ".macro current_exception_spx handler:req\n" @@ -13848,8 +13052,7 @@ msgid "" ".set .L_TT_XN, 0x3 << 53\n" "\n" ".set .L_TT_MT_DEV, 0x0 << 2\t\t\t// MAIR #0 (DEV_nGnRE)\n" -".set .L_TT_MT_MEM, (0x1 << 2) | (0x3 << 8)\t// MAIR #1 (MEM_WBWA), inner " -"shareable\n" +".set .L_TT_MT_MEM, (0x1 << 2) | (0x3 << 8)\t// MAIR #1 (MEM_WBWA), inner shareable\n" "\n" ".set .L_BLOCK_DEV, .L_TT_TYPE_BLOCK | .L_TT_MT_DEV | .L_TT_AF | .L_TT_XN\n" ".set .L_BLOCK_MEM, .L_TT_TYPE_BLOCK | .L_TT_MT_MEM | .L_TT_AF | .L_TT_NG\n" @@ -13895,8 +13098,7 @@ msgid "" " */\n" "\n" "/*\n" -" * Code will start running at this symbol which is placed at the start of " -"the\n" +" * Code will start running at this symbol which is placed at the start of the\n" " * image.\n" " */\n" "ENTRY(entry)\n" @@ -14030,8 +13232,8 @@ msgid "" "\t$(OBJCOPY) -O binary target/aarch64-unknown-none/debug/rtc $@\n" "\n" "qemu: rtc.bin\n" -"\tqemu-system-aarch64 -machine virt,gic-version=3 -cpu max -serial mon:stdio " -"-display none -kernel $< -s\n" +"\tqemu-system-aarch64 -machine virt,gic-version=3 -cpu max -serial mon:stdio -display none -kernel " +"$< -s\n" "\n" "clean:\n" "\tcargo clean\n" @@ -14064,10 +13266,8 @@ msgstr "" #: src/concurrency.md:6 msgid "" -"The Rust type system plays an important role in making many concurrency " -"bugs\n" -"compile time bugs. This is often referred to as _fearless concurrency_ since " -"you\n" +"The Rust type system plays an important role in making many concurrency bugs\n" +"compile time bugs. This is often referred to as _fearless concurrency_ since you\n" "can rely on the compiler to ensure correctness at runtime." msgstr "" @@ -14110,18 +13310,15 @@ msgstr "" #: src/concurrency/threads.md:32 msgid "" -"* Notice that the thread is stopped before it reaches 10 — the main thread " -"is\n" +"* Notice that the thread is stopped before it reaches 10 — the main thread is\n" " not waiting.\n" "\n" -"* Use `let handle = thread::spawn(...)` and later `handle.join()` to wait " -"for\n" +"* Use `let handle = thread::spawn(...)` and later `handle.join()` to wait for\n" " the thread to finish.\n" "\n" "* Trigger a panic in the thread, notice how this doesn't affect `main`.\n" "\n" -"* Use the `Result` return value from `handle.join()` to get access to the " -"panic\n" +"* Use the `Result` return value from `handle.join()` to get access to the panic\n" " payload. This is a good time to talk about [`Any`]." msgstr "" @@ -14171,11 +13368,10 @@ msgstr "" #: src/concurrency/scoped-threads.md:37 msgid "" -"* The reason for that is that when the `thread::scope` function completes, " -"all the threads are guaranteed to be joined, so they can return borrowed " -"data.\n" -"* Normal Rust borrowing rules apply: you can either borrow mutably by one " -"thread, or immutably by any number of threads.\n" +"* The reason for that is that when the `thread::scope` function completes, all the threads are " +"guaranteed to be joined, so they can return borrowed data.\n" +"* Normal Rust borrowing rules apply: you can either borrow mutably by one thread, or immutably by " +"any number of threads.\n" " " msgstr "" @@ -14185,8 +13381,7 @@ msgstr "" #: src/concurrency/channels.md:3 msgid "" -"Rust channels have two parts: a `Sender` and a `Receiver`. The two " -"parts\n" +"Rust channels have two parts: a `Sender` and a `Receiver`. The two parts\n" "are connected via the channel, but you only see the end-points." msgstr "" @@ -14214,11 +13409,11 @@ msgstr "" #: src/concurrency/channels.md:27 msgid "" -"* `mpsc` stands for Multi-Producer, Single-Consumer. `Sender` and " -"`SyncSender` implement `Clone` (so\n" +"* `mpsc` stands for Multi-Producer, Single-Consumer. `Sender` and `SyncSender` implement `Clone` " +"(so\n" " you can make multiple producers) but `Receiver` does not.\n" -"* `send()` and `recv()` return `Result`. If they return `Err`, it means the " -"counterpart `Sender` or\n" +"* `send()` and `recv()` return `Result`. If they return `Err`, it means the counterpart `Sender` " +"or\n" " `Receiver` is dropped and the channel is closed." msgstr "" @@ -14297,34 +13492,29 @@ msgid "# `Send` and `Sync`" msgstr "" #: src/concurrency/send-sync.md:3 -msgid "" -"How does Rust know to forbid shared access across thread? The answer is in " -"two traits:" +msgid "How does Rust know to forbid shared access across thread? The answer is in two traits:" msgstr "" #: src/concurrency/send-sync.md:5 msgid "" -"* [`Send`][1]: a type `T` is `Send` if it is safe to move a `T` across a " -"thread\n" +"* [`Send`][1]: a type `T` is `Send` if it is safe to move a `T` across a thread\n" " boundary.\n" -"* [`Sync`][2]: a type `T` is `Sync` if it is safe to move a `&T` across a " -"thread\n" +"* [`Sync`][2]: a type `T` is `Sync` if it is safe to move a `&T` across a thread\n" " boundary." msgstr "" #: src/concurrency/send-sync.md:10 msgid "" -"`Send` and `Sync` are [unsafe traits][3]. The compiler will automatically " -"derive them for your types\n" -"as long as they only contain `Send` and `Sync` types. You can also implement " -"them manually when you\n" +"`Send` and `Sync` are [unsafe traits][3]. The compiler will automatically derive them for your " +"types\n" +"as long as they only contain `Send` and `Sync` types. You can also implement them manually when " +"you\n" "know it is valid." msgstr "" #: src/concurrency/send-sync.md:20 msgid "" -"* One can think of these traits as markers that the type has certain thread-" -"safety properties.\n" +"* One can think of these traits as markers that the type has certain thread-safety properties.\n" "* They can be used in the generic constraints as normal traits.\n" " " msgstr "" @@ -14334,24 +13524,19 @@ msgid "# `Send`" msgstr "" #: src/concurrency/send-sync/send.md:3 -msgid "" -"> A type `T` is [`Send`][1] if it is safe to move a `T` value to another " -"thread." +msgid "> A type `T` is [`Send`][1] if it is safe to move a `T` value to another thread." msgstr "" #: src/concurrency/send-sync/send.md:5 msgid "" -"The effect of moving ownership to another thread is that _destructors_ will " -"run\n" -"in that thread. So the question is when you can allocate a value in one " -"thread\n" +"The effect of moving ownership to another thread is that _destructors_ will run\n" +"in that thread. So the question is when you can allocate a value in one thread\n" "and deallocate it in another." msgstr "" #: src/concurrency/send-sync/send.md:13 msgid "" -"As an example, a connection to the SQLite library must only be accessed from " -"a\n" +"As an example, a connection to the SQLite library must only be accessed from a\n" "single thread." msgstr "" @@ -14361,8 +13546,7 @@ msgstr "" #: src/concurrency/send-sync/sync.md:3 msgid "" -"> A type `T` is [`Sync`][1] if it is safe to access a `T` value from " -"multiple\n" +"> A type `T` is [`Sync`][1] if it is safe to access a `T` value from multiple\n" "> threads at the same time." msgstr "" @@ -14376,18 +13560,16 @@ msgstr "" #: src/concurrency/send-sync/sync.md:14 msgid "" -"This statement is essentially a shorthand way of saying that if a type is " -"thread-safe for shared use, it is also thread-safe to pass references of it " -"across threads." +"This statement is essentially a shorthand way of saying that if a type is thread-safe for shared " +"use, it is also thread-safe to pass references of it across threads." msgstr "" #: src/concurrency/send-sync/sync.md:16 msgid "" -"This is because if a type is Sync it means that it can be shared across " -"multiple threads without the risk of data races or other synchronization " -"issues, so it is safe to move it to another thread. A reference to the type " -"is also safe to move to another thread, because the data it references can " -"be accessed from any thread safely." +"This is because if a type is Sync it means that it can be shared across multiple threads without " +"the risk of data races or other synchronization issues, so it is safe to move it to another " +"thread. A reference to the type is also safe to move to another thread, because the data it " +"references can be accessed from any thread safely." msgstr "" #: src/concurrency/send-sync/examples.md:1 @@ -14441,14 +13623,12 @@ msgid "## `!Send + Sync`" msgstr "" #: src/concurrency/send-sync/examples.md:29 -msgid "" -"These types are thread-safe, but they cannot be moved to another thread:" +msgid "These types are thread-safe, but they cannot be moved to another thread:" msgstr "" #: src/concurrency/send-sync/examples.md:31 msgid "" -"* `MutexGuard`: Uses OS level primitives which must be deallocated on " -"the\n" +"* `MutexGuard`: Uses OS level primitives which must be deallocated on the\n" " thread which created them." msgstr "" @@ -14474,15 +13654,13 @@ msgstr "" #: src/concurrency/shared_state.md:3 msgid "" -"Rust uses the type system to enforce synchronization of shared data. This " -"is\n" +"Rust uses the type system to enforce synchronization of shared data. This is\n" "primarily done via two types:" msgstr "" #: src/concurrency/shared_state.md:6 msgid "" -"* [`Arc`][1], atomic reference counted `T`: handles sharing between " -"threads and\n" +"* [`Arc`][1], atomic reference counted `T`: handles sharing between threads and\n" " takes care to deallocate `T` when the last reference is dropped,\n" "* [`Mutex`][2]: ensures mutually exclusive access to the `T` value." msgstr "" @@ -14520,17 +13698,14 @@ msgstr "" #: src/concurrency/shared_state/arc.md:29 msgid "" -"* `Arc` stands for \"Atomic Reference Counted\", a thread safe version of " -"`Rc` that uses atomic\n" +"* `Arc` stands for \"Atomic Reference Counted\", a thread safe version of `Rc` that uses atomic\n" " operations.\n" -"* `Arc` implements `Clone` whether or not `T` does. It implements `Send` " -"and `Sync` iff `T`\n" +"* `Arc` implements `Clone` whether or not `T` does. It implements `Send` and `Sync` iff `T`\n" " implements them both.\n" -"* `Arc::clone()` has the cost of atomic operations that get executed, but " -"after that the use of the\n" +"* `Arc::clone()` has the cost of atomic operations that get executed, but after that the use of " +"the\n" " `T` is free.\n" -"* Beware of reference cycles, `Arc` does not use a garbage collector to " -"detect them.\n" +"* Beware of reference cycles, `Arc` does not use a garbage collector to detect them.\n" " * `std::sync::Weak` can help." msgstr "" @@ -14571,22 +13746,19 @@ msgstr "" #: src/concurrency/shared_state/mutex.md:31 msgid "" -"* `Mutex` in Rust looks like a collection with just one element - the " -"protected data.\n" -" * It is not possible to forget to acquire the mutex before accessing the " -"protected data.\n" -"* You can get an `&mut T` from an `&Mutex` by taking the lock. The " -"`MutexGuard` ensures that the\n" +"* `Mutex` in Rust looks like a collection with just one element - the protected data.\n" +" * It is not possible to forget to acquire the mutex before accessing the protected data.\n" +"* You can get an `&mut T` from an `&Mutex` by taking the lock. The `MutexGuard` ensures that " +"the\n" " `&mut T` doesn't outlive the lock being held.\n" "* `Mutex` implements both `Send` and `Sync` iff `T` implements `Send`.\n" "* A read-write lock counterpart - `RwLock`.\n" "* Why does `lock()` return a `Result`? \n" -" * If the thread that held the `Mutex` panicked, the `Mutex` becomes " -"\"poisoned\" to signal that\n" -" the data it protected might be in an inconsistent state. Calling " -"`lock()` on a poisoned mutex\n" -" fails with a [`PoisonError`]. You can call `into_inner()` on the error " -"to recover the data\n" +" * If the thread that held the `Mutex` panicked, the `Mutex` becomes \"poisoned\" to signal " +"that\n" +" the data it protected might be in an inconsistent state. Calling `lock()` on a poisoned " +"mutex\n" +" fails with a [`PoisonError`]. You can call `into_inner()` on the error to recover the data\n" " regardless." msgstr "" @@ -14650,14 +13822,11 @@ msgstr "" #: src/concurrency/shared_state/example.md:51 msgid "" -"* `v` is wrapped in both `Arc` and `Mutex`, because their concerns are " -"orthogonal.\n" -" * Wrapping a `Mutex` in an `Arc` is a common pattern to share mutable " -"state between threads.\n" -"* `v: Arc<_>` needs to be cloned as `v2` before it can be moved into another " -"thread. Note `move` was added to the lambda signature.\n" -"* Blocks are introduced to narrow the scope of the `LockGuard` as much as " -"possible." +"* `v` is wrapped in both `Arc` and `Mutex`, because their concerns are orthogonal.\n" +" * Wrapping a `Mutex` in an `Arc` is a common pattern to share mutable state between threads.\n" +"* `v: Arc<_>` needs to be cloned as `v2` before it can be moved into another thread. Note `move` " +"was added to the lambda signature.\n" +"* Blocks are introduced to narrow the scope of the `LockGuard` as much as possible." msgstr "" #: src/exercises/concurrency/morning.md:3 @@ -14682,27 +13851,19 @@ msgstr "" #: src/exercises/concurrency/dining-philosophers.md:5 msgid "" -"> Five philosophers dine together at the same table. Each philosopher has " -"their\n" -"> own place at the table. There is a fork between each plate. The dish " -"served is\n" -"> a kind of spaghetti which has to be eaten with two forks. Each philosopher " -"can\n" -"> only alternately think and eat. Moreover, a philosopher can only eat " -"their\n" -"> spaghetti when they have both a left and right fork. Thus two forks will " -"only\n" -"> be available when their two nearest neighbors are thinking, not eating. " -"After\n" +"> Five philosophers dine together at the same table. Each philosopher has their\n" +"> own place at the table. There is a fork between each plate. The dish served is\n" +"> a kind of spaghetti which has to be eaten with two forks. Each philosopher can\n" +"> only alternately think and eat. Moreover, a philosopher can only eat their\n" +"> spaghetti when they have both a left and right fork. Thus two forks will only\n" +"> be available when their two nearest neighbors are thinking, not eating. After\n" "> an individual philosopher finishes eating, they will put down both forks." msgstr "" #: src/exercises/concurrency/dining-philosophers.md:13 msgid "" -"You will need a local [Cargo installation](../../cargo/running-locally.md) " -"for\n" -"this exercise. Copy the code below to a file called `src/main.rs`, fill out " -"the\n" +"You will need a local [Cargo installation](../../cargo/running-locally.md) for\n" +"this exercise. Copy the code below to a file called `src/main.rs`, fill out the\n" "blanks, and test that `cargo run` does not deadlock:" msgstr "" @@ -14771,11 +13932,9 @@ msgstr "" #: src/exercises/concurrency/link-checker.md:3 msgid "" -"Let us use our new knowledge to create a multi-threaded link checker. It " -"should\n" +"Let us use our new knowledge to create a multi-threaded link checker. It should\n" "start at a webpage and check that links on the page are valid. It should\n" -"recursively check other pages on the same domain and keep doing this until " -"all\n" +"recursively check other pages on the same domain and keep doing this until all\n" "pages have been validated." msgstr "" @@ -14796,14 +13955,12 @@ msgstr "" #: src/exercises/concurrency/link-checker.md:17 msgid "" -"> If `cargo add` fails with `error: no such subcommand`, then please edit " -"the\n" +"> If `cargo add` fails with `error: no such subcommand`, then please edit the\n" "> `Cargo.toml` file by hand. Add the dependencies listed below." msgstr "" #: src/exercises/concurrency/link-checker.md:20 -msgid "" -"You will also need a way to find links. We can use [`scraper`][2] for that:" +msgid "You will also need a way to find links. We can use [`scraper`][2] for that:" msgstr "" #: src/exercises/concurrency/link-checker.md:22 @@ -14815,8 +13972,7 @@ msgstr "" #: src/exercises/concurrency/link-checker.md:26 msgid "" -"Finally, we'll need some way of handling errors. We use [`thiserror`][3] " -"for\n" +"Finally, we'll need some way of handling errors. We use [`thiserror`][3] for\n" "that:" msgstr "" @@ -14828,8 +13984,7 @@ msgid "" msgstr "" #: src/exercises/concurrency/link-checker.md:33 -msgid "" -"The `cargo add` calls will update the `Cargo.toml` file to look like this:" +msgid "The `cargo add` calls will update the `Cargo.toml` file to look like this:" msgstr "" #: src/exercises/concurrency/link-checker.md:37 @@ -14842,8 +13997,7 @@ msgid "" "publish = false\n" "\n" "[dependencies]\n" -"reqwest = { version = \"0.11.12\", features = [\"blocking\", \"rustls-" -"tls\"] }\n" +"reqwest = { version = \"0.11.12\", features = [\"blocking\", \"rustls-tls\"] }\n" "scraper = \"0.13.0\"\n" "thiserror = \"1.0.37\"\n" "```" @@ -14885,8 +14039,7 @@ msgid "" " match base_url.join(href) {\n" " Ok(url) => valid_urls.push(url),\n" " Err(err) => {\n" -" println!(\"On {base_url}: could not parse {href:?}: " -"{err} (ignored)\",);\n" +" println!(\"On {base_url}: could not parse {href:?}: {err} (ignored)\",);\n" " }\n" " }\n" " }\n" @@ -14917,19 +14070,16 @@ msgid "" "```" msgstr "" -#: src/exercises/concurrency/link-checker.md:106 -#: src/exercises/concurrency/chat-app.md:140 +#: src/exercises/concurrency/link-checker.md:106 src/exercises/concurrency/chat-app.md:140 msgid "## Tasks" msgstr "" #: src/exercises/concurrency/link-checker.md:108 msgid "" -"* Use threads to check the links in parallel: send the URLs to be checked to " -"a\n" +"* Use threads to check the links in parallel: send the URLs to be checked to a\n" " channel and let a few threads check the URLs in parallel.\n" "* Extend this to recursively extract links from all pages on the\n" -" `www.google.org` domain. Put an upper limit of 100 pages or so so that " -"you\n" +" `www.google.org` domain. Put an upper limit of 100 pages or so so that you\n" " don't end up being blocked by the site." msgstr "" @@ -14939,25 +14089,18 @@ msgstr "" #: src/async.md:3 msgid "" -"\"Async\" is a concurrency model where multiple tasks are executed " -"concurrently by\n" -"executing each task until it would block, then switching to another task " -"that is\n" -"ready to make progress. The model allows running a larger number of tasks on " -"a\n" -"limited number of threads. This is because the per-task overhead is " -"typically\n" -"very low and operating systems provide primitives for efficiently " -"identifying\n" +"\"Async\" is a concurrency model where multiple tasks are executed concurrently by\n" +"executing each task until it would block, then switching to another task that is\n" +"ready to make progress. The model allows running a larger number of tasks on a\n" +"limited number of threads. This is because the per-task overhead is typically\n" +"very low and operating systems provide primitives for efficiently identifying\n" "I/O that is able to proceed." msgstr "" #: src/async.md:10 msgid "" -"Rust's asynchronous operation is based on \"futures\", which represent work " -"that\n" -"may be completed in the future. Futures are \"polled\" until they signal " -"that\n" +"Rust's asynchronous operation is based on \"futures\", which represent work that\n" +"may be completed in the future. Futures are \"polled\" until they signal that\n" "they are complete." msgstr "" @@ -14973,14 +14116,11 @@ msgstr "" #: src/async.md:19 msgid "" -" * Python has a similar model in its `asyncio`. However, its `Future` type " -"is\n" -" callback-based, and not polled. Async Python programs require a " -"\"loop\",\n" +" * Python has a similar model in its `asyncio`. However, its `Future` type is\n" +" callback-based, and not polled. Async Python programs require a \"loop\",\n" " similar to a runtime in Rust.\n" "\n" -" * JavaScript's `Promise` is similar, but again callback-based. The " -"language\n" +" * JavaScript's `Promise` is similar, but again callback-based. The language\n" " runtime implements the event loop, so many of the details of Promise\n" " resolution are hidden." msgstr "" @@ -14990,9 +14130,7 @@ msgid "# `async`/`await`" msgstr "" #: src/async/async-await.md:3 -msgid "" -"At a high level, async Rust code looks very much like \"normal\" sequential " -"code:" +msgid "At a high level, async Rust code looks very much like \"normal\" sequential code:" msgstr "" #: src/async/async-await.md:5 @@ -15018,27 +14156,22 @@ msgstr "" #: src/async/async-await.md:27 msgid "" -"* Note that this is a simplified example to show the syntax. There is no " -"long\n" +"* Note that this is a simplified example to show the syntax. There is no long\n" " running operation or any real concurrency in it!\n" "\n" "* What is the return type of an async call?\n" " * Use `let future: () = async_main(10);` in `main` to see the type.\n" "\n" -"* The \"async\" keyword is syntactic sugar. The compiler replaces the return " -"type\n" +"* The \"async\" keyword is syntactic sugar. The compiler replaces the return type\n" " with a future. \n" "\n" -"* You cannot make `main` async, without additional instructions to the " -"compiler\n" +"* You cannot make `main` async, without additional instructions to the compiler\n" " on how to use the returned future.\n" "\n" -"* You need an executor to run async code. `block_on` blocks the current " -"thread\n" +"* You need an executor to run async code. `block_on` blocks the current thread\n" " until the provided future has run to completion. \n" "\n" -"* `.await` asynchronously waits for the completion of another operation. " -"Unlike\n" +"* `.await` asynchronously waits for the completion of another operation. Unlike\n" " `block_on`, `.await` doesn't block the current thread.\n" "\n" "* `.await` can only be used inside an `async` function (or block; these are\n" @@ -15052,8 +14185,7 @@ msgstr "" #: src/async/futures.md:3 msgid "" "[`Future`](https://doc.rust-lang.org/std/future/trait.Future.html)\n" -"is a trait, implemented by objects that represent an operation that may not " -"be\n" +"is a trait, implemented by objects that represent an operation that may not be\n" "complete yet. A future can be polled, and `poll` returns a\n" "[`Poll`](https://doc.rust-lang.org/std/task/enum.Poll.html)." msgstr "" @@ -15066,8 +14198,7 @@ msgid "" "\n" "pub trait Future {\n" " type Output;\n" -" fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll;\n" +" fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll;\n" "}\n" "\n" "pub enum Poll {\n" @@ -15079,17 +14210,14 @@ msgstr "" #: src/async/futures.md:23 msgid "" -"An async function returns an `impl Future`. It's also possible (but " -"uncommon) to\n" -"implement `Future` for your own types. For example, the `JoinHandle` " -"returned\n" +"An async function returns an `impl Future`. It's also possible (but uncommon) to\n" +"implement `Future` for your own types. For example, the `JoinHandle` returned\n" "from `tokio::spawn` implements `Future` to allow joining to it." msgstr "" #: src/async/futures.md:27 msgid "" -"The `.await` keyword, applied to a Future, causes the current async function " -"to\n" +"The `.await` keyword, applied to a Future, causes the current async function to\n" "pause until that Future is ready, and then evaluates to its output." msgstr "" @@ -15104,10 +14232,8 @@ msgid "" " * `Context` allows a Future to schedule itself to be polled again when an\n" " event occurs.\n" "\n" -" * `Pin` ensures that the Future isn't moved in memory, so that pointers " -"into\n" -" that future remain valid. This is required to allow references to " -"remain\n" +" * `Pin` ensures that the Future isn't moved in memory, so that pointers into\n" +" that future remain valid. This is required to allow references to remain\n" " valid after an `.await`." msgstr "" @@ -15118,19 +14244,16 @@ msgstr "" #: src/async/runtimes.md:3 msgid "" "A *runtime* provides support for performing operations asynchronously (a\n" -"*reactor*) and is responsible for executing futures (an *executor*). Rust " -"does not have a\n" +"*reactor*) and is responsible for executing futures (an *executor*). Rust does not have a\n" "\"built-in\" runtime, but several options are available:" msgstr "" #: src/async/runtimes.md:7 msgid "" -" * [Tokio](https://tokio.rs/) - performant, with a well-developed ecosystem " -"of\n" +" * [Tokio](https://tokio.rs/) - performant, with a well-developed ecosystem of\n" " functionality like [Hyper](https://hyper.rs/) for HTTP or\n" " [Tonic](https://github.com/hyperium/tonic) for gRPC.\n" -" * [async-std](https://async.rs/) - aims to be a \"std for async\", and " -"includes a\n" +" * [async-std](https://async.rs/) - aims to be a \"std for async\", and includes a\n" " basic runtime in `async::task`.\n" " * [smol](https://docs.rs/smol/latest/smol/) - simple and lightweight" msgstr "" @@ -15138,23 +14261,20 @@ msgstr "" #: src/async/runtimes.md:14 msgid "" "Several larger applications have their own runtimes. For example,\n" -"[Fuchsia](https://fuchsia.googlesource.com/fuchsia/+/refs/heads/main/src/lib/" -"fuchsia-async/src/lib.rs)\n" +"[Fuchsia](https://fuchsia.googlesource.com/fuchsia/+/refs/heads/main/src/lib/fuchsia-async/src/lib." +"rs)\n" "already has one." msgstr "" #: src/async/runtimes.md:20 msgid "" "* Note that of the listed runtimes, only Tokio is supported in the Rust\n" -" playground. The playground also does not permit any I/O, so most " -"interesting\n" +" playground. The playground also does not permit any I/O, so most interesting\n" " async things can't run in the playground.\n" "\n" -"* Futures are \"inert\" in that they do not do anything (not even start an I/" -"O\n" +"* Futures are \"inert\" in that they do not do anything (not even start an I/O\n" " operation) unless there is an executor polling them. This differs from JS\n" -" Promises, for example, which will run to completion even if they are " -"never\n" +" Promises, for example, which will run to completion even if they are never\n" " used." msgstr "" @@ -15213,8 +14333,7 @@ msgstr "" #: src/async/runtimes/tokio.md:41 msgid "" "* Why does `count_to` not (usually) get to 10? This is an example of async\n" -" cancellation. `tokio::spawn` returns a handle which can be awaited to " -"wait\n" +" cancellation. `tokio::spawn` returns a handle which can be awaited to wait\n" " until it finishes.\n" "\n" "* Try `count_to(10).await` instead of spawning.\n" @@ -15234,12 +14353,9 @@ msgstr "" #: src/async/tasks.md:6 msgid "" -"A task has a single top-level future which the executor polls to make " -"progress.\n" -"That future may have one or more nested futures that its `poll` method " -"polls,\n" -"corresponding loosely to a call stack. Concurrency within a task is possible " -"by\n" +"A task has a single top-level future which the executor polls to make progress.\n" +"That future may have one or more nested futures that its `poll` method polls,\n" +"corresponding loosely to a call stack. Concurrency within a task is possible by\n" "polling multiple child futures, such as racing a timer and an I/O operation." msgstr "" @@ -15268,8 +14384,7 @@ msgid "" " let mut buf = vec![0; 1024];\n" " let reply = match socket.read(&mut buf).await {\n" " Ok(n) => {\n" -" let name = std::str::from_utf8(&buf[..n]).unwrap()." -"trim();\n" +" let name = std::str::from_utf8(&buf[..n]).unwrap().trim();\n" " format!(\"Thanks for dialing in, {name}!\\n\")\n" " }\n" " Err(e) => {\n" @@ -15288,22 +14403,19 @@ msgid "" msgstr "" #: src/async/tasks.md:53 src/async/control-flow/join.md:36 -msgid "" -"Copy this example into your prepared `src/main.rs` and run it from there." +msgid "Copy this example into your prepared `src/main.rs` and run it from there." msgstr "" #: src/async/tasks.md:55 msgid "" -"* Ask students to visualize what the state of the example server would be " -"with a\n" +"* Ask students to visualize what the state of the example server would be with a\n" " few connected clients. What tasks exist? What are their Futures?\n" "\n" "* This is the first time we've seen an `async` block. This is similar to a\n" " closure, but does not take any arguments. Its return value is a Future,\n" " similar to an `async fn`. \n" "\n" -"* Refactor the async block into a function, and improve the error handling " -"using `?`." +"* Refactor the async block into a function, and improve the error handling using `?`." msgstr "" #: src/async/channels.md:1 @@ -15311,9 +14423,7 @@ msgid "# Async Channels" msgstr "" #: src/async/channels.md:3 -msgid "" -"Several crates have support for `async`/`await`. For instance `tokio` " -"channels:" +msgid "Several crates have support for `async`/`await`. For instance `tokio` channels:" msgstr "" #: src/async/channels.md:5 @@ -15342,8 +14452,7 @@ msgid "" " }\n" "\n" " std::mem::drop(sender);\n" -" ping_handler_task.await.expect(\"Something went wrong in ping handler " -"task.\");\n" +" ping_handler_task.await.expect(\"Something went wrong in ping handler task.\");\n" "}\n" "```" msgstr "" @@ -15358,12 +14467,10 @@ msgid "" "* Try removing the `std::mem::drop` call. What happens? Why?\n" "\n" "* The [Flume](https://docs.rs/flume/latest/flume/) crate has channels that\n" -" implement both `sync` and `async` `send` and `recv`. This can be " -"convenient\n" +" implement both `sync` and `async` `send` and `recv`. This can be convenient\n" " for complex applications with both IO and heavy CPU processing tasks.\n" "\n" -"* What makes working with `async` channels preferable is the ability to " -"combine\n" +"* What makes working with `async` channels preferable is the ability to combine\n" " them with other `future`s to combine them and create complex control flow." msgstr "" @@ -15373,8 +14480,7 @@ msgstr "" #: src/async/control-flow.md:3 msgid "" -"Futures can be combined together to produce concurrent compute flow graphs. " -"We\n" +"Futures can be combined together to produce concurrent compute flow graphs. We\n" "have already seen tasks, that function as independent threads of execution." msgstr "" @@ -15427,21 +14533,17 @@ msgstr "" #: src/async/control-flow/join.md:38 msgid "" -"* For multiple futures of disjoint types, you can use `std::future::join!` " -"but\n" +"* For multiple futures of disjoint types, you can use `std::future::join!` but\n" " you must know how many futures you will have at compile time. This is\n" " currently in the `futures` crate, soon to be stabilised in `std::future`.\n" "\n" -"* The risk of `join` is that one of the futures may never resolve, this " -"would\n" +"* The risk of `join` is that one of the futures may never resolve, this would\n" " cause your program to stall. \n" "\n" -"* You can also combine `join_all` with `join!` for instance to join all " -"requests\n" +"* You can also combine `join_all` with `join!` for instance to join all requests\n" " to an http service as well as a database query. Try adding a\n" " `tokio::time::sleep` to the future, using `futures::join!`. This is not a\n" -" timeout (that requires `select!`, explained in the next chapter), but " -"demonstrates `join!`." +" timeout (that requires `select!`, explained in the next chapter), but demonstrates `join!`." msgstr "" #: src/async/control-flow/select.md:1 @@ -15450,8 +14552,7 @@ msgstr "" #: src/async/control-flow/select.md:3 msgid "" -"A select operation waits until any of a set of futures is ready, and " -"responds to\n" +"A select operation waits until any of a set of futures is ready, and responds to\n" "that future's result. In JavaScript, this is similar to `Promise.race`. In\n" "Python, it compares to `asyncio.wait(task_set,\n" "return_when=asyncio.FIRST_COMPLETED)`." @@ -15459,10 +14560,8 @@ msgstr "" #: src/async/control-flow/select.md:8 msgid "" -"This is usually a macro, similar to match, with each arm of the form " -"`pattern =\n" -"future => statement`. When the future is ready, the statement is executed " -"with the\n" +"This is usually a macro, similar to match, with each arm of the form `pattern =\n" +"future => statement`. When the future is ready, the statement is executed with the\n" "variable bound to the future's result." msgstr "" @@ -15519,22 +14618,18 @@ msgstr "" #: src/async/control-flow/select.md:61 msgid "" "* In this example, we have a race between a cat and a dog.\n" -" `first_animal_to_finish_race` listens to both channels and will pick " -"whichever\n" +" `first_animal_to_finish_race` listens to both channels and will pick whichever\n" " arrives first. Since the dog takes 50ms, it wins against the cat that\n" " take 500ms seconds.\n" "\n" -"* You can use `oneshot` channels in this example as the channels are " -"supposed to\n" +"* You can use `oneshot` channels in this example as the channels are supposed to\n" " receive only one `send`.\n" "\n" -"* Try adding a deadline to the race, demonstrating selecting different sorts " -"of\n" +"* Try adding a deadline to the race, demonstrating selecting different sorts of\n" " futures.\n" "\n" "* Note that `select!` moves the values it is given. It is easiest to use\n" -" when every execution of `select!` creates new futures. An alternative is " -"to\n" +" when every execution of `select!` creates new futures. An alternative is to\n" " pass `&mut future` instead of the future itself, but this can lead to\n" " issues, further discussed in the pinning slide." msgstr "" @@ -15545,10 +14640,9 @@ msgstr "" #: src/async/pitfalls.md:3 msgid "" -"Async / await provides convenient and efficient abstraction for concurrent " -"asynchronous programming. However, the async/await model in Rust also comes " -"with its share of pitfalls and footguns. We illustrate some of them in this " -"chapter:" +"Async / await provides convenient and efficient abstraction for concurrent asynchronous " +"programming. However, the async/await model in Rust also comes with its share of pitfalls and " +"footguns. We illustrate some of them in this chapter:" msgstr "" #: src/async/pitfalls.md:5 @@ -15565,8 +14659,8 @@ msgstr "" #: src/async/pitfalls/blocking-executor.md:3 msgid "" "Most async runtimes only allow IO tasks to run concurrently.\n" -"This means that CPU blocking tasks will block the executor and prevent other " -"tasks from being executed.\n" +"This means that CPU blocking tasks will block the executor and prevent other tasks from being " +"executed.\n" "An easy workaround is to use async equivalent methods where possible." msgstr "" @@ -15598,30 +14692,22 @@ msgid "" "* Run the code and see that the sleeps happen consecutively rather than\n" " concurrently.\n" "\n" -"* The `\"current_thread\"` flavor puts all tasks on a single thread. This " -"makes the\n" +"* The `\"current_thread\"` flavor puts all tasks on a single thread. This makes the\n" " effect more obvious, but the bug is still present in the multi-threaded\n" " flavor.\n" "\n" -"* Switch the `std::thread::sleep` to `tokio::time::sleep` and await its " -"result.\n" +"* Switch the `std::thread::sleep` to `tokio::time::sleep` and await its result.\n" "\n" -"* Another fix would be to `tokio::task::spawn_blocking` which spawns an " -"actual\n" -" thread and transforms its handle into a future without blocking the " -"executor.\n" +"* Another fix would be to `tokio::task::spawn_blocking` which spawns an actual\n" +" thread and transforms its handle into a future without blocking the executor.\n" "\n" -"* You should not think of tasks as OS threads. They do not map 1 to 1 and " -"most\n" +"* You should not think of tasks as OS threads. They do not map 1 to 1 and most\n" " executors will allow many tasks to run on a single OS thread. This is\n" -" particularly problematic when interacting with other libraries via FFI, " -"where\n" +" particularly problematic when interacting with other libraries via FFI, where\n" " that library might depend on thread-local storage or map to specific OS\n" -" threads (e.g., CUDA). Prefer `tokio::task::spawn_blocking` in such " -"situations.\n" +" threads (e.g., CUDA). Prefer `tokio::task::spawn_blocking` in such situations.\n" "\n" -"* Use sync mutexes with care. Holding a mutex over an `.await` may cause " -"another\n" +"* Use sync mutexes with care. Holding a mutex over an `.await` may cause another\n" " task to block, and that task may be running on the same thread." msgstr "" @@ -15631,21 +14717,16 @@ msgstr "" #: src/async/pitfalls/pin.md:3 msgid "" -"When you await a future, all local variables (that would ordinarily be " -"stored on\n" -"a stack frame) are instead stored in the Future for the current async block. " -"If your\n" -"future has pointers to data on the stack, those pointers might get " -"invalidated.\n" +"When you await a future, all local variables (that would ordinarily be stored on\n" +"a stack frame) are instead stored in the Future for the current async block. If your\n" +"future has pointers to data on the stack, those pointers might get invalidated.\n" "This is unsafe." msgstr "" #: src/async/pitfalls/pin.md:8 msgid "" -"Therefore, you must guarantee that the addresses your future points to " -"don't\n" -"change. That is why we need to `pin` futures. Using the same future " -"repeatedly\n" +"Therefore, you must guarantee that the addresses your future points to don't\n" +"change. That is why we need to `pin` futures. Using the same future repeatedly\n" "in a `select!` often leads to issues with pinned values." msgstr "" @@ -15711,16 +14792,13 @@ msgid "" "* You may recognize this as an example of the actor pattern. Actors\n" " typically call `select!` in a loop.\n" "\n" -"* This serves as a summation of a few of the previous lessons, so take your " -"time\n" +"* This serves as a summation of a few of the previous lessons, so take your time\n" " with it.\n" "\n" -" * Naively add a `_ = sleep(Duration::from_millis(100)) => { println!" -"(..) }`\n" +" * Naively add a `_ = sleep(Duration::from_millis(100)) => { println!(..) }`\n" " to the `select!`. This will never execute. Why?\n" "\n" -" * Instead, add a `timeout_fut` containing that future outside of the " -"`loop`:\n" +" * Instead, add a `timeout_fut` containing that future outside of the `loop`:\n" "\n" " ```rust,compile_fail\n" " let mut timeout_fut = sleep(Duration::from_millis(100));\n" @@ -15731,8 +14809,7 @@ msgid "" " }\n" " }\n" " ```\n" -" * This still doesn't work. Follow the compiler errors, adding `&mut` to " -"the\n" +" * This still doesn't work. Follow the compiler errors, adding `&mut` to the\n" " `timeout_fut` in the `select!` to work around the move, then using\n" " `Box::pin`:\n" "\n" @@ -15746,18 +14823,16 @@ msgid "" " }\n" " ```\n" "\n" -" * This compiles, but once the timeout expires it is `Poll::Ready` on " -"every\n" +" * This compiles, but once the timeout expires it is `Poll::Ready` on every\n" " iteration (a fused future would help with this). Update to reset\n" " `timeout_fut` every time it expires.\n" "\n" "* Box allocates on the heap. In some cases, `std::pin::pin!` (only recently\n" -" stabilized, with older code often using `tokio::pin!`) is also an option, " -"but\n" +" stabilized, with older code often using `tokio::pin!`) is also an option, but\n" " that is difficult to use for a future that is reassigned.\n" "\n" -"* Another alternative is to not use `pin` at all but spawn another task that " -"will send to a `oneshot` channel every 100ms." +"* Another alternative is to not use `pin` at all but spawn another task that will send to a " +"`oneshot` channel every 100ms." msgstr "" #: src/async/pitfalls/async-traits.md:1 @@ -15766,16 +14841,15 @@ msgstr "" #: src/async/pitfalls/async-traits.md:3 msgid "" -"Async methods in traits are not yet supported in the stable channel ([An " -"experimental feature exists in nightly and should be stabilized in the mid " -"term.](https://blog.rust-lang.org/inside-rust/2022/11/17/async-fn-in-trait-" -"nightly.html))" +"Async methods in traits are not yet supported in the stable channel ([An experimental feature " +"exists in nightly and should be stabilized in the mid term.](https://blog.rust-lang.org/inside-" +"rust/2022/11/17/async-fn-in-trait-nightly.html))" msgstr "" #: src/async/pitfalls/async-traits.md:5 msgid "" -"The crate [async_trait](https://docs.rs/async-trait/latest/async_trait/) " -"provides a workaround through a macro:" +"The crate [async_trait](https://docs.rs/async-trait/latest/async_trait/) provides a workaround " +"through a macro:" msgstr "" #: src/async/pitfalls/async-traits.md:7 @@ -15801,8 +14875,7 @@ msgid "" " }\n" "}\n" "\n" -"async fn run_all_sleepers_multiple_times(sleepers: Vec>, " -"n_times: usize) {\n" +"async fn run_all_sleepers_multiple_times(sleepers: Vec>, n_times: usize) {\n" " for _ in 0..n_times {\n" " println!(\"running all sleepers..\");\n" " for sleeper in &sleepers {\n" @@ -15830,31 +14903,26 @@ msgstr "" #: src/async/pitfalls/async-traits.md:51 msgid "" -"* `async_trait` is easy to use, but note that it's using heap allocations " -"to\n" +"* `async_trait` is easy to use, but note that it's using heap allocations to\n" " achieve this. This heap allocation has performance overhead.\n" "\n" "* The challenges in language support for `async trait` are deep Rust and\n" " probably not worth describing in-depth. Niko Matsakis did a good job of\n" " explaining them in [this\n" -" post](https://smallcultfollowing.com/babysteps/blog/2019/10/26/async-fn-in-" -"traits-are-hard/)\n" +" post](https://smallcultfollowing.com/babysteps/blog/2019/10/26/async-fn-in-traits-are-hard/)\n" " if you are interested in digging deeper.\n" "\n" -"* Try creating a new sleeper struct that will sleep for a random amount of " -"time\n" +"* Try creating a new sleeper struct that will sleep for a random amount of time\n" " and adding it to the Vec." msgstr "" #: src/exercises/concurrency/afternoon.md:3 -msgid "" -"To practice your Async Rust skills, we have again two exercises for you:" +msgid "To practice your Async Rust skills, we have again two exercises for you:" msgstr "" #: src/exercises/concurrency/afternoon.md:5 msgid "" -"* Dining philosophers: we already saw this problem in the morning. This " -"time\n" +"* Dining philosophers: we already saw this problem in the morning. This time\n" " you are going to implement it with Async Rust.\n" "\n" "* A Broadcast Chat Application: this is a larger project that allows you\n" @@ -15874,10 +14942,8 @@ msgstr "" #: src/exercises/concurrency/dining-philosophers-async.md:6 msgid "" "As before, you will need a local\n" -"[Cargo installation](../../cargo/running-locally.md) for this exercise. " -"Copy\n" -"the code below to a file called `src/main.rs`, fill out the blanks, and " -"test\n" +"[Cargo installation](../../cargo/running-locally.md) for this exercise. Copy\n" +"the code below to a file called `src/main.rs`, fill out the blanks, and test\n" "that `cargo run` does not deadlock:" msgstr "" @@ -15901,8 +14967,7 @@ msgid "" "impl Philosopher {\n" " async fn think(&self) {\n" " self.thoughts\n" -" .send(format!(\"Eureka! {} has a new idea!\", &self.name))." -"await\n" +" .send(format!(\"Eureka! {} has a new idea!\", &self.name)).await\n" " .unwrap();\n" " }\n" "\n" @@ -15944,8 +15009,7 @@ msgid "" "edition = \"2021\"\n" "\n" "[dependencies]\n" -"tokio = {version = \"1.26.0\", features = [\"sync\", \"time\", \"macros\", " -"\"rt-multi-thread\"]}\n" +"tokio = {version = \"1.26.0\", features = [\"sync\", \"time\", \"macros\", \"rt-multi-thread\"]}\n" "```" msgstr "" @@ -15966,8 +15030,7 @@ msgstr "" #: src/exercises/concurrency/chat-app.md:3 msgid "" "In this exercise, we want to use our new knowledge to implement a broadcast\n" -"chat application. We have a chat server that the clients connect to and " -"publish\n" +"chat application. We have a chat server that the clients connect to and publish\n" "their messages. The client reads user messages from the standard input, and\n" "sends them to the server. The chat server broadcasts each message that it\n" "receives to all the clients." @@ -16011,8 +15074,7 @@ msgstr "" #: src/exercises/concurrency/chat-app.md:33 msgid "" "You are going to need the following functions from `tokio` and\n" -"[`tokio_websockets`][2]. Spend a few minutes to familiarize yourself with " -"the\n" +"[`tokio_websockets`][2]. Spend a few minutes to familiarize yourself with the\n" "API. " msgstr "" @@ -16034,8 +15096,7 @@ msgstr "" #: src/exercises/concurrency/chat-app.md:48 msgid "" "Normally in a Cargo project, you can have only one binary, and one\n" -"`src/main.rs` file. In this project, we need two binaries. One for the " -"client,\n" +"`src/main.rs` file. In this project, we need two binaries. One for the client,\n" "and one for the server. You could potentially make them two separate Cargo\n" "projects, but we are going to put them in a single Cargo project with two\n" "binaries. For this to work, the client and the server code should go under\n" @@ -16049,8 +15110,7 @@ msgid "" "described below. " msgstr "" -#: src/exercises/concurrency/chat-app.md:59 -#: src/exercises/concurrency/solutions-afternoon.md:117 +#: src/exercises/concurrency/chat-app.md:59 src/exercises/concurrency/solutions-afternoon.md:117 msgid "`src/bin/server.rs`:" msgstr "" @@ -16100,8 +15160,7 @@ msgid "" "```" msgstr "" -#: src/exercises/concurrency/chat-app.md:102 -#: src/exercises/concurrency/solutions-afternoon.md:202 +#: src/exercises/concurrency/chat-app.md:102 src/exercises/concurrency/solutions-afternoon.md:202 msgid "`src/bin/client.rs`:" msgstr "" @@ -16119,8 +15178,7 @@ msgid "" "\n" "#[tokio::main]\n" "async fn main() -> Result<(), tokio_websockets::Error> {\n" -" let mut ws_stream = ClientBuilder::from_uri(Uri::" -"from_static(\"ws://127.0.0.1:2000\"))\n" +" let mut ws_stream = ClientBuilder::from_uri(Uri::from_static(\"ws://127.0.0.1:2000\"))\n" " .connect()\n" " .await?;\n" "\n" @@ -16164,15 +15222,12 @@ msgstr "" msgid "" "* Implement the `handle_connection` function in `src/bin/server.rs`.\n" " * Hint: Use `tokio::select!` for concurrently performing two tasks in a\n" -" continuous loop. One task receives messages from the client and " -"broadcasts\n" +" continuous loop. One task receives messages from the client and broadcasts\n" " them. The other sends messages received by the server to the client.\n" "* Complete the main function in `src/bin/client.rs`.\n" -" * Hint: As before, use `tokio::select!` in a continuous loop for " -"concurrently\n" +" * Hint: As before, use `tokio::select!` in a continuous loop for concurrently\n" " performing two tasks: (1) reading user messages from standard input and\n" -" sending them to the server, and (2) receiving messages from the server, " -"and\n" +" sending them to the server, and (2) receiving messages from the server, and\n" " displaying them for the user.\n" "* Optional: Once you are done, change the code to broadcast messages to all\n" " clients, but the sender of the message." @@ -16184,20 +15239,16 @@ msgstr "" #: src/thanks.md:3 msgid "" -"_Thank you for taking Comprehensive Rust 🦀!_ We hope you enjoyed it and " -"that it\n" +"_Thank you for taking Comprehensive Rust 🦀!_ We hope you enjoyed it and that it\n" "was useful." msgstr "" #: src/thanks.md:6 msgid "" -"We've had a lot of fun putting the course together. The course is not " -"perfect,\n" -"so if you spotted any mistakes or have ideas for improvements, please get " -"in\n" +"We've had a lot of fun putting the course together. The course is not perfect,\n" +"so if you spotted any mistakes or have ideas for improvements, please get in\n" "[contact with us on\n" -"GitHub](https://github.com/google/comprehensive-rust/discussions). We would " -"love\n" +"GitHub](https://github.com/google/comprehensive-rust/discussions). We would love\n" "to hear from you." msgstr "" @@ -16222,20 +15273,15 @@ msgstr "" #: src/other-resources.md:10 msgid "" "* [The Rust Programming Language](https://doc.rust-lang.org/book/): the\n" -" canonical free book about Rust. Covers the language in detail and includes " -"a\n" +" canonical free book about Rust. Covers the language in detail and includes a\n" " few projects for people to build.\n" -"* [Rust By Example](https://doc.rust-lang.org/rust-by-example/): covers the " -"Rust\n" -" syntax via a series of examples which showcase different constructs. " -"Sometimes\n" +"* [Rust By Example](https://doc.rust-lang.org/rust-by-example/): covers the Rust\n" +" syntax via a series of examples which showcase different constructs. Sometimes\n" " includes small exercises where you are asked to expand on the code in the\n" " examples.\n" -"* [Rust Standard Library](https://doc.rust-lang.org/std/): full " -"documentation of\n" +"* [Rust Standard Library](https://doc.rust-lang.org/std/): full documentation of\n" " the standard library for Rust.\n" -"* [The Rust Reference](https://doc.rust-lang.org/reference/): an incomplete " -"book\n" +"* [The Rust Reference](https://doc.rust-lang.org/reference/): an incomplete book\n" " which describes the Rust grammar and memory model." msgstr "" @@ -16245,17 +15291,13 @@ msgstr "" #: src/other-resources.md:24 msgid "" -"* [The Rustonomicon](https://doc.rust-lang.org/nomicon/): covers unsafe " -"Rust,\n" +"* [The Rustonomicon](https://doc.rust-lang.org/nomicon/): covers unsafe Rust,\n" " including working with raw pointers and interfacing with other languages\n" " (FFI).\n" -"* [Asynchronous Programming in Rust](https://rust-lang.github.io/async-" -"book/):\n" -" covers the new asynchronous programming model which was introduced after " -"the\n" +"* [Asynchronous Programming in Rust](https://rust-lang.github.io/async-book/):\n" +" covers the new asynchronous programming model which was introduced after the\n" " Rust Book was written.\n" -"* [The Embedded Rust Book](https://doc.rust-lang.org/stable/embedded-book/): " -"an\n" +"* [The Embedded Rust Book](https://doc.rust-lang.org/stable/embedded-book/): an\n" " introduction to using Rust on embedded devices without an operating system." msgstr "" @@ -16269,37 +15311,27 @@ msgstr "" #: src/other-resources.md:37 msgid "" -"* [Learn Rust the Dangerous Way](http://cliffle.com/p/dangerust/): covers " -"Rust\n" +"* [Learn Rust the Dangerous Way](http://cliffle.com/p/dangerust/): covers Rust\n" " from the perspective of low-level C programmers.\n" "* [Rust for Embedded C\n" -" Programmers](https://docs.opentitan.org/doc/ug/rust_for_c/): covers Rust " -"from\n" +" Programmers](https://docs.opentitan.org/doc/ug/rust_for_c/): covers Rust from\n" " the perspective of developers who write firmware in C.\n" "* [Rust for professionals](https://overexact.com/rust-for-professionals/):\n" -" covers the syntax of Rust using side-by-side comparisons with other " -"languages\n" +" covers the syntax of Rust using side-by-side comparisons with other languages\n" " such as C, C++, Java, JavaScript, and Python.\n" -"* [Rust on Exercism](https://exercism.org/tracks/rust): 100+ exercises to " -"help\n" +"* [Rust on Exercism](https://exercism.org/tracks/rust): 100+ exercises to help\n" " you learn Rust.\n" "* [Ferrous Teaching\n" -" Material](https://ferrous-systems.github.io/teaching-material/index.html): " -"a\n" -" series of small presentations covering both basic and advanced part of " -"the\n" +" Material](https://ferrous-systems.github.io/teaching-material/index.html): a\n" +" series of small presentations covering both basic and advanced part of the\n" " Rust language. Other topics such as WebAssembly, and async/await are also\n" " covered.\n" "* [Beginner's Series to\n" -" Rust](https://docs.microsoft.com/en-us/shows/beginners-series-to-rust/) " -"and\n" +" Rust](https://docs.microsoft.com/en-us/shows/beginners-series-to-rust/) and\n" " [Take your first steps with\n" -" Rust](https://docs.microsoft.com/en-us/learn/paths/rust-first-steps/): " -"two\n" -" Rust guides aimed at new developers. The first is a set of 35 videos and " -"the\n" -" second is a set of 11 modules which covers Rust syntax and basic " -"constructs.\n" +" Rust](https://docs.microsoft.com/en-us/learn/paths/rust-first-steps/): two\n" +" Rust guides aimed at new developers. The first is a set of 35 videos and the\n" +" second is a set of 11 modules which covers Rust syntax and basic constructs.\n" "* [Learn Rust With Entirely Too Many Linked\n" " Lists](https://rust-unofficial.github.io/too-many-lists/): in-depth\n" " exploration of Rust's memory management rules, through implementing a few\n" @@ -16308,8 +15340,7 @@ msgstr "" #: src/other-resources.md:63 msgid "" -"Please see the [Little Book of Rust Books](https://lborb.github.io/book/) " -"for\n" +"Please see the [Little Book of Rust Books](https://lborb.github.io/book/) for\n" "even more Rust books." msgstr "" @@ -16319,17 +15350,14 @@ msgstr "" #: src/credits.md:3 msgid "" -"The material here builds on top of the many great sources of Rust " -"documentation.\n" -"See the page on [other resources](other-resources.md) for a full list of " -"useful\n" +"The material here builds on top of the many great sources of Rust documentation.\n" +"See the page on [other resources](other-resources.md) for a full list of useful\n" "resources." msgstr "" #: src/credits.md:7 msgid "" -"The material of Comprehensive Rust is licensed under the terms of the Apache " -"2.0\n" +"The material of Comprehensive Rust is licensed under the terms of the Apache 2.0\n" "license, please see [`LICENSE`](../LICENSE) for details." msgstr "" @@ -16353,8 +15381,7 @@ msgstr "" msgid "" "Some exercises have been copied and adapted from [Rust on\n" "Exercism](https://exercism.org/tracks/rust). Please see the\n" -"`third_party/rust-on-exercism/` directory for details, including the " -"license\n" +"`third_party/rust-on-exercism/` directory for details, including the license\n" "terms." msgstr "" @@ -16364,10 +15391,8 @@ msgstr "" #: src/credits.md:26 msgid "" -"The [Interoperability with C++](android/interoperability/cpp.md) section " -"uses an\n" -"image from [CXX](https://cxx.rs/). Please see the `third_party/cxx/` " -"directory\n" +"The [Interoperability with C++](android/interoperability/cpp.md) section uses an\n" +"image from [CXX](https://cxx.rs/). Please see the `third_party/cxx/` directory\n" "for details, including the license terms." msgstr "" @@ -16382,8 +15407,7 @@ msgstr "" #: src/exercises/solutions.md:5 msgid "" "Feel free to ask questions about the solutions [on\n" -"GitHub](https://github.com/google/comprehensive-rust/discussions). Let us " -"know\n" +"GitHub](https://github.com/google/comprehensive-rust/discussions). Let us know\n" "if you have a different or better solution than what is presented here." msgstr "" @@ -16487,23 +15511,23 @@ msgstr "" #: src/exercises/day-1/solutions-morning.md:80 msgid "" -"It requires more advanced concepts. It might seem that we could use a slice-" -"of-slices (`&[&[i32]]`) as the input type to transpose and thus make our " -"function handle any size of matrix. However, this quickly breaks down: the " -"return type cannot be `&[&[i32]]` since it needs to own the data you return." +"It requires more advanced concepts. It might seem that we could use a slice-of-slices " +"(`&[&[i32]]`) as the input type to transpose and thus make our function handle any size of matrix. " +"However, this quickly breaks down: the return type cannot be `&[&[i32]]` since it needs to own the " +"data you return." msgstr "" #: src/exercises/day-1/solutions-morning.md:82 msgid "" -"You can attempt to use something like `Vec>`, but this doesn't work " -"out-of-the-box either: it's hard to convert from `Vec>` to " -"`&[&[i32]]` so now you cannot easily use `pretty_print` either." +"You can attempt to use something like `Vec>`, but this doesn't work out-of-the-box " +"either: it's hard to convert from `Vec>` to `&[&[i32]]` so now you cannot easily use " +"`pretty_print` either." msgstr "" #: src/exercises/day-1/solutions-morning.md:84 msgid "" -"Once we get to traits and generics, we'll be able to use the [`std::convert::" -"AsRef`][1] trait to abstract over anything that can be referenced as a slice." +"Once we get to traits and generics, we'll be able to use the [`std::convert::AsRef`][1] trait to " +"abstract over anything that can be referenced as a slice." msgstr "" #: src/exercises/day-1/solutions-morning.md:86 @@ -16538,8 +15562,8 @@ msgstr "" #: src/exercises/day-1/solutions-morning.md:113 msgid "" -"In addition, the type itself would not enforce that the child slices are of " -"the same length, so such variable could contain an invalid matrix." +"In addition, the type itself would not enforce that the child slices are of the same length, so " +"such variable could contain an invalid matrix." msgstr "" #: src/exercises/day-1/solutions-afternoon.md:1 @@ -16635,8 +15659,7 @@ msgid "" "\n" " // ANCHOR: Library_print_books\n" " //fn print_books(self) {\n" -" // todo!(\"Iterate over `self.books` and each book's title and " -"year\")\n" +" // todo!(\"Iterate over `self.books` and each book's title and year\")\n" " //}\n" " // ANCHOR_END: Library_print_books\n" " fn print_books(&self) {\n" @@ -16677,8 +15700,7 @@ msgid "" " //println!(\"The library is empty: {}\", library.is_empty());\n" " //\n" " //library.add_book(Book::new(\"Lord of the Rings\", 1954));\n" -" //library.add_book(Book::new(\"Alice's Adventures in Wonderland\", " -"1865));\n" +" //library.add_book(Book::new(\"Alice's Adventures in Wonderland\", 1865));\n" " //\n" " //println!(\"The library is no longer empty: {}\", library.is_empty());\n" " //\n" @@ -16702,8 +15724,7 @@ msgid "" " assert!(library.is_empty());\n" "\n" " library.add_book(Book::new(\"Lord of the Rings\", 1954));\n" -" library.add_book(Book::new(\"Alice's Adventures in Wonderland\", " -"1865));\n" +" library.add_book(Book::new(\"Alice's Adventures in Wonderland\", 1865));\n" " assert_eq!(library.len(), 2);\n" " assert!(!library.is_empty());\n" "}\n" @@ -16721,8 +15742,7 @@ msgid "" "fn test_library_print_books() {\n" " let mut library = Library::new();\n" " library.add_book(Book::new(\"Lord of the Rings\", 1954));\n" -" library.add_book(Book::new(\"Alice's Adventures in Wonderland\", " -"1865));\n" +" library.add_book(Book::new(\"Alice's Adventures in Wonderland\", 1865));\n" " // We could try and capture stdout, but let us just call the\n" " // method to start with.\n" " library.print_books();\n" @@ -16739,8 +15759,7 @@ msgid "" " Some(\"Lord of the Rings\")\n" " );\n" "\n" -" library.add_book(Book::new(\"Alice's Adventures in Wonderland\", " -"1865));\n" +" library.add_book(Book::new(\"Alice's Adventures in Wonderland\", 1865));\n" " assert_eq!(\n" " library.oldest_book().map(|b| b.title.as_str()),\n" " Some(\"Alice's Adventures in Wonderland\")\n" @@ -17027,8 +16046,7 @@ msgid "" " // ANCHOR_END: luhn\n" " let mut digits_seen = 0;\n" " let mut sum = 0;\n" -" for (i, ch) in cc_number.chars().rev().filter(|&ch| ch != ' ')." -"enumerate() {\n" +" for (i, ch) in cc_number.chars().rev().filter(|&ch| ch != ' ').enumerate() {\n" " match ch.to_digit(10) {\n" " Some(d) => {\n" " sum += if i % 2 == 1 {\n" @@ -17150,15 +16168,12 @@ msgid "" "#[test]\n" "fn test_matches_without_wildcard() {\n" " assert!(prefix_matches(\"/v1/publishers\", \"/v1/publishers\"));\n" -" assert!(prefix_matches(\"/v1/publishers\", \"/v1/publishers/" -"abc-123\"));\n" -" assert!(prefix_matches(\"/v1/publishers\", \"/v1/publishers/abc/" -"books\"));\n" +" assert!(prefix_matches(\"/v1/publishers\", \"/v1/publishers/abc-123\"));\n" +" assert!(prefix_matches(\"/v1/publishers\", \"/v1/publishers/abc/books\"));\n" "\n" " assert!(!prefix_matches(\"/v1/publishers\", \"/v1\"));\n" " assert!(!prefix_matches(\"/v1/publishers\", \"/v1/publishersBooks\"));\n" -" assert!(!prefix_matches(\"/v1/publishers\", \"/v1/parent/" -"publishers\"));\n" +" assert!(!prefix_matches(\"/v1/publishers\", \"/v1/parent/publishers\"));\n" "}\n" "\n" "#[test]\n" @@ -17176,8 +16191,7 @@ msgid "" " \"/v1/publishers/foo/books/book1\"\n" " ));\n" "\n" -" assert!(!prefix_matches(\"/v1/publishers/*/books\", \"/v1/" -"publishers\"));\n" +" assert!(!prefix_matches(\"/v1/publishers/*/books\", \"/v1/publishers\"));\n" " assert!(!prefix_matches(\n" " \"/v1/publishers/*/books\",\n" " \"/v1/publishers/foo/booksByAuthor\"\n" @@ -17361,8 +16375,7 @@ msgid "" "// ANCHOR: main\n" "fn main() {\n" " let mut window = Window::new(\"Rust GUI Demo 1.23\");\n" -" window.add_widget(Box::new(Label::new(\"This is a small text GUI demo." -"\")));\n" +" window.add_widget(Box::new(Label::new(\"This is a small text GUI demo.\")));\n" " window.add_widget(Box::new(Button::new(\n" " \"Click me!\",\n" " Box::new(|| println!(\"You clicked the button!\")),\n" @@ -17412,12 +16425,10 @@ msgid "" " #[repr(C)]\n" " pub struct DIR {\n" " _data: [u8; 0],\n" -" _marker: core::marker::PhantomData<(*mut u8, core::marker::" -"PhantomPinned)>,\n" +" _marker: core::marker::PhantomData<(*mut u8, core::marker::PhantomPinned)>,\n" " }\n" "\n" -" // Layout as per readdir(3) and definitions in /usr/include/x86_64-linux-" -"gnu.\n" +" // Layout as per readdir(3) and definitions in /usr/include/x86_64-linux-gnu.\n" " #[cfg(not(target_os = \"macos\"))]\n" " #[repr(C)]\n" " pub struct dirent {\n" @@ -17463,8 +16474,7 @@ msgid "" " // Call opendir and return a Ok value if that worked,\n" " // otherwise return Err with a message.\n" " // ANCHOR_END: DirectoryIterator\n" -" let path = CString::new(path).map_err(|err| format!(\"Invalid path: " -"{err}\"))?;\n" +" let path = CString::new(path).map_err(|err| format!(\"Invalid path: {err}\"))?;\n" " // SAFETY: path.as_ptr() cannot be NULL.\n" " let dir = unsafe { ffi::opendir(path.as_ptr()) };\n" " if dir.is_null() {\n" @@ -17543,8 +16553,7 @@ msgid "" " #[test]\n" " fn test_nonempty_directory() -> Result<(), Box> {\n" " let tmp = tempfile::TempDir::new()?;\n" -" std::fs::write(tmp.path().join(\"foo.txt\"), \"The Foo " -"Diaries\\n\")?;\n" +" std::fs::write(tmp.path().join(\"foo.txt\"), \"The Foo Diaries\\n\")?;\n" " std::fs::write(tmp.path().join(\"bar.png\"), \"\\n\")?;\n" " std::fs::write(tmp.path().join(\"crab.rs\"), \"//! Crab\\n\")?;\n" " let iter = DirectoryIterator::new(\n" @@ -17552,8 +16561,7 @@ msgid "" " )?;\n" " let mut entries = iter.collect::>();\n" " entries.sort();\n" -" assert_eq!(entries, &[\".\", \"..\", \"bar.png\", \"crab.rs\", \"foo." -"txt\"]);\n" +" assert_eq!(entries, &[\".\", \"..\", \"bar.png\", \"crab.rs\", \"foo.txt\"]);\n" " Ok(())\n" " }\n" "}\n" @@ -17627,8 +16635,7 @@ msgid "" " // Set up the I2C controller and Inertial Measurement Unit.\n" " // ANCHOR_END: main\n" " writeln!(serial, \"Setting up IMU...\").unwrap();\n" -" let i2c = Twim::new(board.TWIM0, board.i2c_internal.into(), FREQUENCY_A::" -"K100);\n" +" let i2c = Twim::new(board.TWIM0, board.i2c_internal.into(), FREQUENCY_A::K100);\n" " let mut imu = Lsm303agr::new_with_i2c(i2c);\n" " imu.init().unwrap();\n" " imu.set_mag_odr(MagOutputDataRate::Hz50).unwrap();\n" @@ -17668,10 +16675,8 @@ msgid "" " let mut image = [[0; 5]; 5];\n" " let (x, y) = match mode {\n" " Mode::Compass => (\n" -" scale(-compass_reading.x, -COMPASS_SCALE, COMPASS_SCALE, 0, " -"4) as usize,\n" -" scale(compass_reading.y, -COMPASS_SCALE, COMPASS_SCALE, 0, " -"4) as usize,\n" +" scale(-compass_reading.x, -COMPASS_SCALE, COMPASS_SCALE, 0, 4) as usize,\n" +" scale(compass_reading.y, -COMPASS_SCALE, COMPASS_SCALE, 0, 4) as usize,\n" " ),\n" " Mode::Accelerometer => (\n" " scale(\n" @@ -17693,8 +16698,7 @@ msgid "" " image[y][x] = 255;\n" " display.show(&mut timer, image, 100);\n" "\n" -" // If button A is pressed, switch to the next mode and briefly blink " -"all LEDs on.\n" +" // If button A is pressed, switch to the next mode and briefly blink all LEDs on.\n" " if board.buttons.button_a.is_low().unwrap() {\n" " if !button_pressed {\n" " mode = mode.next();\n" @@ -17722,8 +16726,7 @@ msgid "" " }\n" "}\n" "\n" -"fn scale(value: i32, min_in: i32, max_in: i32, min_out: i32, max_out: i32) -" -"> i32 {\n" +"fn scale(value: i32, min_in: i32, max_in: i32, min_out: i32, max_out: i32) -> i32 {\n" " let range_in = max_in - min_in;\n" " let range_out = max_out - min_out;\n" " cap(\n" @@ -17811,25 +16814,21 @@ msgid "" "// ANCHOR: main\n" "#[no_mangle]\n" "extern \"C\" fn main(x0: u64, x1: u64, x2: u64, x3: u64) {\n" -" // Safe because `PL011_BASE_ADDRESS` is the base address of a PL011 " -"device,\n" +" // Safe because `PL011_BASE_ADDRESS` is the base address of a PL011 device,\n" " // and nothing else accesses that address range.\n" " let uart = unsafe { Uart::new(PL011_BASE_ADDRESS) };\n" " logger::init(uart, LevelFilter::Trace).unwrap();\n" "\n" " info!(\"main({:#x}, {:#x}, {:#x}, {:#x})\", x0, x1, x2, x3);\n" "\n" -" // Safe because `GICD_BASE_ADDRESS` and `GICR_BASE_ADDRESS` are the " -"base\n" +" // Safe because `GICD_BASE_ADDRESS` and `GICR_BASE_ADDRESS` are the base\n" " // addresses of a GICv3 distributor and redistributor respectively, and\n" " // nothing else accesses those address ranges.\n" -" let mut gic = unsafe { GicV3::new(GICD_BASE_ADDRESS, " -"GICR_BASE_ADDRESS) };\n" +" let mut gic = unsafe { GicV3::new(GICD_BASE_ADDRESS, GICR_BASE_ADDRESS) };\n" " gic.setup();\n" " // ANCHOR_END: main\n" "\n" -" // Safe because `PL031_BASE_ADDRESS` is the base address of a PL031 " -"device,\n" +" // Safe because `PL031_BASE_ADDRESS` is the base address of a PL031 device,\n" " // and nothing else accesses that address range.\n" " let mut rtc = unsafe { Rtc::new(PL031_BASE_ADDRESS) };\n" " let timestamp = rtc.read();\n" @@ -17957,16 +16956,13 @@ msgid "" "}\n" "\n" "impl Rtc {\n" -" /// Constructs a new instance of the RTC driver for a PL031 device at " -"the\n" +" /// Constructs a new instance of the RTC driver for a PL031 device at the\n" " /// given base address.\n" " ///\n" " /// # Safety\n" " ///\n" -" /// The given base address must point to the MMIO control registers of " -"a\n" -" /// PL031 device, which must be mapped into the address space of the " -"process\n" +" /// The given base address must point to the MMIO control registers of a\n" +" /// PL031 device, which must be mapped into the address space of the process\n" " /// as device memory and not have any other aliases.\n" " pub unsafe fn new(base_address: *mut u32) -> Self {\n" " Self {\n" @@ -17981,8 +16977,7 @@ msgid "" " unsafe { addr_of!((*self.registers).dr).read_volatile() }\n" " }\n" "\n" -" /// Writes a match value. When the RTC value matches this then an " -"interrupt\n" +" /// Writes a match value. When the RTC value matches this then an interrupt\n" " /// will be generated (if it is enabled).\n" " pub fn set_match(&mut self, value: u32) {\n" " // Safe because we know that self.registers points to the control\n" @@ -17990,14 +16985,12 @@ msgid "" " unsafe { addr_of_mut!((*self.registers).mr).write_volatile(value) }\n" " }\n" "\n" -" /// Returns whether the match register matches the RTC value, whether or " -"not\n" +" /// Returns whether the match register matches the RTC value, whether or not\n" " /// the interrupt is enabled.\n" " pub fn matched(&self) -> bool {\n" " // Safe because we know that self.registers points to the control\n" " // registers of a PL031 device which is appropriately mapped.\n" -" let ris = unsafe { addr_of!((*self.registers).ris)." -"read_volatile() };\n" +" let ris = unsafe { addr_of!((*self.registers).ris).read_volatile() };\n" " (ris & 0x01) != 0\n" " }\n" "\n" @@ -18008,22 +17001,19 @@ msgid "" " pub fn interrupt_pending(&self) -> bool {\n" " // Safe because we know that self.registers points to the control\n" " // registers of a PL031 device which is appropriately mapped.\n" -" let ris = unsafe { addr_of!((*self.registers).mis)." -"read_volatile() };\n" +" let ris = unsafe { addr_of!((*self.registers).mis).read_volatile() };\n" " (ris & 0x01) != 0\n" " }\n" "\n" " /// Sets or clears the interrupt mask.\n" " ///\n" -" /// When the mask is true the interrupt is enabled; when it is false " -"the\n" +" /// When the mask is true the interrupt is enabled; when it is false the\n" " /// interrupt is disabled.\n" " pub fn enable_interrupt(&mut self, mask: bool) {\n" " let imsc = if mask { 0x01 } else { 0x00 };\n" " // Safe because we know that self.registers points to the control\n" " // registers of a PL031 device which is appropriately mapped.\n" -" unsafe { addr_of_mut!((*self.registers).imsc)." -"write_volatile(imsc) }\n" +" unsafe { addr_of_mut!((*self.registers).imsc).write_volatile(imsc) }\n" " }\n" "\n" " /// Clears a pending interrupt, if any.\n" @@ -18201,8 +17191,7 @@ msgid "" "impl Philosopher {\n" " async fn think(&self) {\n" " self.thoughts\n" -" .send(format!(\"Eureka! {} has a new idea!\", &self.name))." -"await\n" +" .send(format!(\"Eureka! {} has a new idea!\", &self.name)).await\n" " .unwrap();\n" " }\n" " // ANCHOR_END: Philosopher-think\n" @@ -18212,8 +17201,7 @@ msgid "" " // Pick up forks...\n" " // ANCHOR_END: Philosopher-eat\n" " let _first_lock = self.left_fork.lock().await;\n" -" // Add a delay before picking the second fork to allow the " -"execution\n" +" // Add a delay before picking the second fork to allow the execution\n" " // to transfer to another task\n" " time::sleep(time::Duration::from_millis(1)).await;\n" " let _second_lock = self.right_fork.lock().await;\n" @@ -18236,8 +17224,7 @@ msgid "" " // ANCHOR_END: Philosopher-eat-end\n" " // Create forks\n" " let mut forks = vec![];\n" -" (0..PHILOSOPHERS.len()).for_each(|_| forks.push(Arc::new(Mutex::" -"new(Fork))));\n" +" (0..PHILOSOPHERS.len()).for_each(|_| forks.push(Arc::new(Mutex::new(Fork))));\n" "\n" " // Create philosophers\n" " let (philosophers, mut rx) = {\n" @@ -18248,10 +17235,8 @@ msgid "" " let right_fork = forks[(i + 1) % PHILOSOPHERS.len()].clone();\n" " philosophers.push(Philosopher {\n" " name: name.to_string(),\n" -" left_fork: if i % 2 == 0 { left_fork.clone() } else " -"{ right_fork.clone() },\n" -" right_fork: if i % 2 == 0 { right_fork } else " -"{ left_fork },\n" +" left_fork: if i % 2 == 0 { left_fork.clone() } else { right_fork.clone() },\n" +" right_fork: if i % 2 == 0 { right_fork } else { left_fork },\n" " thoughts: tx.clone(),\n" " });\n" " }\n" @@ -18325,8 +17310,7 @@ msgid "" " .await?;\n" " let mut bcast_rx = bcast_tx.subscribe();\n" "\n" -" // A continuous loop for concurrently performing two tasks: (1) " -"receiving\n" +" // A continuous loop for concurrently performing two tasks: (1) receiving\n" " // messages from `ws_stream` and broadcasting them, and (2) receiving\n" " // messages on `bcast_rx` and sending them to the client.\n" " loop {\n" @@ -18398,8 +17382,7 @@ msgid "" "\n" "#[tokio::main]\n" "async fn main() -> Result<(), tokio_websockets::Error> {\n" -" let mut ws_stream = ClientBuilder::from_uri(Uri::" -"from_static(\"ws://127.0.0.1:2000\"))\n" +" let mut ws_stream = ClientBuilder::from_uri(Uri::from_static(\"ws://127.0.0.1:2000\"))\n" " .connect()\n" " .await?;\n" "\n" @@ -18413,8 +17396,7 @@ msgid "" " tokio::select! {\n" " incoming = ws_stream.next() => {\n" " match incoming {\n" -" Some(Ok(msg)) => println!(\"From server: {}\", msg." -"as_text()?),\n" +" Some(Ok(msg)) => println!(\"From server: {}\", msg.as_text()?),\n" " Some(Err(err)) => return Err(err.into()),\n" " None => return Ok(()),\n" " }\n" @@ -18422,8 +17404,7 @@ msgid "" " res = stdin.read_line(&mut line) => {\n" " match res {\n" " Ok(0) => return Ok(()),\n" -" Ok(_) => ws_stream.send(Message::text(line.trim_end()." -"to_string())).await?,\n" +" Ok(_) => ws_stream.send(Message::text(line.trim_end().to_string())).await?,\n" " Err(err) => return Err(err.into()),\n" " }\n" " }\n"