From a0f2499bb8863b2acac6fefd63c9eaee82dec41a Mon Sep 17 00:00:00 2001 From: Martin Geisler Date: Wed, 23 Aug 2023 20:12:12 +0200 Subject: [PATCH] fa: normalize with mdbook-i18n-helpers 0.2.2 (#1108) Before, po/fa.po had these statistics: 300 translated messages, 4 fuzzy translations, 1477 untranslated messages. Afterwards, the statistics for po/fa.po is: 291 translated messages, 6 fuzzy translations, 2170 untranslated messages. The number of translated messages changed from 17% to 12%. With this change, it becomes important to use the latest version of mdbook-i18n-helpers when viewing the translation locally. To update to the latest version, run cargo install mdbook-i18n-helpers You will now be able to serve the translation locally. Part of #330. --- po/fa.po | 11917 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 7262 insertions(+), 4655 deletions(-) diff --git a/po/fa.po b/po/fa.po index f95a0f81e77..cff0bae1ac8 100644 --- a/po/fa.po +++ b/po/fa.po @@ -5,34 +5,33 @@ msgstr "" "PO-Revision-Date: 2023-08-08 21:41+0330\n" "Last-Translator: danny \n" "Language-Team: Persian\n" -"Language: fa\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Poedit 3.3.2\n" -#: src/SUMMARY.md:4 +#: src/SUMMARY.md:4 src/index.md:1 msgid "Welcome to Comprehensive Rust 🦀" msgstr "Welcome to Comprehensive Rust 🦀" -#: src/SUMMARY.md:5 +#: src/SUMMARY.md:5 src/running-the-course.md:1 msgid "Running the Course" msgstr "اجرای دوره" -#: src/SUMMARY.md:6 +#: src/SUMMARY.md:6 src/running-the-course/course-structure.md:1 msgid "Course Structure" msgstr "مباحث دوره" -#: src/SUMMARY.md:7 +#: src/SUMMARY.md:7 src/running-the-course/keyboard-shortcuts.md:1 msgid "Keyboard Shortcuts" msgstr "میان‌برهای صفحه کلید" -#: src/SUMMARY.md:8 +#: src/SUMMARY.md:8 src/running-the-course/translations.md:1 msgid "Translations" msgstr "ترجمه" -#: src/SUMMARY.md:9 +#: src/SUMMARY.md:9 src/cargo.md:1 msgid "Using Cargo" msgstr "استفاده از cargo" @@ -52,60 +51,60 @@ msgstr "اجرای cargo روی ماشین local" msgid "Day 1: Morning" msgstr "روز اول: صبح" -#: src/SUMMARY.md:19 src/SUMMARY.md:76 src/SUMMARY.md:129 src/SUMMARY.md:186 src/SUMMARY.md:212 -#: src/SUMMARY.md:262 +#: src/SUMMARY.md:19 src/SUMMARY.md:76 src/SUMMARY.md:129 src/SUMMARY.md:186 +#: src/SUMMARY.md:212 src/SUMMARY.md:262 msgid "Welcome" msgstr "خوش آمدید" -#: src/SUMMARY.md:20 +#: src/SUMMARY.md:20 src/welcome-day-1/what-is-rust.md:1 msgid "What is Rust?" msgstr "زبان Rust چیست؟" -#: src/SUMMARY.md:21 +#: src/SUMMARY.md:21 src/hello-world.md:1 msgid "Hello World!" msgstr "Hello World!" -#: src/SUMMARY.md:22 +#: src/SUMMARY.md:22 src/hello-world/small-example.md:1 msgid "Small Example" msgstr "یک مثال ساده" -#: src/SUMMARY.md:23 +#: src/SUMMARY.md:23 src/why-rust.md:1 msgid "Why Rust?" msgstr "چرا Rust؟" -#: src/SUMMARY.md:24 +#: src/SUMMARY.md:24 src/why-rust/compile-time.md:1 msgid "Compile Time Guarantees" msgstr "Compile Time Guarantees" -#: src/SUMMARY.md:25 +#: src/SUMMARY.md:25 src/why-rust/runtime.md:1 msgid "Runtime Guarantees" msgstr "Runtime Guarantees" -#: src/SUMMARY.md:26 +#: src/SUMMARY.md:26 src/why-rust/modern.md:1 msgid "Modern Features" msgstr "ویژگی‌های جدید" -#: src/SUMMARY.md:27 +#: src/SUMMARY.md:27 src/basic-syntax.md:1 msgid "Basic Syntax" msgstr "سینتکس‌های مقدماتی" -#: src/SUMMARY.md:28 +#: src/SUMMARY.md:28 src/basic-syntax/scalar-types.md:1 msgid "Scalar Types" msgstr "Scalar Types" -#: src/SUMMARY.md:29 +#: src/SUMMARY.md:29 src/basic-syntax/compound-types.md:1 msgid "Compound Types" msgstr "Compound Types" -#: src/SUMMARY.md:30 +#: src/SUMMARY.md:30 src/basic-syntax/references.md:1 msgid "References" msgstr "مراجع" -#: src/SUMMARY.md:31 +#: src/SUMMARY.md:31 src/basic-syntax/references-dangling.md:1 msgid "Dangling References" msgstr "ارجاعات تعلیق شده" -#: src/SUMMARY.md:32 +#: src/SUMMARY.md:32 src/basic-syntax/slices.md:1 msgid "Slices" msgstr "Slices" @@ -113,15 +112,16 @@ msgstr "Slices" msgid "String vs str" msgstr "String در مقابل str" -#: src/SUMMARY.md:34 +#: src/SUMMARY.md:34 src/basic-syntax/functions.md:1 msgid "Functions" msgstr "توابع" -#: src/SUMMARY.md:35 +#: src/SUMMARY.md:35 src/basic-syntax/rustdoc.md:1 msgid "Rustdoc" msgstr "Rustdoc" -#: src/SUMMARY.md:36 src/SUMMARY.md:83 +#: src/SUMMARY.md:36 src/SUMMARY.md:83 src/basic-syntax/methods.md:1 +#: src/methods.md:1 msgid "Methods" msgstr "متدها" @@ -129,13 +129,17 @@ msgstr "متدها" msgid "Overloading" msgstr "سربارگذاری" -#: src/SUMMARY.md:38 src/SUMMARY.md:67 src/SUMMARY.md:91 src/SUMMARY.md:120 src/SUMMARY.md:149 -#: src/SUMMARY.md:178 src/SUMMARY.md:205 src/SUMMARY.md:226 src/SUMMARY.md:254 src/SUMMARY.md:276 -#: src/SUMMARY.md:297 +#: src/SUMMARY.md:38 src/SUMMARY.md:67 src/SUMMARY.md:91 src/SUMMARY.md:120 +#: src/SUMMARY.md:149 src/SUMMARY.md:178 src/SUMMARY.md:205 src/SUMMARY.md:226 +#: src/SUMMARY.md:254 src/SUMMARY.md:276 src/SUMMARY.md:297 +#: 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/concurrency/afternoon.md:1 msgid "Exercises" msgstr "تمرین‌ها" -#: src/SUMMARY.md:39 +#: src/SUMMARY.md:39 src/exercises/day-1/implicit-conversions.md:1 msgid "Implicit Conversions" msgstr "تبدیل های غیر صریح" @@ -147,11 +151,11 @@ msgstr "آرایه ها و حلقه های for" msgid "Day 1: Afternoon" msgstr "روز ۱: بعد از ظهر" -#: src/SUMMARY.md:44 +#: src/SUMMARY.md:44 src/basic-syntax/variables.md:1 msgid "Variables" msgstr "متغیرها" -#: src/SUMMARY.md:45 +#: src/SUMMARY.md:45 src/basic-syntax/type-inference.md:1 msgid "Type Inference" msgstr "Type Inference" @@ -159,11 +163,11 @@ msgstr "Type Inference" msgid "static & const" msgstr "نمادهای ایستا و ثابت" -#: src/SUMMARY.md:47 +#: src/SUMMARY.md:47 src/basic-syntax/scopes-shadowing.md:1 msgid "Scopes and Shadowing" msgstr "محدوده‌ها و سایه‌گذاری" -#: src/SUMMARY.md:48 +#: src/SUMMARY.md:48 src/memory-management.md:1 msgid "Memory Management" msgstr "مدیریت حافظه" @@ -175,11 +179,11 @@ msgstr "Stack vs Heap" msgid "Stack Memory" msgstr "حافظه Stack" -#: src/SUMMARY.md:51 +#: src/SUMMARY.md:51 src/memory-management/manual.md:1 msgid "Manual Memory Management" msgstr "مدیریت دستی حافظه" -#: src/SUMMARY.md:52 +#: src/SUMMARY.md:52 src/memory-management/scope-based.md:1 msgid "Scope-Based Memory Management" msgstr "مدیریت حافظه مبتنی بر دامنه" @@ -191,19 +195,19 @@ msgstr "Garbage Collection" msgid "Rust Memory Management" msgstr "مدیریت منابع Rust" -#: src/SUMMARY.md:55 +#: src/SUMMARY.md:55 src/memory-management/comparison.md:1 msgid "Comparison" msgstr "مقایسه" -#: src/SUMMARY.md:56 +#: src/SUMMARY.md:56 src/ownership.md:1 msgid "Ownership" msgstr "مالکیت" -#: src/SUMMARY.md:57 +#: src/SUMMARY.md:57 src/ownership/move-semantics.md:1 msgid "Move Semantics" msgstr "مفاهیم جابجایی" -#: src/SUMMARY.md:58 +#: src/SUMMARY.md:58 src/ownership/moved-strings-rust.md:1 msgid "Moved Strings in Rust" msgstr "های جابجا شده در Rust String" @@ -211,39 +215,39 @@ msgstr "های جابجا شده در Rust String" msgid "Double Frees in Modern C++" msgstr "آزاد سازی مضاعف در مدرن سی++" -#: src/SUMMARY.md:60 +#: src/SUMMARY.md:60 src/ownership/moves-function-calls.md:1 msgid "Moves in Function Calls" msgstr "حرکت‌ها در فراخوانی توابع" -#: src/SUMMARY.md:61 +#: src/SUMMARY.md:61 src/ownership/copy-clone.md:1 msgid "Copying and Cloning" msgstr "کپی برداری و شبیه سازی" -#: src/SUMMARY.md:62 +#: src/SUMMARY.md:62 src/ownership/borrowing.md:1 msgid "Borrowing" msgstr "قرض گرفتن" -#: src/SUMMARY.md:63 +#: src/SUMMARY.md:63 src/ownership/shared-unique-borrows.md:1 msgid "Shared and Unique Borrows" msgstr "قرض گرفتن های مشترک و منحصر به فرد" -#: src/SUMMARY.md:64 +#: src/SUMMARY.md:64 src/ownership/lifetimes.md:1 msgid "Lifetimes" msgstr "چرخه حیات" -#: src/SUMMARY.md:65 +#: src/SUMMARY.md:65 src/ownership/lifetimes-function-calls.md:1 msgid "Lifetimes in Function Calls" msgstr "طول عمر فراخوانی های تابع" -#: src/SUMMARY.md:66 +#: src/SUMMARY.md:66 src/ownership/lifetimes-data-structures.md:1 msgid "Lifetimes in Data Structures" msgstr "طول عمر در ساختمان داده" -#: src/SUMMARY.md:68 +#: src/SUMMARY.md:68 src/exercises/day-1/book-library.md:1 msgid "Storing Books" msgstr "ذخیره سازی کتاب" -#: src/SUMMARY.md:69 +#: src/SUMMARY.md:69 src/exercises/day-1/iterators-and-ownership.md:1 msgid "Iterators and Ownership" msgstr "تکرار کننده ها و مالکیت" @@ -251,63 +255,64 @@ msgstr "تکرار کننده ها و مالکیت" msgid "Day 2: Morning" msgstr "روز دوم: صبح" -#: src/SUMMARY.md:77 +#: src/SUMMARY.md:77 src/structs.md:1 msgid "Structs" msgstr "ساختارها" -#: src/SUMMARY.md:78 +#: src/SUMMARY.md:78 src/structs/tuple-structs.md:1 msgid "Tuple Structs" msgstr "Tuple Structs" -#: src/SUMMARY.md:79 +#: src/SUMMARY.md:79 src/structs/field-shorthand.md:1 msgid "Field Shorthand Syntax" msgstr "نحو اختصاری فیلد" -#: src/SUMMARY.md:80 +#: src/SUMMARY.md:80 src/enums.md:1 msgid "Enums" msgstr "Enums" -#: src/SUMMARY.md:81 +#: src/SUMMARY.md:81 src/enums/variant-payloads.md:1 msgid "Variant Payloads" msgstr "Variant Payloads" -#: src/SUMMARY.md:82 +#: src/SUMMARY.md:82 src/enums/sizes.md:1 msgid "Enum Sizes" msgstr "اندازه ی Enum ها" -#: src/SUMMARY.md:84 +#: src/SUMMARY.md:84 src/methods/receiver.md:1 msgid "Method Receiver" msgstr "متد دریافتی" #: src/SUMMARY.md:85 src/SUMMARY.md:160 src/SUMMARY.md:275 +#: src/methods/example.md:1 src/concurrency/shared_state/example.md:1 msgid "Example" msgstr "مثال" -#: src/SUMMARY.md:86 +#: src/SUMMARY.md:86 src/pattern-matching.md:1 msgid "Pattern Matching" msgstr "تطبیق الگو" -#: src/SUMMARY.md:87 +#: src/SUMMARY.md:87 src/pattern-matching/destructuring-enums.md:1 msgid "Destructuring Enums" msgstr "تخریب Enumها" -#: src/SUMMARY.md:88 +#: src/SUMMARY.md:88 src/pattern-matching/destructuring-structs.md:1 msgid "Destructuring Structs" msgstr "تخریب ساختارها" -#: src/SUMMARY.md:89 +#: src/SUMMARY.md:89 src/pattern-matching/destructuring-arrays.md:1 msgid "Destructuring Arrays" msgstr "تخریب آرایه‌ها" -#: src/SUMMARY.md:90 +#: src/SUMMARY.md:90 src/pattern-matching/match-guards.md:1 msgid "Match Guards" msgstr "گاردهای تطبیق" -#: src/SUMMARY.md:92 +#: src/SUMMARY.md:92 src/exercises/day-2/health-statistics.md:1 msgid "Health Statistics" msgstr "آمارهای سلامتی" -#: src/SUMMARY.md:93 +#: src/SUMMARY.md:93 src/exercises/day-2/solutions-morning.md:3 msgid "Points and Polygons" msgstr "نقطه‌ها و چند ضلعی‌ها" @@ -315,11 +320,11 @@ msgstr "نقطه‌ها و چند ضلعی‌ها" msgid "Day 2: Afternoon" msgstr "روز دوم: عصر" -#: src/SUMMARY.md:97 src/SUMMARY.md:289 +#: src/SUMMARY.md:97 src/SUMMARY.md:289 src/control-flow.md:1 msgid "Control Flow" msgstr "کنترل مسیر" -#: src/SUMMARY.md:98 +#: src/SUMMARY.md:98 src/control-flow/blocks.md:1 msgid "Blocks" msgstr "بلوک‌ها" @@ -355,7 +360,7 @@ msgstr "عبارت تطبیق" msgid "break & continue" msgstr "توقف و ادامه دادن (break & continue)" -#: src/SUMMARY.md:107 +#: src/SUMMARY.md:107 src/std.md:1 msgid "Standard Library" msgstr "کتابخانه‌های استاندارد" @@ -363,7 +368,7 @@ msgstr "کتابخانه‌های استاندارد" msgid "Option and Result" msgstr "Option و Result" -#: src/SUMMARY.md:109 +#: src/SUMMARY.md:109 src/std/string.md:1 msgid "String" msgstr "String" @@ -383,7 +388,7 @@ msgstr "Box" msgid "Recursive Data Types" msgstr "انواع داده های بازگشتی" -#: src/SUMMARY.md:114 +#: src/SUMMARY.md:114 src/std/box-niche.md:1 msgid "Niche Optimization" msgstr "بهینه سازی Niche" @@ -391,27 +396,29 @@ msgstr "بهینه سازی Niche" msgid "Rc" msgstr "Rc" -#: src/SUMMARY.md:116 +#: src/SUMMARY.md:116 src/modules.md:1 msgid "Modules" msgstr "ماژول‌ها" -#: src/SUMMARY.md:117 +#: src/SUMMARY.md:117 src/modules/visibility.md:1 msgid "Visibility" msgstr "قابلیت دید" -#: src/SUMMARY.md:118 +#: src/SUMMARY.md:118 src/modules/paths.md:1 msgid "Paths" msgstr "مسیر" -#: src/SUMMARY.md:119 +#: src/SUMMARY.md:119 src/modules/filesystem.md:1 msgid "Filesystem Hierarchy" msgstr "توالی فایل سیستم‌ها" -#: src/SUMMARY.md:121 +#: src/SUMMARY.md:121 src/exercises/day-2/luhn.md:1 +#: src/exercises/day-2/solutions-afternoon.md:3 msgid "Luhn Algorithm" msgstr "الگوریتم Luhn" -#: src/SUMMARY.md:122 +#: src/SUMMARY.md:122 src/exercises/day-2/strings-iterators.md:1 +#: src/exercises/day-2/solutions-afternoon.md:97 msgid "Strings and Iterators" msgstr "رشته ها و تکرار کننده‌ها (Strings and Iterators)" @@ -419,39 +426,39 @@ msgstr "رشته ها و تکرار کننده‌ها (Strings and Iterators)" msgid "Day 3: Morning" msgstr "روز سوم: صبح" -#: src/SUMMARY.md:130 +#: src/SUMMARY.md:130 src/generics.md:1 msgid "Generics" msgstr "Generics" -#: src/SUMMARY.md:131 +#: src/SUMMARY.md:131 src/generics/data-types.md:1 msgid "Generic Data Types" msgstr "انواع داده‌ها جنریک (Generic Data Types)" -#: src/SUMMARY.md:132 +#: src/SUMMARY.md:132 src/generics/methods.md:1 msgid "Generic Methods" msgstr "متدهای جنریک" -#: src/SUMMARY.md:133 +#: src/SUMMARY.md:133 src/generics/monomorphization.md:1 msgid "Monomorphization" msgstr "تک شکلی" -#: src/SUMMARY.md:134 +#: src/SUMMARY.md:134 src/traits.md:1 msgid "Traits" msgstr "صفت‌ها" -#: src/SUMMARY.md:135 +#: src/SUMMARY.md:135 src/traits/trait-objects.md:1 msgid "Trait Objects" msgstr "آبجکت‌های موصوفی (Trait Objects)" -#: src/SUMMARY.md:136 +#: src/SUMMARY.md:136 src/traits/deriving-traits.md:1 msgid "Deriving Traits" msgstr "صفات استنتاجی (Deriving Traits)" -#: src/SUMMARY.md:137 +#: src/SUMMARY.md:137 src/traits/default-methods.md:1 msgid "Default Methods" msgstr "متدهای پیشفرض" -#: src/SUMMARY.md:138 +#: src/SUMMARY.md:138 src/traits/trait-bounds.md:1 msgid "Trait Bounds" msgstr "صفات مرزی (Trait Bounds)" @@ -459,7 +466,7 @@ msgstr "صفات مرزی (Trait Bounds)" msgid "impl Trait" msgstr "صفات impl (impl Trait)" -#: src/SUMMARY.md:140 +#: src/SUMMARY.md:140 src/traits/important-traits.md:1 msgid "Important Traits" msgstr "صفات مهم" @@ -467,7 +474,7 @@ msgstr "صفات مهم" msgid "Iterator" msgstr "تکرار کننده" -#: src/SUMMARY.md:142 +#: src/SUMMARY.md:142 src/traits/from-iterator.md:1 msgid "FromIterator" msgstr "FromIterator" @@ -495,7 +502,8 @@ msgstr "عملگر‌های: جمع و ضرب, ..." msgid "Closures: Fn, FnMut, FnOnce" msgstr "بسته شدن‌ها: Fn, FnMut, FnOnce" -#: src/SUMMARY.md:150 +#: src/SUMMARY.md:150 src/exercises/day-3/simple-gui.md:1 +#: src/exercises/day-3/solutions-morning.md:3 msgid "A Simple GUI Library" msgstr "یک کتابخانه GUI ساده" @@ -503,11 +511,11 @@ msgstr "یک کتابخانه GUI ساده" msgid "Day 3: Afternoon" msgstr "روز سوم: عصر" -#: src/SUMMARY.md:154 +#: src/SUMMARY.md:154 src/error-handling.md:1 msgid "Error Handling" msgstr "مدیریت خطا (Error Handling)" -#: src/SUMMARY.md:155 +#: src/SUMMARY.md:155 src/error-handling/panics.md:1 msgid "Panics" msgstr "Panics" @@ -523,70 +531,69 @@ msgstr "مدیریت خطای ساختاری" msgid "Propagating Errors with ?" msgstr "انتشار خطاها با استفاده از عملگر ؟" -#: src/SUMMARY.md:159 +#: src/SUMMARY.md:159 src/error-handling/converting-error-types.md:1 +#: src/error-handling/converting-error-types-example.md:1 msgid "Converting Error Types" msgstr "تبدیل انواع خطا" -#: src/SUMMARY.md:161 +#: src/SUMMARY.md:161 src/error-handling/deriving-error-enums.md:1 msgid "Deriving Error Enums" msgstr "استخراج شماره های خطا" -#: src/SUMMARY.md:162 +#: src/SUMMARY.md:162 src/error-handling/dynamic-errors.md:1 msgid "Dynamic Error Types" msgstr "انواع خطاهای Dynamic" -#: src/SUMMARY.md:163 +#: src/SUMMARY.md:163 src/error-handling/error-contexts.md:1 msgid "Adding Context to Errors" msgstr "اضافه کردن زمینه (Context) به خطاها" -#: src/SUMMARY.md:164 +#: src/SUMMARY.md:164 src/testing.md:1 msgid "Testing" msgstr "تست‌کردن" -#: src/SUMMARY.md:165 +#: src/SUMMARY.md:165 src/testing/unit-tests.md:1 msgid "Unit Tests" msgstr "تست‌های واحد (Unit Tests)" -#: src/SUMMARY.md:166 +#: src/SUMMARY.md:166 src/testing/test-modules.md:1 msgid "Test Modules" msgstr "تست‌ ماژول‌ها" -#: src/SUMMARY.md:167 +#: src/SUMMARY.md:167 src/testing/doc-tests.md:1 msgid "Documentation Tests" msgstr "تست‌ سندها" -#: src/SUMMARY.md:168 +#: src/SUMMARY.md:168 src/testing/integration-tests.md:1 msgid "Integration Tests" msgstr "Integration Tests" -# جعبه کلمه مناسبی نیست و شاید نوشتن پکیج بهتر -# باشه -#: src/SUMMARY.md:169 +#: src/SUMMARY.md:169 src/bare-metal/useful-crates.md:1 #, fuzzy msgid "Useful crates" msgstr "جعبه های (crates) کاربردی" -#: src/SUMMARY.md:170 +#: src/SUMMARY.md:170 src/unsafe.md:1 msgid "Unsafe Rust" msgstr "Unsafe Rust" -#: src/SUMMARY.md:171 +#: src/SUMMARY.md:171 src/unsafe/raw-pointers.md:1 msgid "Dereferencing Raw Pointers" msgstr "عدم ارجاع به اشاره گرهای خام" -#: src/SUMMARY.md:172 +#: src/SUMMARY.md:172 src/unsafe/mutable-static-variables.md:1 msgid "Mutable Static Variables" msgstr "متغیرهای ثابت قابل تغییر" -#: src/SUMMARY.md:173 +#: src/SUMMARY.md:173 src/unsafe/unions.md:1 msgid "Unions" msgstr "Unions" -#: src/SUMMARY.md:174 +#: src/SUMMARY.md:174 src/unsafe/calling-unsafe-functions.md:1 msgid "Calling Unsafe Functions" msgstr "فراخوانی متدهای ناامن" -#: src/SUMMARY.md:175 +#: src/SUMMARY.md:175 src/unsafe/writing-unsafe-functions.md:1 msgid "Writing Unsafe Functions" msgstr "نوشتن متدهای ناامن" @@ -594,23 +601,25 @@ msgstr "نوشتن متدهای ناامن" msgid "Extern Functions" msgstr "توابع خارجی (Extern Functions)" -#: src/SUMMARY.md:177 +#: src/SUMMARY.md:177 src/unsafe/unsafe-traits.md:1 msgid "Implementing Unsafe Traits" msgstr "پیاده سازی صفات (Traits) ناامن" -#: src/SUMMARY.md:179 +#: src/SUMMARY.md:179 src/exercises/day-3/safe-ffi-wrapper.md:1 +#: src/exercises/day-3/solutions-afternoon.md:3 msgid "Safe FFI Wrapper" msgstr "امن بودن FFI Wrapper" #: src/SUMMARY.md:182 src/SUMMARY.md:252 +#: src/running-the-course/course-structure.md:16 src/bare-metal/android.md:1 msgid "Android" msgstr "Android" -#: src/SUMMARY.md:187 +#: src/SUMMARY.md:187 src/android/setup.md:1 msgid "Setup" msgstr "تنظیم" -#: src/SUMMARY.md:188 +#: src/SUMMARY.md:188 src/android/build-rules.md:1 msgid "Build Rules" msgstr "قوانین ساخت" @@ -622,7 +631,7 @@ msgstr "باینری" msgid "Library" msgstr "کتابخانه" -#: src/SUMMARY.md:191 +#: src/SUMMARY.md:191 src/android/aidl.md:1 msgid "AIDL" msgstr "AIDL" @@ -638,7 +647,7 @@ msgstr "پیاده سازی" msgid "Server" msgstr "سرور" -#: src/SUMMARY.md:195 +#: src/SUMMARY.md:195 src/android/aidl/deploy.md:1 msgid "Deploy" msgstr "دیپلوی" @@ -646,15 +655,16 @@ msgstr "دیپلوی" msgid "Client" msgstr "کاربر" -#: src/SUMMARY.md:197 +#: src/SUMMARY.md:197 src/android/aidl/changing.md:1 msgid "Changing API" msgstr "تغییر دادن API" -#: src/SUMMARY.md:198 src/SUMMARY.md:242 +#: src/SUMMARY.md:198 src/SUMMARY.md:242 src/android/logging.md:1 +#: src/bare-metal/aps/logging.md:1 msgid "Logging" msgstr "لاگ" -#: src/SUMMARY.md:199 +#: src/SUMMARY.md:199 src/android/interoperability.md:1 msgid "Interoperability" msgstr "قابلیت همکاری" @@ -670,7 +680,7 @@ msgstr "فراخوانی C با Bindgen" msgid "Calling Rust from C" msgstr "فراخوانی Rust از C" -#: src/SUMMARY.md:203 +#: src/SUMMARY.md:203 src/android/interoperability/cpp.md:1 msgid "With C++" msgstr "با ++C" @@ -694,11 +704,11 @@ msgstr "یک مثال ساده" msgid "alloc" msgstr "alloc" -#: src/SUMMARY.md:216 +#: src/SUMMARY.md:216 src/bare-metal/microcontrollers.md:1 msgid "Microcontrollers" msgstr "میکروکنترلرها" -#: src/SUMMARY.md:217 +#: src/SUMMARY.md:217 src/bare-metal/microcontrollers/mmio.md:1 msgid "Raw MMIO" msgstr "Raw MMIO" @@ -726,7 +736,7 @@ msgstr "embedded-hal" msgid "probe-rs, cargo-embed" msgstr "probe-rs, cargo-embed" -#: src/SUMMARY.md:224 +#: src/SUMMARY.md:224 src/bare-metal/microcontrollers/debugging.md:1 msgid "Debugging" msgstr "اشکال یابی (Debugging)" @@ -734,7 +744,8 @@ msgstr "اشکال یابی (Debugging)" msgid "Other Projects" msgstr "باقی پروژه‌ها" -#: src/SUMMARY.md:227 +#: src/SUMMARY.md:227 src/exercises/bare-metal/compass.md:1 +#: src/exercises/bare-metal/solutions-morning.md:3 msgid "Compass" msgstr "قطب‌نما" @@ -746,7 +757,7 @@ msgstr "با Bare Metal: عصر" msgid "Application Processors" msgstr "پردازنده های برنامه" -#: src/SUMMARY.md:232 +#: src/SUMMARY.md:232 src/bare-metal/aps/entry-point.md:1 msgid "Getting Ready to Rust" msgstr "آماده شدن برای Rust" @@ -770,7 +781,7 @@ msgstr "صفت‌های بیشتر" msgid "A Better UART Driver" msgstr "یک درایور بهتر UART" -#: src/SUMMARY.md:238 +#: src/SUMMARY.md:238 src/bare-metal/aps/better-uart/bitflags.md:1 msgid "Bitflags" msgstr "پرچم های بیتی (Bitflags)" @@ -778,7 +789,7 @@ msgstr "پرچم های بیتی (Bitflags)" msgid "Multiple Registers" msgstr "رجیستر‌های چندگانه" -#: src/SUMMARY.md:240 +#: src/SUMMARY.md:240 src/bare-metal/aps/better-uart/driver.md:1 msgid "Driver" msgstr "درایور" @@ -786,12 +797,10 @@ msgstr "درایور" msgid "Using It" msgstr "استفاده از آن" -#: src/SUMMARY.md:244 +#: src/SUMMARY.md:244 src/bare-metal/aps/exceptions.md:1 msgid "Exceptions" msgstr "استثناها" -# جعبه کلمه مناسبی نیست و شاید نوشتن پکیج بهتر -# باشه #: src/SUMMARY.md:246 #, fuzzy msgid "Useful Crates" @@ -817,7 +826,7 @@ msgstr "tinyvec" msgid "spin" msgstr "چرخش" -#: src/SUMMARY.md:253 +#: src/SUMMARY.md:253 src/bare-metal/android/vmbase.md:1 msgid "vmbase" msgstr "vmbase" @@ -829,23 +838,23 @@ msgstr "درایور RTC" msgid "Concurrency: Morning" msgstr "همزمانی: صبح" -#: src/SUMMARY.md:263 +#: src/SUMMARY.md:263 src/concurrency/threads.md:1 msgid "Threads" msgstr "تردها" -#: src/SUMMARY.md:264 +#: src/SUMMARY.md:264 src/concurrency/scoped-threads.md:1 msgid "Scoped Threads" msgstr "محدوده تردها" -#: src/SUMMARY.md:265 +#: src/SUMMARY.md:265 src/concurrency/channels.md:1 msgid "Channels" msgstr "کانال‌ها" -#: src/SUMMARY.md:266 +#: src/SUMMARY.md:266 src/concurrency/channels/unbounded.md:1 msgid "Unbounded Channels" msgstr "کانال‌های نامحدود" -#: src/SUMMARY.md:267 +#: src/SUMMARY.md:267 src/concurrency/channels/bounded.md:1 msgid "Bounded Channels" msgstr "کانال های محدود" @@ -861,11 +870,11 @@ msgstr "ارسال" msgid "Sync" msgstr "همگام سازی" -#: src/SUMMARY.md:271 +#: src/SUMMARY.md:271 src/concurrency/send-sync/examples.md:1 msgid "Examples" msgstr "مثال‌ها" -#: src/SUMMARY.md:272 +#: src/SUMMARY.md:272 src/concurrency/shared_state.md:1 msgid "Shared State" msgstr "ناحیه‌های مشترک" @@ -878,10 +887,12 @@ msgid "Mutex" msgstr "Mutex" #: src/SUMMARY.md:277 src/SUMMARY.md:298 +#: src/exercises/concurrency/dining-philosophers.md:1 +#: src/exercises/concurrency/solutions-morning.md:3 msgid "Dining Philosophers" msgstr "فلسفه Dining" -#: src/SUMMARY.md:278 +#: src/SUMMARY.md:278 src/exercises/concurrency/link-checker.md:1 msgid "Multi-threaded Link Checker" msgstr "جستجوگر پیوند چند تِردی" @@ -897,31 +908,32 @@ msgstr "مبانی Async" msgid "async/await" msgstr "async/await" -#: src/SUMMARY.md:284 +#: src/SUMMARY.md:284 src/async/futures.md:1 msgid "Futures" msgstr "Futures" -#: src/SUMMARY.md:285 +#: src/SUMMARY.md:285 src/async/runtimes.md:1 msgid "Runtimes" msgstr "Runtimes" -#: src/SUMMARY.md:286 +#: src/SUMMARY.md:286 src/async/runtimes/tokio.md:1 msgid "Tokio" msgstr "Tokio" -#: src/SUMMARY.md:287 +#: src/SUMMARY.md:287 src/exercises/concurrency/link-checker.md:126 +#: src/exercises/concurrency/chat-app.md:140 src/async/tasks.md:1 msgid "Tasks" msgstr "Task" -#: src/SUMMARY.md:288 +#: src/SUMMARY.md:288 src/async/channels.md:1 msgid "Async Channels" msgstr "کانال‌های Async" -#: src/SUMMARY.md:290 +#: src/SUMMARY.md:290 src/async/control-flow/join.md:1 msgid "Join" msgstr "Join" -#: src/SUMMARY.md:291 +#: src/SUMMARY.md:291 src/async/control-flow/select.md:1 msgid "Select" msgstr "Select" @@ -933,19 +945,20 @@ msgstr "مشکل‌ها" msgid "Blocking the Executor" msgstr "مسدود کردن Executor" -#: src/SUMMARY.md:294 +#: src/SUMMARY.md:294 src/async/pitfalls/pin.md:1 msgid "Pin" msgstr "Pin" -#: src/SUMMARY.md:295 +#: src/SUMMARY.md:295 src/async/pitfalls/async-traits.md:1 msgid "Async Traits" msgstr "صفات Async" -#: src/SUMMARY.md:296 +#: src/SUMMARY.md:296 src/async/pitfalls/cancellation.md:1 msgid "Cancellation" msgstr "لغو" -#: src/SUMMARY.md:299 +#: src/SUMMARY.md:299 src/exercises/concurrency/chat-app.md:1 +#: src/exercises/concurrency/solutions-afternoon.md:119 msgid "Broadcast Chat Application" msgstr "پخش برنامه چت" @@ -953,7 +966,7 @@ msgstr "پخش برنامه چت" msgid "Final Words" msgstr "کلمات آخر" -#: src/SUMMARY.md:306 +#: src/SUMMARY.md:306 src/thanks.md:1 msgid "Thanks!" msgstr "سپاس!" @@ -961,11 +974,11 @@ msgstr "سپاس!" msgid "Other Resources" msgstr "منابع دیگر" -#: src/SUMMARY.md:308 +#: src/SUMMARY.md:308 src/credits.md:1 msgid "Credits" msgstr "اعتبارها" -#: src/SUMMARY.md:311 +#: src/SUMMARY.md:311 src/exercises/solutions.md:1 msgid "Solutions" msgstr "راه حل‌ها" @@ -997,7 +1010,7 @@ msgstr "روز ۳ عصر" msgid "Bare Metal Rust Morning" msgstr "صبح‌گاه با Bare Metal Rust" -#: src/SUMMARY.md:323 +#: src/SUMMARY.md:323 src/exercises/bare-metal/solutions-afternoon.md:1 msgid "Bare Metal Rust Afternoon" msgstr "عصرانه با Bare Metal Rust" @@ -1009,19 +1022,15 @@ msgstr "صبح‌گاه با همزمانی (Concurrency)" msgid "Concurrency Afternoon" msgstr "همزمانی: عصر" -#: src/index.md:1 -msgid "# Welcome to Comprehensive Rust 🦀" -msgstr "# Welcome to Comprehensive Rust 🦀" - #: src/index.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 "" -"[![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)" #: src/index.md:3 msgid "Build workflow" @@ -1029,11 +1038,12 @@ msgstr "ساخت workflow" #: src/index.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) [!" +"[GitHub contributors](https://img.shields.io/github/contributors/google/" +"comprehensive-rust?style=flat-square)](https://github.com/google/" +"comprehensive-rust/graphs/contributors)" msgstr "" #: src/index.md:4 @@ -1042,15 +1052,17 @@ msgstr "مشارکت کنندگان GitHub" #: src/index.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) [![GitHub stars](https://img.shields." +"io/github/stars/google/comprehensive-rust?style=flat-square)](https://github." +"com/google/comprehensive-rust/stargazers)" msgstr "" -"[![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) [![GitHub stars](https://img.shields." +"io/github/stars/google/comprehensive-rust?style=flat-square)](https://github." +"com/google/comprehensive-rust/stargazers)" #: src/index.md:5 msgid "GitHub stars" @@ -1058,275 +1070,146 @@ msgstr "ستاره های GitHub" #: src/index.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 "" -"[![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)" #: src/index.md:7 msgid "" -"This is a free Rust course developed by the Android team at Google. The course covers\n" -"the full spectrum of Rust, from basic syntax to advanced topics like generics\n" -"and error handling." +"This is a free Rust course developed by the Android team at Google. The " +"course covers the full spectrum of Rust, from basic syntax to advanced " +"topics like generics and error handling." msgstr "" -"این یک دوره رایگان Rust است که توسط تیم اندروید در گوگل توسعه یافته است. این دوره موارد مختلفی را " -"پوشش می دهد\n" -"طیف کامل Rust، از syntax اولیه تا موضوعات پیشرفته مانند جنریک\n" -"و مدیریت خطاها." +"این یک دوره رایگان Rust است که توسط تیم اندروید در گوگل توسعه یافته است. این " +"دوره موارد مختلفی را پوشش می دهد طیف کامل Rust، از syntax اولیه تا موضوعات " +"پیشرفته مانند جنریک و مدیریت خطاها." #: src/index.md:11 msgid "" -"The goal of the course is to teach you Rust. We assume you don't know anything\n" -"about Rust and hope to:" +"The goal of the course is to teach you Rust. We assume you don't know " +"anything about Rust and hope to:" msgstr "" -"هدف از این دوره آموزش Rust به شماست. ما فرض می کنیم شما چیزی از درباره Rust نمی دانید\n" -" امید به یادگیری:" +"هدف از این دوره آموزش Rust به شماست. ما فرض می کنیم شما چیزی از درباره Rust " +"نمی دانید امید به یادگیری:" #: src/index.md:14 -msgid "" -"* Give you a comprehensive understanding of the Rust syntax and language.\n" -"* Enable you to modify existing programs and write new programs in Rust.\n" -"* Show you common Rust idioms." +msgid "Give you a comprehensive understanding of the Rust syntax and language." +msgstr "درک جامعی از syntax و زبان Rust به شما می دهد." + +#: src/index.md:15 +msgid "Enable you to modify existing programs and write new programs in Rust." msgstr "" -"* درک جامعی از syntax و زبان Rust به شما می دهد.\n" -"* شما را قادر می سازد تا برنامه های موجود را تغییر دهید و برنامه های جدید را در Rust بنویسید.\n" -"* اصطلاحات رایج Rust را به شما نشان می دهد." +"شما را قادر می سازد تا برنامه های موجود را تغییر دهید و برنامه های جدید را " +"در Rust بنویسید." + +#: src/index.md:16 +msgid "Show you common Rust idioms." +msgstr "اصطلاحات رایج Rust را به شما نشان می دهد." #: src/index.md:18 msgid "We call the first three course days Rust Fundamentals." msgstr "ما سه روز اول دوره را Rust Fundamentals می نامیم." #: src/index.md:20 -msgid "Building on this, you're invited to dive into one or more specialized topics:" -msgstr "با تکیه بر این، از شما دعوت می شود تا به یک یا چند موضوع تخصصی بپردازید:" +msgid "" +"Building on this, you're invited to dive into one or more specialized topics:" +msgstr "" +"با تکیه بر این، از شما دعوت می شود تا به یک یا چند موضوع تخصصی بپردازید:" #: src/index.md:22 +#, fuzzy +msgid "" +"[Android](android.md): a half-day course on using Rust for Android platform " +"development (AOSP). This includes interoperability with C, C++, and Java." +msgstr "" +"ه [Android](android.md): دوره نیم روزه استفاده از Rust برای پلتفرم اندروید " +"توسعه (AOSP). این شامل قابلیت همکاری با C، C++ و جاوا می شود. ه \\[Bare-" +"metal\\] (bare-metal.md): یک کلاس تمام روز در مورد استفاده از Rust برای bare-" +"metal می‌شود توسعه (embedded). هم میکروکنترلرها و هم پردازنده های کاربردی " +"تحت پوشش آموزشی هستند ه [Concurrency](concurrency.md): یک کلاس تمام روز در " +"مورد همزمانی در Rust. ما هر دو همزمانی کلاسیک (برنامه ریزی پیشگیرانه با " +"استفاده از نخ ها و موتکس) و همزمانی async/wait (همکاری چندوظیفه ای با " +"استفاده از حالت futures)." + +#: src/index.md:24 +msgid "" +"[Bare-metal](bare-metal.md): a whole-day class on using Rust for bare-metal " +"(embedded) development. Both microcontrollers and application processors are " +"covered." +msgstr "" + +#: src/index.md:27 msgid "" -"* [Android](android.md): a half-day course on using Rust for Android platform\n" -" development (AOSP). This includes interoperability with C, C++, and Java.\n" -"* [Bare-metal](bare-metal.md): a whole-day class on using Rust for bare-metal\n" -" (embedded) development. Both microcontrollers and application processors are\n" -" covered.\n" -"* [Concurrency](concurrency.md): a whole-day class on concurrency in Rust. We\n" -" cover both classical concurrency (preemptively scheduling using threads and\n" -" mutexes) and async/await concurrency (cooperative multitasking using\n" -" futures)." -msgstr "" -"ه [Android](android.md): دوره نیم روزه استفاده از Rust برای پلتفرم اندروید\n" -" توسعه (AOSP). این شامل قابلیت همکاری با C، C++ و جاوا می شود.\n" -"ه [Bare-metal] (bare-metal.md): یک کلاس تمام روز در مورد استفاده از Rust برای bare-metal می‌شود \n" -" توسعه (embedded). هم میکروکنترلرها و هم پردازنده های کاربردی تحت پوشش آموزشی هستند\n" -"ه [Concurrency](concurrency.md): یک کلاس تمام روز در مورد همزمانی در Rust. ما\n" -" هر دو همزمانی کلاسیک (برنامه ریزی پیشگیرانه با استفاده از نخ ها و\n" -" موتکس) و همزمانی async/wait (همکاری چندوظیفه ای با استفاده از\n" -" حالت futures)." +"[Concurrency](concurrency.md): a whole-day class on concurrency in Rust. We " +"cover both classical concurrency (preemptively scheduling using threads and " +"mutexes) and async/await concurrency (cooperative multitasking using " +"futures)." +msgstr "" #: src/index.md:33 -msgid "## Non-Goals" -msgstr "## موارد غیر اهداف آموزشی" +msgid "Non-Goals" +msgstr "موارد غیر اهداف آموزشی" #: src/index.md:35 msgid "" -"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:" +"Rust is a large language and we won't be able to cover all of it in a few " +"days. Some non-goals of this course are:" msgstr "" -"Rust زبان بزرگی است و تا چند روز دیگر نمی‌توانیم همه آن را پوشش دهیم.\n" -"برخی از اهداف غیر از این دوره عبارتند از:" +"Rust زبان بزرگی است و تا چند روز دیگر نمی‌توانیم همه آن را پوشش دهیم. برخی از " +"اهداف غیر از این دوره عبارتند از:" #: src/index.md:38 msgid "" -"* Learning how to develop macros: please see [Chapter 19.5 in the Rust\n" -" Book](https://doc.rust-lang.org/book/ch19-06-macros.html) and [Rust by\n" -" Example](https://doc.rust-lang.org/rust-by-example/macros.html) instead." +"Learning how to develop macros: please see [Chapter 19.5 in the Rust Book]" +"(https://doc.rust-lang.org/book/ch19-06-macros.html) and [Rust by Example]" +"(https://doc.rust-lang.org/rust-by-example/macros.html) instead." msgstr "" -"* Learning how to develop macros: please see [Chapter 19.5 in the Rust\n" -" Book](https://doc.rust-lang.org/book/ch19-06-macros.html) and [Rust by\n" -" Example](https://doc.rust-lang.org/rust-by-example/macros.html) instead." +"Learning how to develop macros: please see [Chapter 19.5 in the Rust Book]" +"(https://doc.rust-lang.org/book/ch19-06-macros.html) and [Rust by Example]" +"(https://doc.rust-lang.org/rust-by-example/macros.html) instead." #: src/index.md:42 -msgid "## Assumptions" -msgstr "## فرضیه ها" +msgid "Assumptions" +msgstr "فرضیه ها" #: src/index.md:44 msgid "" -"The course assumes that you already know how to program. Rust is a statically-typed\n" -"language and we will sometimes make comparisons with C and C++ to better\n" -"explain or contrast the Rust approach." +"The course assumes that you already know how to program. Rust is a " +"statically-typed language and we will sometimes make comparisons with C and " +"C++ to better explain or contrast the Rust approach." msgstr "" -"این دوره فرض می کندشما دانش برنامه نویسی دارید. Rust یک زبان استاتیک تایپ است \n" -"و ما گاهی اوقات زبان Rust را با C و C++ مقایسه می کنیم \n" -"تا رویکرد‌های Rust را بهتر توضیح دهیم یا در در حالت مقایسه با آن قرار دهیم." +"این دوره فرض می کندشما دانش برنامه نویسی دارید. Rust یک زبان استاتیک تایپ " +"است \n" +"و ما گاهی اوقات زبان Rust را با C و C++ مقایسه می کنیم تا رویکرد‌های Rust را " +"بهتر توضیح دهیم یا در در حالت مقایسه با آن قرار دهیم." #: src/index.md:48 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 " "JavaScript, then you will be able to follow along just fine too." msgstr "" -"اگر می‌دانید چگونه به زبانی با دینامیک تایپ مانند پایتون یا جاوا اسکریپت برنامه‌نویسی کنید\n" -" می‌توانید به خوبی این روش را دنبال کنید." - -#: src/index.md:51 src/cargo.md:14 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:19 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:55 -#: src/basic-syntax/scopes-shadowing.md:23 src/memory-management/stack.md:26 -#: src/memory-management/rust.md:12 src/ownership/move-semantics.md:19 -#: 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:32 src/enums/variant-payloads.md:33 -#: src/enums/sizes.md:26 src/methods.md:28 src/methods/receiver.md:22 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:41 -#: 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:30 src/modules.md:26 -#: src/modules/visibility.md:37 src/modules/filesystem.md:35 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:32 -#: 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:12 -#: 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/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/entry-point.md:75 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/using.md:49 src/bare-metal/aps/logging.md:48 -#: src/bare-metal/aps/logging/using.md:44 src/bare-metal/aps/exceptions.md:62 -#: src/bare-metal/aps/other-projects.md:15 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:38 src/concurrency/channels.md:25 -#: src/concurrency/channels/bounded.md:29 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:50 src/async/channels.md:33 -#: src/async/control-flow/join.md:34 src/async/control-flow/select.md:60 -#: src/async/pitfalls/blocking-executor.md:27 src/async/pitfalls/pin.md:66 -#: src/async/pitfalls/cancellation.md:70 src/exercises/concurrency/afternoon.md:11 -#: src/exercises/concurrency/dining-philosophers-async.md:75 -msgid "
" -msgstr "" +"اگر می‌دانید چگونه به زبانی با دینامیک تایپ مانند پایتون یا جاوا اسکریپت " +"برنامه‌نویسی کنید می‌توانید به خوبی این روش را دنبال کنید." #: src/index.md:53 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" -"cover as well as answers to typical questions which come up in class." -msgstr "" - -#: src/index.md:57 src/cargo.md:26 src/cargo/rust-ecosystem.md:71 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:43 src/hello-world/small-example.md:46 src/why-rust.md:24 -#: src/why-rust/compile-time.md:35 src/why-rust/runtime.md:23 src/why-rust/modern.md:66 -#: src/basic-syntax/scalar-types.md:46 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:36 src/basic-syntax/methods.md:47 -#: 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:74 -#: src/basic-syntax/scopes-shadowing.md:39 src/memory-management/stack.md:49 -#: src/memory-management/rust.md:18 src/ownership/move-semantics.md:29 -#: 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:44 -#: src/structs/field-shorthand.md:72 src/enums.md:42 src/enums/variant-payloads.md:45 -#: src/enums/sizes.md:154 src/methods.md:41 src/methods/receiver.md:28 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:47 -#: 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:70 src/modules.md:32 -#: src/modules/visibility.md:48 src/modules/filesystem.md:62 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:48 src/traits/operators.md:40 src/traits/closures.md:63 -#: src/exercises/day-3/morning.md:11 src/error-handling/result.md:33 -#: src/error-handling/try-operator.md:60 src/error-handling/converting-error-types-example.md:61 -#: 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:18 -#: 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/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/entry-point.md:101 -#: 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/aps/exceptions.md:75 src/bare-metal/aps/other-projects.md:29 -#: 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:43 src/concurrency/channels.md:32 -#: src/concurrency/channels/bounded.md:35 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:63 src/async/channels.md:49 -#: src/async/control-flow/join.md:50 src/async/control-flow/select.md:79 -#: src/async/pitfalls/blocking-executor.md:50 src/async/pitfalls/pin.md:112 -#: src/async/pitfalls/async-traits.md:63 src/async/pitfalls/cancellation.md:114 -#: src/exercises/concurrency/afternoon.md:17 src/exercises/concurrency/dining-philosophers-async.md:79 -msgid "
" -msgstr "" - -#: src/running-the-course.md:1 -msgid "# Running the Course" +"This is an example of a _speaker note_. We will use these to add additional " +"information to the slides. This could be key points which the instructor " +"should cover as well as answers to typical questions which come up in class." msgstr "" #: src/running-the-course.md:3 src/running-the-course/course-structure.md:3 -msgid "> This page is for the course instructor." -msgstr "> این صفحه برای مدرس دوره است." +msgid "This page is for the course instructor." +msgstr "این صفحه برای مدرس دوره است." #: src/running-the-course.md:5 msgid "" -"Here is a bit of background information about how we've been running the course\n" -"internally at Google." +"Here is a bit of background information about how we've been running the " +"course internally at Google." msgstr "" #: src/running-the-course.md:8 @@ -1335,164 +1218,180 @@ 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" -" 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" -" 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" -" 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" -" 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" -" 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" -" 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" -" and offer a solution, e.g., by showing people where to find the relevant\n" -" information in the standard library." +"Make yourself familiar with the course material. We've included speaker " +"notes to help highlight the key points (please help us by contributing more " +"speaker notes!). When presenting, you should make sure to open the speaker " +"notes in a popup (click the link with a little arrow next to \"Speaker " +"Notes\"). This way you have a clean screen to present to the class." +msgstr "" + +#: src/running-the-course.md:16 +msgid "" +"Decide on the dates. Since the course takes at least three full days, we " +"recommend that you schedule the days over two weeks. Course participants " +"have said that they find it helpful to have a gap in the course since it " +"helps them process all the information we give them." +msgstr "" + +#: src/running-the-course.md:21 +msgid "" +"Find a room large enough for your in-person participants. We recommend a " +"class size of 15-25 people. That's small enough that people are comfortable " +"asking questions --- it's also small enough that one instructor will have " +"time to answer the questions. Make sure the room has _desks_ for yourself " +"and for the students: you will all need to be able to sit and work with your " +"laptops. In particular, you will be doing a lot of live-coding as an " +"instructor, so a lectern won't be very helpful for you." +msgstr "" + +#: src/running-the-course.md:29 +msgid "" +"On the day of your course, show up to the room a little early to set things " +"up. We recommend presenting directly using `mdbook serve` running on your " +"laptop (see the [installation instructions](https://github.com/google/" +"comprehensive-rust#building)). This ensures optimal performance with no lag " +"as you change pages. Using your laptop will also allow you to fix typos as " +"you or the course participants spot them." +msgstr "" + +#: src/running-the-course.md:35 +msgid "" +"Let people solve the exercises by themselves or in small groups. We " +"typically spend 30-45 minutes on exercises in the morning and in the " +"afternoon (including time to review the solutions). Make sure to ask people " +"if they're stuck or if there is anything you can help with. When you see " +"that several people have the same problem, call it out to the class and " +"offer a solution, e.g., by showing people where to find the relevant " +"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" -"you as it has been for us!" +"That is all, good luck running the course! We hope it will be as much fun " +"for you as it has been for us!" msgstr "" #: src/running-the-course.md:46 msgid "" -"Please [provide feedback][1] afterwards so that we can keep improving the\n" -"course. We would love to hear what worked well for you and what can be made\n" -"better. Your students are also very welcome to [send us feedback][2]!" +"Please [provide feedback](https://github.com/google/comprehensive-rust/" +"discussions/86) afterwards so that we can keep improving the course. We " +"would love to hear what worked well for you and what can be made better. " +"Your students are also very welcome to [send us feedback](https://github.com/" +"google/comprehensive-rust/discussions/100)!" msgstr "" -#: src/running-the-course/course-structure.md:1 -msgid "# Course Structure" -msgstr "# ساختار دوره" - #: src/running-the-course/course-structure.md:5 msgid "The course is fast paced and covers a lot of ground:" msgstr "یاد گیری این دوره کوتاه است و مبحث‌های زیادی را پوشش می دهد:" #: src/running-the-course/course-structure.md:7 -msgid "" -"* Day 1: Basic Rust, ownership and the borrow checker.\n" -"* Day 2: Compound data types, pattern matching, the standard library.\n" -"* Day 3: Traits and generics, error handling, testing, unsafe Rust." +msgid "Day 1: Basic Rust, ownership and the borrow checker." +msgstr "" + +#: src/running-the-course/course-structure.md:8 +msgid "Day 2: Compound data types, pattern matching, the standard library." +msgstr "" + +#: src/running-the-course/course-structure.md:9 +msgid "Day 3: Traits and generics, error handling, testing, unsafe Rust." msgstr "" #: src/running-the-course/course-structure.md:11 -msgid "## Deep Dives" -msgstr "## شیرجه در اعماق" +msgid "Deep Dives" +msgstr "شیرجه در اعماق" #: src/running-the-course/course-structure.md:13 msgid "" -"In addition to the 3-day class on Rust Fundamentals, we cover some more\n" +"In addition to the 3-day class on Rust Fundamentals, we cover some more " "specialized topics:" msgstr "" -"علاوه بر کلاس 3 روزه Rust Fundamentals، موضوعات\n" -" تخصصی تری را نیز پوشش می دهیم:" - -#: src/running-the-course/course-structure.md:16 -msgid "### Android" -msgstr "### اندروید" +"علاوه بر کلاس 3 روزه Rust Fundamentals، موضوعات تخصصی تری را نیز پوشش می " +"دهیم:" #: 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 with C, C++, and\n" -"Java." +"The [Android Deep Dive](../android.md) is a half-day course on using Rust " +"for Android platform development. This includes interoperability with C, C+" +"+, and Java." msgstr "" -"در [Android Deep Dive](../android.md) یک دوره نیم روزه در مورد استفاده از Rust برای توسعه پلتفرم " -"اندروید است. این شامل قابلیت تعامل با C، C++ و جاوا می شود." +"در [Android Deep Dive](../android.md) یک دوره نیم روزه در مورد استفاده از " +"Rust برای توسعه پلتفرم اندروید است. این شامل قابلیت تعامل با C، C++ و جاوا " +"می شود." #: src/running-the-course/course-structure.md:22 #, fuzzy 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" -"sees the `Android.bp` files in `src/android/`." +"You will need an [AOSP checkout](https://source.android.com/docs/setup/" +"download/downloading). Make a checkout of the [course repository](https://" +"github.com/google/comprehensive-rust) on the same machine and move the `src/" +"android/` directory into the root of your AOSP checkout. This will ensure " +"that the Android build system sees the `Android.bp` files in `src/android/`." msgstr "" -"شما به [AOSP Checkout][1] نیاز دارید. یک checkout از [course repository] [2] در\n" -" همان دستگاه انجام دهید و دایرکتوری `src/android/` را به root صورت AOSP checkout خود\n" -" منتقل کنید. این اطمینان حاصل می کند که سیستم ساخت اندروید\n" -" فایل های «Android.bp» را در «src/android/» می بیند." +"شما به [AOSP Checkout](https://source.android.com/docs/setup/download/" +"downloading) نیاز دارید. یک checkout از \\[course repository\\] [2](https://" +"github.com/google/comprehensive-rust) در همان دستگاه انجام دهید و دایرکتوری " +"`src/android/` را به root صورت AOSP checkout خود منتقل کنید. این اطمینان " +"حاصل می کند که سیستم ساخت اندروید فایل های «Android.bp» را در «src/android/» " +"می بیند." #: 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" -"commands it runs and make sure they work when you run them by hand." +"Ensure that `adb sync` works with your emulator or real device and pre-build " +"all Android examples using `src/android/build_all.sh`. Read the script to " +"see the commands it runs and make sure they work when you run them by hand." msgstr "" -"اطمینان حاصل کنید که «adb sync» با شبیه‌ساز یا دستگاه واقعی شما کار می‌کند \n" -"و همه نمونه‌های Android را با استفاده از «src/android/build_all.sh» از قبل بسازید. \n" -"اسکریپت را بخوانید تا دستوراتی را که اجرا می‌کند ببینید و مطمئن شوید که وقتی آنها را اجرا می‌کنید به " -"درستی کار می‌کنند." +"اطمینان حاصل کنید که «adb sync» با شبیه‌ساز یا دستگاه واقعی شما کار می‌کند و " +"همه نمونه‌های Android را با استفاده از «src/android/build_all.sh» از قبل " +"بسازید. اسکریپت را بخوانید تا دستوراتی را که اجرا می‌کند ببینید و مطمئن شوید " +"که وقتی آنها را اجرا می‌کنید به درستی کار می‌کنند." #: src/running-the-course/course-structure.md:34 -msgid "### Bare-Metal" -msgstr "### Bare-Metal" +msgid "Bare-Metal" +msgstr "Bare-Metal" #: 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" -"bare-metal (embedded) development. Both microcontrollers and application\n" +"The [Bare-Metal Deep Dive](../bare-metal.md): a full day class on using Rust " +"for bare-metal (embedded) development. Both microcontrollers and application " "processors are covered." msgstr "" -"در [Bare-Metal Deep Dive](../bare-metal.md): یک کلاس یک روزه کامل در مورد استفاده از Rust برای توسعه " -"bare-metal (embedded) هم میکروکنترلرها و هم پردازنده های برنامه پوشش داده شده اند." +"در [Bare-Metal Deep Dive](../bare-metal.md): یک کلاس یک روزه کامل در مورد " +"استفاده از Rust برای توسعه bare-metal (embedded) هم میکروکنترلرها و هم " +"پردازنده های برنامه پوشش داده شده اند." #: 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" -"will need to install a number of packages as described on the [welcome\n" -"page](../bare-metal.md)." +"For the microcontroller part, you will need to buy the [BBC micro:bit]" +"(https://microbit.org/) v2 development board ahead of time. Everybody will " +"need to install a number of packages as described on the [welcome page](../" +"bare-metal.md)." msgstr "" -"برای قسمت میکروکنترلر، باید برد توسعه [BBCmicro:bit](https://microbit.org/) v2 را خریداری کنید. " -"همه باید تعدادی بسته را همانطور که در [welcome page] (../bare-metal.md) توضیح داده شده نصب کنند." +"برای قسمت میکروکنترلر، باید برد توسعه [BBCmicro:bit](https://microbit.org/) " +"v2 را خریداری کنید. همه باید تعدادی بسته را همانطور که در \\[welcome " +"page\\] (../bare-metal.md) توضیح داده شده نصب کنند." #: src/running-the-course/course-structure.md:45 -msgid "### Concurrency" -msgstr "### همزمانی" +msgid "Concurrency" +msgstr "همزمانی" #: src/running-the-course/course-structure.md:47 msgid "" -"The [Concurrency Deep Dive](../concurrency.md) is a full day class on classical\n" -"as well as `async`/`await` concurrency." +"The [Concurrency Deep Dive](../concurrency.md) is a full day class on " +"classical as well as `async`/`await` concurrency." msgstr "" -"این [Concurrency Deep Dive] (../concurrency.md) به اصطلاح یک کلاس یک روزه است\n" -"و همچنین همزمانی `async`/`await` اینگونه است." +"این \\[Concurrency Deep Dive\\] (../concurrency.md) به اصطلاح یک کلاس یک " +"روزه است و همچنین همزمانی `async`/`await` اینگونه است." -# جعبه کلمه مناسبی نیست و شاید نوشتن پکیج بهتر باشه #: src/running-the-course/course-structure.md:50 #, fuzzy 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" -"them:" +"You will need a fresh crate set up and the dependencies downloaded and ready " +"to go. You can then copy/paste the examples into `src/main.rs` to experiment " +"with them:" msgstr "" -"شما به یک جعبه(crate) جدید نیاز برای وابستگی ها دانلود شده که آماده کار هستند نیاز دارید.\n" -" سپس می‌توانید مثال‌ها را در «src/main.rs» به راحتی copy/paste کنید و با آنها آزمایش کنید:" +"شما به یک جعبه(crate) جدید نیاز برای وابستگی ها دانلود شده که آماده کار " +"هستند نیاز دارید. سپس می‌توانید مثال‌ها را در «src/main.rs» به راحتی copy/" +"paste کنید و با آنها آزمایش کنید:" #: src/running-the-course/course-structure.md:54 msgid "" @@ -1511,128 +1410,181 @@ msgstr "" "```" #: src/running-the-course/course-structure.md:61 -msgid "## Format" -msgstr "## فرمت" +msgid "Format" +msgstr "فرمت" #: src/running-the-course/course-structure.md:63 msgid "" -"The course is meant to be very interactive and we recommend letting the\n" +"The course is meant to be very interactive and we recommend letting the " "questions drive the exploration of Rust!" msgstr "" -"این دوره قرار است بسیار تعاملی باشد و توصیه می کنیم اجازه دهید\n" -" حس کنجکاوی Rust را هدایت کنند!" - -#: src/running-the-course/keyboard-shortcuts.md:1 -msgid "# Keyboard Shortcuts" -msgstr "# میانبر‌های صفحه کلید" +"این دوره قرار است بسیار تعاملی باشد و توصیه می کنیم اجازه دهید حس کنجکاوی " +"Rust را هدایت کنند!" #: src/running-the-course/keyboard-shortcuts.md:3 msgid "There are several useful keyboard shortcuts in mdBook:" msgstr "چندین میانبر صفحه کلید مفید در mdBook وجود دارد:" #: src/running-the-course/keyboard-shortcuts.md:5 -msgid "" -"* Arrow-Left: Navigate to the previous page.\n" -"* Arrow-Right: Navigate to the next page.\n" -"* Ctrl + Enter: Execute the code sample that has focus.\n" -"* s: Activate the search bar." +msgid "Arrow-Left" +msgstr "" + +#: src/running-the-course/keyboard-shortcuts.md:5 +msgid ": Navigate to the previous page." +msgstr "" + +#: src/running-the-course/keyboard-shortcuts.md:6 +msgid "Arrow-Right" +msgstr "" + +#: src/running-the-course/keyboard-shortcuts.md:6 +msgid ": Navigate to the next page." msgstr "" -#: src/running-the-course/translations.md:1 -msgid "# Translations" -msgstr "# ترجمه" +#: src/running-the-course/keyboard-shortcuts.md:7 src/cargo/code-samples.md:19 +msgid "Ctrl + Enter" +msgstr "" + +#: src/running-the-course/keyboard-shortcuts.md:7 +msgid ": Execute the code sample that has focus." +msgstr "" + +#: src/running-the-course/keyboard-shortcuts.md:8 +msgid "s" +msgstr "" + +#: src/running-the-course/keyboard-shortcuts.md:8 +msgid ": Activate the search bar." +msgstr "" #: src/running-the-course/translations.md:3 msgid "" -"The course has been translated into other languages by a set of wonderful\n" +"The course has been translated into other languages by a set of wonderful " "volunteers:" -msgstr "این دوره توسط مجموعه ای از داوطلبان فوق العاده به زبان های دیگر ترجمه شده است:" +msgstr "" +"این دوره توسط مجموعه ای از داوطلبان فوق العاده به زبان های دیگر ترجمه شده " +"است:" #: src/running-the-course/translations.md:6 msgid "" -"* [Brazilian Portuguese][pt-BR] by [@rastringer], [@hugojacob], [@joaovicmendes] and [@henrif75].\n" -"* [Korean][ko] by [@keispace], [@jiyongp] and [@jooyunghan]." +"[Brazilian Portuguese](https://google.github.io/comprehensive-rust/pt-BR/) " +"by [@rastringer](https://github.com/rastringer), [@hugojacob](https://github." +"com/hugojacob), [@joaovicmendes](https://github.com/joaovicmendes) and " +"[@henrif75](https://github.com/henrif75)." msgstr "" -"* [Brazilian Portuguese][pt-BR] by [@rastringer], [@hugojacob], [@joaovicmendes] and [@henrif75].\n" -"* [Korean][ko] by [@keispace], [@jiyongp] and [@jooyunghan]." +"[Brazilian Portuguese](https://google.github.io/comprehensive-rust/pt-BR/) " +"by [@rastringer](https://github.com/rastringer), [@hugojacob](https://github." +"com/hugojacob), [@joaovicmendes](https://github.com/joaovicmendes) and " +"[@henrif75](https://github.com/henrif75)." + +#: src/running-the-course/translations.md:7 +msgid "" +"[Korean](https://google.github.io/comprehensive-rust/ko/) by [@keispace]" +"(https://github.com/keispace), [@jiyongp](https://github.com/jiyongp) and " +"[@jooyunghan](https://github.com/jooyunghan)." +msgstr "" +"[Korean](https://google.github.io/comprehensive-rust/ko/) by [@keispace]" +"(https://github.com/keispace), [@jiyongp](https://github.com/jiyongp) and " +"[@jooyunghan](https://github.com/jooyunghan)." #: src/running-the-course/translations.md:9 -msgid "Use the language picker in the top-right corner to switch between languages." -msgstr "از انتخابگر زبان در گوشه بالا سمت راست برای جابه‌جایی بین زبان‌ها استفاده کنید." +msgid "" +"Use the language picker in the top-right corner to switch between languages." +msgstr "" +"از انتخابگر زبان در گوشه بالا سمت راست برای جابه‌جایی بین زبان‌ها استفاده کنید." #: src/running-the-course/translations.md:11 -msgid "## Incomplete Translations" -msgstr "## ترجمه‌های کامل نشده" +msgid "Incomplete Translations" +msgstr "ترجمه‌های کامل نشده" #: src/running-the-course/translations.md:13 msgid "" -"There is a large number of in-progress translations. We link to the most\n" +"There is a large number of in-progress translations. We link to the most " "recently updated translations:" msgstr "" -"تعداد زیادی ترجمه در حال انجام وجود دارد. ما به آخرین\n" -" ترجمه های به روز شده پیوند می دهیم:" +"تعداد زیادی ترجمه در حال انجام وجود دارد. ما به آخرین ترجمه های به روز شده " +"پیوند می دهیم:" #: src/running-the-course/translations.md:16 msgid "" -"* [Bengali][bn] by [@raselmandol].\n" -"* [French][fr] by [@KookaS] and [@vcaen].\n" -"* [German][de] by [@Throvn] and [@ronaldfw].\n" -"* [Japanese][ja] by [@CoinEZ-JPN] and [@momotaro1105]." +"[Bengali](https://google.github.io/comprehensive-rust/bn/) by [@raselmandol]" +"(https://github.com/raselmandol)." msgstr "" -#: src/running-the-course/translations.md:21 +#: src/running-the-course/translations.md:17 +msgid "" +"[French](https://google.github.io/comprehensive-rust/fr/) by [@KookaS]" +"(https://github.com/KookaS) and [@vcaen](https://github.com/vcaen)." +msgstr "" + +#: src/running-the-course/translations.md:18 +msgid "" +"[German](https://google.github.io/comprehensive-rust/de/) by [@Throvn]" +"(https://github.com/Throvn) and [@ronaldfw](https://github.com/ronaldfw)." +msgstr "" + +#: src/running-the-course/translations.md:19 msgid "" -"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]." +"[Japanese](https://google.github.io/comprehensive-rust/ja/) by [@CoinEZ-JPN]" +"(https://github.com/CoinEZ) and [@momotaro1105](https://github.com/" +"momotaro1105)." msgstr "" -"اگر می‌خواهید به این کار کمک کنید، لطفاً [دستورالعمل‌های ما] را برای چگونگی ادامه کار ببینید.\n" -" ترجمه ها در [issue tracker] هماهنگ و کنترل می شوند." -#: src/cargo.md:1 -msgid "# Using Cargo" -msgstr "# استفاده از Cargo" +#: src/running-the-course/translations.md:21 +msgid "" +"If you want to help with this effort, please see [our instructions](https://" +"github.com/google/comprehensive-rust/blob/main/TRANSLATIONS.md) for how to " +"get going. Translations are coordinated on the [issue tracker](https://" +"github.com/google/comprehensive-rust/issues/282)." +msgstr "" +"اگر می‌خواهید به این کار کمک کنید، لطفاً \\[دستورالعمل‌های ما\\] را برای چگونگی " +"ادامه کار ببینید. ترجمه ها در [issue tracker](https://github.com/google/" +"comprehensive-rust/issues/282) هماهنگ و کنترل می شوند." #: 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" -"and how it fits into this training." +"When you start reading about Rust, you will soon meet [Cargo](https://doc." +"rust-lang.org/cargo/), the standard tool used in the Rust ecosystem to build " +"and run Rust applications. Here we want to give a brief overview of what " +"Cargo is and how it fits into the wider ecosystem and how it fits into this " +"training." msgstr "" -"وقتی شروع به خواندن درباره Rust می کنید، خیلی سریع با Cargo](https://doc.rust-lang.org/cargo/)] ، " -"ابزار\n" -" استانداردی که در اکوسیستم Rust برای ساخت و اجرای برنامه های Rust استفاده می شود، آشنا خواهید شد.\n" -" در اینجا می‌خواهیم یک مرور مختصر از در مورد کارگو و نحوه انطباق آن\n" -" با اکوسیستم رراست و برنامه‌های آن را در این آموزش ارائه دهیم." +"وقتی شروع به خواندن درباره Rust می کنید، خیلی سریع با Cargo\\](https://doc." +"rust-lang.org/cargo/)\\] ، ابزار استانداردی که در اکوسیستم Rust برای ساخت و " +"اجرای برنامه های Rust استفاده می شود، آشنا خواهید شد. در اینجا می‌خواهیم یک " +"مرور مختصر از در مورد کارگو و نحوه انطباق آن با اکوسیستم رراست و برنامه‌های " +"آن را در این آموزش ارائه دهیم." #: src/cargo.md:8 -msgid "## Installation" -msgstr "## راهنمای نصب" +msgid "Installation" +msgstr "راهنمای نصب" #: src/cargo.md:10 -msgid "> **Please follow the instructions on .**" -msgstr "> **لطفا دستورالعمل را اجرا کنید .**" +msgid "**Please follow the instructions on .**" +msgstr "**لطفا دستورالعمل را اجرا کنید .**" #: src/cargo.md:12 msgid "" -"This will give you the Cargo build tool (`cargo`) and the Rust compiler (`rustc`). You will also get " -"`rustup`, a command line utility that you can use to install/switch toolchains, setup cross " -"compilation, etc." +"This will give you the Cargo build tool (`cargo`) and the Rust compiler " +"(`rustc`). You will also get `rustup`, a command line utility that you can " +"use to install/switch toolchains, setup cross compilation, etc." msgstr "" -"این ابزار ساخت Cargo ('cargo') و کامپایلر Rust ('rustc') را در اختیار شما قرار می دهد. همچنین " -"«rustup» را دریافت خواهید کرد، یک ابزار خط فرمان که می‌توانید از آن برای نصب/تغییر toolchains، " -"راه‌اندازی cross کامپایل و ... استفاده کنید." +"این ابزار ساخت Cargo ('cargo') و کامپایلر Rust ('rustc') را در اختیار شما " +"قرار می دهد. همچنین «rustup» را دریافت خواهید کرد، یک ابزار خط فرمان که " +"می‌توانید از آن برای نصب/تغییر toolchains، راه‌اندازی cross کامپایل و ... " +"استفاده کنید." #: src/cargo.md:16 msgid "" -"* On Debian/Ubuntu, you can also install Cargo, the Rust source and the [Rust formatter][6] via " -"`apt`. However, this gets you an outdated rust version and may lead to unexpected behavior. The " +"On Debian/Ubuntu, you can also install Cargo, the Rust source and the [Rust " +"formatter](https://github.com/rust-lang/rustfmt) via `apt`. However, this " +"gets you an outdated rust version and may lead to unexpected behavior. The " "command would be:" msgstr "" -"* در دبیان/اوبونتو، می‌توانید Cargoو Rust و [Rust formatter][6] را نیز از طریق «apt» نصب کنید. با " -"این حال، این به شما یک نسخه قدیمی Rust را جهت نصب می دهد و ممکن است منجر به رفتار غیرمنتظره برنامه " -"شود. command مورد نظر این خواهد بود:" +"در دبیان/اوبونتو، می‌توانید Cargoو Rust و [Rust formatter](https://github." +"com/rust-lang/rustfmt) را نیز از طریق «apt» نصب کنید. با این حال، این به شما " +"یک نسخه قدیمی Rust را جهت نصب می دهد و ممکن است منجر به رفتار غیرمنتظره " +"برنامه شود. command مورد نظر این خواهد بود:" #: src/cargo.md:18 msgid "" @@ -1646,109 +1598,185 @@ msgstr "" #: src/cargo.md:22 msgid "" -"* We suggest using [VS Code][2] to edit the code (but any LSP compatible editor works with rust-" -"analyzer[3]).\n" -"\n" -"* 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." +"We suggest using [VS Code](https://code.visualstudio.com/) to edit the code " +"(but any LSP compatible editor works with rust-analyzer[3](https://rust-" +"analyzer.github.io/))." msgstr "" -"* پیشنهاد می کنیم از [VS Code][2] برای ویرایش کد استفاده کنید (اما هر ویرایشگر سازگار با LSP با ust-" -"analyzer[3] کار می کند).\n" -"\n" -"* برخی از افراد همچنین دوست دارند از خانواده IDE [JetBrains][4] استفاده کنند، که آنالیزهای خود را " -"انجام می دهند اما یان مسئله tradeoffهای خاص خود را دارد. اگر آنها را ترجیح می دهید، می توانید [Plugin " -"Rust][5] را نصب کنید. لطفاً توجه داشته باشید که از ژانویه 2023 اشکال زدایی (debugging) فقط در نسخه " -"CLion مجموعه JetBrains IDEA کار می کند." +"پیشنهاد می کنیم از [VS Code](https://code.visualstudio.com/) برای ویرایش کد " +"استفاده کنید (اما هر ویرایشگر سازگار با LSP با ust-analyzer[3](https://rust-" +"analyzer.github.io/) کار می کند)." + +#: src/cargo.md:24 +msgid "" +"Some folks also like to use the [JetBrains](https://www.jetbrains.com/" +"clion/) family of IDEs, which do their own analysis but have their own " +"tradeoffs. If you prefer them, you can install the [Rust Plugin](https://www." +"jetbrains.com/rust/). Please take note that as of January 2023 debugging " +"only works on the CLion version of the JetBrains IDEA suite." +msgstr "" +"برخی از افراد همچنین دوست دارند از خانواده IDE [JetBrains](https://www." +"jetbrains.com/clion/) استفاده کنند، که آنالیزهای خود را انجام می دهند اما " +"یان مسئله tradeoffهای خاص خود را دارد. اگر آنها را ترجیح می دهید، می توانید " +"[Plugin Rust](https://www.jetbrains.com/rust/) را نصب کنید. لطفاً توجه داشته " +"باشید که از ژانویه 2023 اشکال زدایی (debugging) فقط در نسخه CLion مجموعه " +"JetBrains IDEA کار می کند." #: src/cargo/rust-ecosystem.md:1 -msgid "# The Rust Ecosystem" -msgstr "# اکوسیستم رراست" +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:" -msgstr "اکوسیستم Rust از تعدادی ابزار تشکیل شده است که مهمترین آنها عبارتند از:" +msgid "" +"The Rust ecosystem consists of a number of tools, of which the main ones are:" +msgstr "" +"اکوسیستم Rust از تعدادی ابزار تشکیل شده است که مهمترین آنها عبارتند از:" #: src/cargo/rust-ecosystem.md:5 msgid "" -"* `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, usually 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" -" 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" -" will let you switch between them as needed." +"`rustc`: the Rust compiler which turns `.rs` files into binaries and other " +"intermediate formats." 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:8 +msgid "" +"`cargo`: the Rust dependency manager and build tool. Cargo knows how to " +"download dependencies, usually hosted on , and it will " +"pass them to `rustc` when building your project. Cargo also comes with a " +"built-in test runner which is used to execute unit tests." +msgstr "" + +#: src/cargo/rust-ecosystem.md:13 +msgid "" +"`rustup`: the Rust toolchain installer and updater. This tool is used to " +"install and update `rustc` and `cargo` when new versions of Rust is " +"released. In addition, `rustup` can also download documentation for the " +"standard library. You can have multiple versions of Rust installed at once " +"and `rustup` 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/concurrency/threads.md:30 src/async/async-await.md:25 msgid "Key points:" msgstr "" #: src/cargo/rust-ecosystem.md:23 msgid "" -"* Rust has a rapid release schedule with a new release coming out\n" -" every six weeks. New releases maintain backwards compatibility with\n" -" old releases --- plus they enable new functionality.\n" -"\n" -"* There are three release channels: \"stable\", \"beta\", and \"nightly\".\n" -"\n" -"* New features are being tested on \"nightly\", \"beta\" is what becomes\n" -" \"stable\" every six weeks.\n" -"\n" -"* Dependencies can also be resolved from alternative [registries], git, folders, and more.\n" -"\n" -"* Rust also has [editions]: the current edition is Rust 2021. Previous\n" -" editions were Rust 2015 and Rust 2018.\n" -"\n" -" * The editions are allowed to make backwards incompatible changes to\n" -" the language.\n" -"\n" -" * To prevent breaking code, editions are opt-in: you select the\n" -" edition for your crate via the `Cargo.toml` file.\n" -"\n" -" * 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" -"\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" -" * Read more from the [official Cargo Book]" +"Rust has a rapid release schedule with a new release coming out every six " +"weeks. New releases maintain backwards compatibility with old releases --- " +"plus they enable new functionality." +msgstr "" + +#: src/cargo/rust-ecosystem.md:27 +msgid "" +"There are three release channels: \"stable\", \"beta\", and \"nightly\"." +msgstr "" + +#: src/cargo/rust-ecosystem.md:29 +msgid "" +"New features are being tested on \"nightly\", \"beta\" is what becomes " +"\"stable\" every six weeks." +msgstr "" + +#: src/cargo/rust-ecosystem.md:32 +msgid "" +"Dependencies can also be resolved from alternative [registries](https://doc." +"rust-lang.org/cargo/reference/registries.html), git, folders, and more." +msgstr "" + +#: src/cargo/rust-ecosystem.md:34 +msgid "" +"Rust also has [editions](https://doc.rust-lang.org/edition-guide/): the " +"current edition is Rust 2021. Previous editions were Rust 2015 and Rust 2018." +msgstr "" + +#: src/cargo/rust-ecosystem.md:37 +msgid "" +"The editions are allowed to make backwards incompatible changes to the " +"language." +msgstr "" + +#: src/cargo/rust-ecosystem.md:40 +msgid "" +"To prevent breaking code, editions are opt-in: you select the edition for " +"your crate via the `Cargo.toml` file." +msgstr "" + +#: src/cargo/rust-ecosystem.md:43 +msgid "" +"To avoid splitting the ecosystem, Rust compilers can mix code written for " +"different editions." +msgstr "" + +#: src/cargo/rust-ecosystem.md:46 +msgid "" +"Mention that it is quite rare to ever use the compiler directly not through " +"`cargo` (most users never do)." +msgstr "" + +#: src/cargo/rust-ecosystem.md:48 +msgid "" +"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: " +msgstr "" + +#: src/cargo/rust-ecosystem.md:49 +msgid "Project/package structure" +msgstr "" + +#: src/cargo/rust-ecosystem.md:50 +msgid "[workspaces](https://doc.rust-lang.org/cargo/reference/workspaces.html)" +msgstr "" + +#: src/cargo/rust-ecosystem.md:51 +msgid "Dev Dependencies and Runtime Dependency management/caching" +msgstr "" + +#: src/cargo/rust-ecosystem.md:52 +msgid "" +"[build scripting](https://doc.rust-lang.org/cargo/reference/build-scripts." +"html)" +msgstr "" + +#: src/cargo/rust-ecosystem.md:53 +msgid "" +"[global installation](https://doc.rust-lang.org/cargo/commands/cargo-install." +"html)" +msgstr "" + +#: src/cargo/rust-ecosystem.md:54 +msgid "" +"It is also extensible with sub command plugins as well (such as [cargo " +"clippy](https://github.com/rust-lang/rust-clippy))." +msgstr "" + +#: src/cargo/rust-ecosystem.md:55 +msgid "" +"Read more from the [official Cargo Book](https://doc.rust-lang.org/cargo/)" msgstr "" #: src/cargo/code-samples.md:1 -msgid "# Code Samples in This Training" +msgid "Code Samples in This Training" 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" -"ensures a consistent experience for everyone." +"For this training, we will mostly explore the Rust language through examples " +"which can be executed through your browser. This makes the setup much easier " +"and 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" -"work with dependencies and for that you need Cargo." +"Installing Cargo is still encouraged: it will make it easier for you to do " +"the exercises. On the last day, we will do a larger exercise which shows you " +"how to work with dependencies and for that you need Cargo." msgstr "" #: src/cargo/code-samples.md:11 @@ -1765,38 +1793,43 @@ msgid "" msgstr "" #: src/cargo/code-samples.md:19 -msgid "" -"You can use Ctrl + Enter to execute the code when focus is in the\n" -"text box." +msgid "You can use " +msgstr "" + +#: src/cargo/code-samples.md:19 +msgid " to execute the code when focus is in the text box." msgstr "" #: src/cargo/code-samples.md:24 msgid "" -"Most code samples are editable like shown above. A few code samples\n" -"are not editable for various reasons:" +"Most code samples are editable like shown above. A few code samples are not " +"editable for various reasons:" msgstr "" #: src/cargo/code-samples.md:27 msgid "" -"* The embedded playgrounds cannot execute unit tests. Copy-paste the\n" -" code and open it in the real Playground to demonstrate unit tests.\n" -"\n" -"* The embedded playgrounds lose their state the moment you navigate\n" -" away from the page! This is the reason that the students should\n" -" solve the exercises using a local Rust installation or via the\n" -" Playground." +"The embedded playgrounds cannot execute unit tests. Copy-paste the code and " +"open it in the real Playground to demonstrate unit tests." +msgstr "" + +#: src/cargo/code-samples.md:30 +msgid "" +"The embedded playgrounds lose their state the moment you navigate away from " +"the page! This is the reason that the students should solve the exercises " +"using a local Rust installation or via the Playground." msgstr "" #: src/cargo/running-locally.md:1 -msgid "# Running Code Locally with Cargo" +msgid "Running Code Locally with Cargo" 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" -"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" -"writing, the latest stable Rust release has these version numbers:" +"If you want to experiment with the code on your own system, then you will " +"need to first install Rust. Do this by following the [instructions in the " +"Rust Book](https://doc.rust-lang.org/book/ch01-01-installation.html). This " +"should give you a working `rustc` and `cargo`. At the time of writing, the " +"latest stable Rust release has these version numbers:" msgstr "" #: src/cargo/running-locally.md:8 @@ -1811,284 +1844,405 @@ msgstr "" #: src/cargo/running-locally.md:15 msgid "" -"With this in place, follow these steps to build a Rust binary from one\n" -"of the examples in this training:" +"With this in place, follow these steps to build a Rust binary from one of " +"the examples in this training:" msgstr "" #: src/cargo/running-locally.md:18 -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" -"\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" -"\n" -" ```shell\n" -" $ cd exercise\n" -" $ cargo run\n" -" Compiling exercise v0.1.0 (/home/mgeisler/tmp/exercise)\n" -" Finished dev [unoptimized + debuginfo] target(s) in 0.75s\n" -" Running `target/debug/exercise`\n" -" Hello, world!\n" -" ```\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" -"\n" -" ```rust\n" -" fn main() {\n" -" println!(\"Edit me!\");\n" -" }\n" -" ```\n" -"\n" -"5. Use `cargo run` to build and run your updated binary:\n" -"\n" -" ```shell\n" -" $ cargo run\n" -" Compiling exercise v0.1.0 (/home/mgeisler/tmp/exercise)\n" -" Finished dev [unoptimized + debuginfo] target(s) in 0.24s\n" -" Running `target/debug/exercise`\n" -" 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" -" release build in `target/release/`.\n" -"\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." +msgid "Click the \"Copy to clipboard\" button on the example you want to copy." msgstr "" -#: src/cargo/running-locally.md:70 +#: src/cargo/running-locally.md:20 msgid "" -"Try to encourage the class participants to install Cargo and use a\n" -"local editor. It will make their life easier since they will have a\n" -"normal development environment." +"Use `cargo new exercise` to create a new `exercise/` directory for your code:" msgstr "" -#: src/welcome-day-1.md:1 -msgid "# Welcome to Day 1" +#: src/cargo/running-locally.md:22 +msgid "" +"```shell\n" +"$ cargo new exercise\n" +" Created binary (application) `exercise` package\n" +"```" msgstr "" -#: src/welcome-day-1.md:3 +#: src/cargo/running-locally.md:27 msgid "" -"This is the first day of Rust Fundamentals. We will cover a lot of ground\n" -"today:" +"Navigate into `exercise/` and use `cargo run` to build and run your binary:" msgstr "" -#: src/welcome-day-1.md:6 +#: src/cargo/running-locally.md:29 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" -" management, and garbage collection.\n" -"\n" -"* Ownership: move semantics, copying and cloning, borrowing, and lifetimes." +"```shell\n" +"$ cd exercise\n" +"$ cargo run\n" +" Compiling exercise v0.1.0 (/home/mgeisler/tmp/exercise)\n" +" Finished dev [unoptimized + debuginfo] target(s) in 0.75s\n" +" Running `target/debug/exercise`\n" +"Hello, world!\n" +"```" msgstr "" -#: src/welcome-day-1.md:16 -msgid "Please remind the students that:" +#: src/cargo/running-locally.md:38 +msgid "" +"Replace the boiler-plate code in `src/main.rs` with your own code. For " +"example, using the example on the previous page, make `src/main.rs` look like" msgstr "" -#: src/welcome-day-1.md:18 +#: src/cargo/running-locally.md:41 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 discussions related to how Rust does things vs some other language. \n" -" It can be hard to find the right balance, but err on the side of allowing \n" -" discussions 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" -" that the slides are just a support and you are free to skip them as you\n" -" like." +"```rust\n" +"fn main() {\n" +" println!(\"Edit me!\");\n" +"}\n" +"```" msgstr "" -#: src/welcome-day-1.md:29 +#: src/cargo/running-locally.md:47 +msgid "Use `cargo run` to build and run your updated binary:" +msgstr "" + +#: src/cargo/running-locally.md:49 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" -"and we should show students this right away." +"```shell\n" +"$ cargo run\n" +" Compiling exercise v0.1.0 (/home/mgeisler/tmp/exercise)\n" +" Finished dev [unoptimized + debuginfo] target(s) in 0.24s\n" +" Running `target/debug/exercise`\n" +"Edit me!\n" +"```" msgstr "" -#: src/welcome-day-1.md:33 +#: src/cargo/running-locally.md:57 msgid "" -"If you're teaching this in a classroom, this is a good place to go over the\n" -"schedule. We suggest splitting the day into two parts (following the slides):" +"Use `cargo check` to quickly check your project for errors, use `cargo " +"build` to compile it without running it. You will find the output in `target/" +"debug/` for a normal debug build. Use `cargo build --release` to produce an " +"optimized release build in `target/release/`." msgstr "" -#: src/welcome-day-1.md:36 +#: src/cargo/running-locally.md:62 msgid "" -"* Morning: 9:00 to 12:00,\n" -"* Afternoon: 13:00 to 16:00." +"You can add dependencies for your project by editing `Cargo.toml`. When you " +"run `cargo` commands, it will automatically download and compile missing " +"dependencies for you." msgstr "" -#: src/welcome-day-1.md:39 +#: src/cargo/running-locally.md:70 msgid "" -"You can of course adjust this as necessary. Please make sure to include breaks,\n" -"we recommend a break every hour!" +"Try to encourage the class participants to install Cargo and use a local " +"editor. It will make their life easier since they will have a normal " +"development environment." msgstr "" -#: src/welcome-day-1/what-is-rust.md:1 -msgid "# What is Rust?" +#: src/welcome-day-1.md:1 +msgid "Welcome to Day 1" 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]:" +#: src/welcome-day-1.md:3 +msgid "" +"This is the first day of Rust Fundamentals. We will cover a lot of ground " +"today:" msgstr "" -#: src/welcome-day-1/what-is-rust.md:5 +#: src/welcome-day-1.md:6 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" -" * x86, ARM, WebAssembly, ...\n" -" * Linux, Mac, Windows, ...\n" -"* Rust is used for a wide range of devices:\n" -" * firmware and boot loaders,\n" -" * smart displays,\n" -" * mobile phones,\n" -" * desktops,\n" -" * servers." +"Basic Rust syntax: variables, scalar and compound types, enums, structs, " +"references, functions, and methods." msgstr "" -#: src/welcome-day-1/what-is-rust.md:21 -msgid "Rust fits in the same area as C++:" +#: src/welcome-day-1.md:9 +msgid "" +"Memory management: stack vs heap, manual memory management, scope-based " +"memory management, and garbage collection." msgstr "" -#: src/welcome-day-1/what-is-rust.md:23 +#: src/welcome-day-1.md:12 msgid "" -"* High flexibility.\n" -"* High level of control.\n" -"* Can be scaled down to very constrained devices such as microcontrollers.\n" -"* Has no runtime or garbage collection.\n" -"* Focuses on reliability and safety without sacrificing performance." +"Ownership: move semantics, copying and cloning, borrowing, and lifetimes." msgstr "" -#: src/hello-world.md:1 -msgid "# Hello World!" +#: src/welcome-day-1.md:16 +msgid "Please remind the students that:" msgstr "" -#: src/hello-world.md:3 +#: src/welcome-day-1.md:18 msgid "" -"Let us jump into the simplest possible Rust program, a classic Hello World\n" -"program:" +"They should ask questions when they get them, don't save them to the end." msgstr "" -#: src/hello-world.md:6 +#: src/welcome-day-1.md:19 msgid "" -"```rust,editable\n" -"fn main() {\n" -" println!(\"Hello 🌍!\");\n" -"}\n" -"```" +"The class is meant to be interactive and discussions are very much " +"encouraged!" msgstr "" -#: src/hello-world.md:12 -msgid "What you see:" +#: src/welcome-day-1.md:20 +msgid "" +"As an instructor, you should try to keep the discussions relevant, i.e., " +"keep the discussions related to how Rust does things vs some other " +"language. It can be hard to find the right balance, but err on the side of " +"allowing discussions since they engage people much more than one-way " +"communication." msgstr "" -#: src/hello-world.md:14 +#: src/welcome-day-1.md:24 msgid "" -"* Functions are introduced with `fn`.\n" -"* Blocks are delimited by curly braces like in C and C++.\n" -"* The `main` function is the entry point of the program.\n" -"* Rust has hygienic macros, `println!` is an example of this.\n" -"* Rust strings are UTF-8 encoded and can contain any Unicode character." +"The questions will likely mean that we talk about things ahead of the slides." msgstr "" -#: src/hello-world.md:22 +#: src/welcome-day-1.md:25 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 is perfectly okay! Repetition is an important part of learning. " +"Remember that the slides are just a support and you are free to skip them as " +"you like." msgstr "" -#: src/hello-world.md:27 +#: src/welcome-day-1.md:29 msgid "" -"* Rust is very much like other languages in the C/C++/Java tradition. It is\n" -" imperative and it doesn't try to reinvent things unless\n" -" absolutely necessary.\n" -"\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" -"\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 hygienic](https://veykril.github.io/tlborm/decl-macros/minutiae/hygiene.html).\n" -"\n" -"* Rust is multi-paradigm. For example, it has powerful [object-oriented programming features](https://" -"doc.rust-lang.org/book/ch17-00-oop.html),\n" -" and, while it is not a functional language, it includes a range of [functional concepts](https://" -"doc.rust-lang.org/book/ch13-00-functional-features.html)." +"The idea for the first day is to show _just enough_ of Rust to be able to " +"speak about the famous borrow checker. The way Rust handles memory is a " +"major feature and we should show students this right away." msgstr "" -#: src/hello-world/small-example.md:1 -msgid "# Small Example" +#: src/welcome-day-1.md:33 +msgid "" +"If you're teaching this in a classroom, this is a good place to go over the " +"schedule. We suggest splitting the day into two parts (following the slides):" msgstr "" -#: src/hello-world/small-example.md:3 -msgid "Here is a small example program in Rust:" +#: src/welcome-day-1.md:36 +msgid "Morning: 9:00 to 12:00," msgstr "" -#: src/hello-world/small-example.md:5 -msgid "" -"```rust,editable\n" -"fn main() { // Program entry point\n" -" let mut x: i32 = 6; // Mutable variable binding\n" -" print!(\"{x}\"); // Macro for printing, like printf\n" -" while x != 1 { // No parenthesis around expression\n" -" if x % 2 == 0 { // Math like in other languages\n" -" x = x / 2;\n" -" } else {\n" -" x = 3 * x + 1;\n" -" }\n" -" print!(\" -> {x}\");\n" -" }\n" -" println!();\n" -"}\n" -"```" +#: src/welcome-day-1.md:37 +msgid "Afternoon: 13:00 to 16:00." msgstr "" -#: src/hello-world/small-example.md:23 +#: src/welcome-day-1.md:39 +msgid "" +"You can of course adjust this as necessary. Please make sure to include " +"breaks, we recommend a break every hour!" +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]" +"(https://blog.rust-lang.org/2015/05/15/Rust-1.0.html):" +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:5 +msgid "Rust is a statically compiled language in a similar role as C++" +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:6 +msgid "`rustc` uses LLVM as its backend." +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:7 +msgid "" +"Rust supports many [platforms and architectures](https://doc.rust-lang.org/" +"nightly/rustc/platform-support.html):" +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:9 +msgid "x86, ARM, WebAssembly, ..." +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:10 +msgid "Linux, Mac, Windows, ..." +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:11 +msgid "Rust is used for a wide range of devices:" +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:12 +msgid "firmware and boot loaders," +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:13 +msgid "smart displays," +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:14 +msgid "mobile phones," +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:15 +msgid "desktops," +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:16 +msgid "servers." +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:21 +msgid "Rust fits in the same area as C++:" +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:23 +msgid "High flexibility." +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:24 +msgid "High level of control." +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:25 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" -"inputs." +"Can be scaled down to very constrained devices such as microcontrollers." +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:26 +msgid "Has no runtime or garbage collection." +msgstr "" + +#: src/welcome-day-1/what-is-rust.md:27 +msgid "Focuses on reliability and safety without sacrificing performance." +msgstr "" + +#: src/hello-world.md:3 +msgid "" +"Let us jump into the simplest possible Rust program, a classic Hello World " +"program:" +msgstr "" + +#: src/hello-world.md:6 +msgid "" +"```rust,editable\n" +"fn main() {\n" +" println!(\"Hello 🌍!\");\n" +"}\n" +"```" +msgstr "" + +#: src/hello-world.md:12 +msgid "What you see:" +msgstr "" + +#: src/hello-world.md:14 +msgid "Functions are introduced with `fn`." +msgstr "" + +#: src/hello-world.md:15 +msgid "Blocks are delimited by curly braces like in C and C++." +msgstr "" + +#: src/hello-world.md:16 +msgid "The `main` function is the entry point of the program." +msgstr "" + +#: src/hello-world.md:17 +msgid "Rust has hygienic macros, `println!` is an example of this." +msgstr "" + +#: src/hello-world.md:18 +msgid "Rust strings are UTF-8 encoded and can contain any Unicode character." +msgstr "" + +#: src/hello-world.md:22 +msgid "" +"This slide tries to make the students comfortable with Rust code. They will " +"see a ton of it over the next four days so we start small with something " +"familiar." +msgstr "" + +#: src/hello-world.md:27 +msgid "" +"Rust is very much like other languages in the C/C++/Java tradition. It is " +"imperative and it doesn't try to reinvent things unless absolutely necessary." +msgstr "" + +#: src/hello-world.md:31 +msgid "Rust is modern with full support for things like Unicode." +msgstr "" + +#: src/hello-world.md:33 +msgid "" +"Rust uses macros for situations where you want to have a variable number of " +"arguments (no function [overloading](basic-syntax/functions-interlude.md))." +msgstr "" + +#: src/hello-world.md:36 +msgid "" +"Macros being 'hygienic' means they don't accidentally capture identifiers " +"from the scope they are used in. Rust macros are actually only [partially " +"hygienic](https://veykril.github.io/tlborm/decl-macros/minutiae/hygiene." +"html)." +msgstr "" + +#: src/hello-world.md:40 +msgid "" +"Rust is multi-paradigm. For example, it has powerful [object-oriented " +"programming features](https://doc.rust-lang.org/book/ch17-00-oop.html), and, " +"while it is not a functional language, it includes a range of [functional " +"concepts](https://doc.rust-lang.org/book/ch13-00-functional-features.html)." +msgstr "" + +#: src/hello-world/small-example.md:3 +msgid "Here is a small example program in Rust:" +msgstr "" + +#: src/hello-world/small-example.md:5 +msgid "" +"```rust,editable\n" +"fn main() { // Program entry point\n" +" let mut x: i32 = 6; // Mutable variable binding\n" +" print!(\"{x}\"); // Macro for printing, like printf\n" +" while x != 1 { // No parenthesis around expression\n" +" if x % 2 == 0 { // Math like in other languages\n" +" x = x / 2;\n" +" } else {\n" +" x = 3 * x + 1;\n" +" }\n" +" print!(\" -> {x}\");\n" +" }\n" +" println!();\n" +"}\n" +"```" +msgstr "" + +#: src/hello-world/small-example.md:23 +msgid "" +"The code implements the Collatz conjecture: it is believed that the loop " +"will always end, but this is not yet proved. Edit the code and play with " +"different 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" -"\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" -" 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" -" students become familiar with searching in the standard library.\n" -" \n" -" * In a shell `rustup doc std::fmt` will open a browser on the local std::fmt documentation" +"Explain that all variables are statically typed. Try removing `i32` to " +"trigger type inference. Try with `i8` instead and trigger a runtime integer " +"overflow." +msgstr "" + +#: src/hello-world/small-example.md:32 +msgid "Change `let mut x` to `let x`, discuss the compiler error." +msgstr "" + +#: src/hello-world/small-example.md:34 +msgid "" +"Show how `print!` gives a compilation error if the arguments don't match the " +"format string." +msgstr "" + +#: src/hello-world/small-example.md:37 +msgid "" +"Show how you need to use `{}` as a placeholder if you want to print an " +"expression which is more complex than just a single variable." +msgstr "" + +#: src/hello-world/small-example.md:40 +msgid "" +"Show the students the standard library, show them how to search for `std::" +"fmt` which has the rules of the formatting mini-language. It's important " +"that the students become familiar with searching in the standard library." msgstr "" -#: src/why-rust.md:1 -msgid "# Why Rust?" +#: src/hello-world/small-example.md:44 +msgid "" +"In a shell `rustup doc std::fmt` will open a browser on the local std::fmt " +"documentation" msgstr "" #: src/why-rust.md:3 @@ -2096,33 +2250,37 @@ msgid "Some unique selling points of Rust:" msgstr "" #: src/why-rust.md:5 -msgid "" -"* Compile time memory safety.\n" -"* Lack of undefined runtime behavior.\n" -"* Modern language features." +msgid "Compile time memory safety." +msgstr "" + +#: src/why-rust.md:6 +msgid "Lack of undefined runtime behavior." +msgstr "" + +#: src/why-rust.md:7 +msgid "Modern language features." msgstr "" #: src/why-rust.md:11 msgid "" -"Make sure to ask the class which languages they have experience with. Depending\n" -"on the answer you can highlight different features of Rust:" +"Make sure to ask the class which languages they have experience with. " +"Depending 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" -" 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" -" as well as access to low-level hardware (should you need it)" +"Experience with C or C++: Rust eliminates a whole class of _runtime errors_ " +"via the borrow checker. You get performance like in C and C++, but you don't " +"have the memory unsafety issues. In addition, you get a modern language with " +"constructs like pattern matching and built-in dependency management." msgstr "" -#: src/why-rust/compile-time.md:1 -msgid "# Compile Time Guarantees" +#: src/why-rust.md:19 +msgid "" +"Experience with Java, Go, Python, JavaScript...: You get the same memory " +"safety as in those languages, plus a similar high-level language feeling. In " +"addition you get fast and predictable performance like C and C++ (no garbage " +"collector) as well as access to low-level hardware (should you need it)" msgstr "" #: src/why-rust/compile-time.md:3 @@ -2130,43 +2288,72 @@ msgid "Static memory management at compile time:" msgstr "" #: src/why-rust/compile-time.md:5 -msgid "" -"* No uninitialized variables.\n" -"* No memory leaks (_mostly_, see notes).\n" -"* No double-frees.\n" -"* No use-after-free.\n" -"* No `NULL` pointers.\n" -"* No forgotten locked mutexes.\n" -"* No data races between threads.\n" -"* No iterator invalidation." +msgid "No uninitialized variables." +msgstr "" + +#: src/why-rust/compile-time.md:6 +msgid "No memory leaks (_mostly_, see notes)." +msgstr "" + +#: src/why-rust/compile-time.md:7 +msgid "No double-frees." +msgstr "" + +#: src/why-rust/compile-time.md:8 +msgid "No use-after-free." +msgstr "" + +#: src/why-rust/compile-time.md:9 +msgid "No `NULL` pointers." +msgstr "" + +#: src/why-rust/compile-time.md:10 +msgid "No forgotten locked mutexes." +msgstr "" + +#: src/why-rust/compile-time.md:11 +msgid "No data races between threads." +msgstr "" + +#: src/why-rust/compile-time.md:12 +msgid "No iterator invalidation." msgstr "" #: src/why-rust/compile-time.md:16 msgid "" -"It is possible to produce memory leaks in (safe) Rust. Some examples\n" -"are:" +"It is possible to produce memory leaks in (safe) Rust. Some examples are:" msgstr "" #: src/why-rust/compile-time.md:19 msgid "" -"* You can use [`Box::leak`] to leak a pointer. A use of this could\n" -" be to get runtime-initialized and runtime-sized static variables\n" -"* You can use [`std::mem::forget`] to make the compiler \"forget\" about\n" -" a value (meaning the destructor is never run).\n" -"* You can also accidentally create a [reference cycle] with `Rc` or\n" -" `Arc`.\n" -"* In fact, some will consider infinitely populating a collection a memory\n" -" leak and Rust does not protect from those." +"You can use [`Box::leak`](https://doc.rust-lang.org/std/boxed/struct.Box." +"html#method.leak) to leak a pointer. A use of this could be to get runtime-" +"initialized and runtime-sized static variables" msgstr "" -#: src/why-rust/compile-time.md:28 +#: src/why-rust/compile-time.md:21 msgid "" -"For the purpose of this course, \"No memory leaks\" should be understood\n" -"as \"Pretty much no *accidental* memory leaks\"." +"You can use [`std::mem::forget`](https://doc.rust-lang.org/std/mem/fn.forget." +"html) to make the compiler \"forget\" about a value (meaning the destructor " +"is never run)." msgstr "" -#: src/why-rust/runtime.md:1 -msgid "# Runtime Guarantees" +#: src/why-rust/compile-time.md:23 +msgid "" +"You can also accidentally create a [reference cycle](https://doc.rust-lang." +"org/book/ch15-06-reference-cycles.html) with `Rc` or `Arc`." +msgstr "" + +#: src/why-rust/compile-time.md:25 +msgid "" +"In fact, some will consider infinitely populating a collection a memory leak " +"and Rust does not protect from those." +msgstr "" + +#: src/why-rust/compile-time.md:28 +msgid "" +"For the purpose of this course, \"No memory leaks\" should be understood as " +"\"Pretty much no _accidental_ memory leaks\"." msgstr "" #: src/why-rust/runtime.md:3 @@ -2174,28 +2361,29 @@ msgid "No undefined behavior at runtime:" msgstr "" #: src/why-rust/runtime.md:5 -msgid "" -"* Array access is bounds checked.\n" -"* Integer overflow is defined (panic or wrap-around)." +msgid "Array access is bounds checked." +msgstr "" + +#: src/why-rust/runtime.md:6 +msgid "Integer overflow is defined (panic or wrap-around)." msgstr "" #: src/why-rust/runtime.md:12 msgid "" -"* Integer overflow is defined via the [`overflow-checks`](https://doc.rust-lang.org/rustc/codegen-" -"options/index.html#overflow-checks)\n" -" compile-time flag. If enabled, the program will panic (a controlled\n" -" crash of the program), otherwise you get wrap-around\n" -" semantics. By default, you get panics in debug mode (`cargo build`)\n" -" and wrap-around in release mode (`cargo build --release`).\n" -"\n" -"* Bounds checking cannot be disabled with a compiler flag. It can also\n" -" not be disabled directly with the `unsafe` keyword. However,\n" -" `unsafe` allows you to call functions such as `slice::get_unchecked`\n" -" which does not do bounds checking." +"Integer overflow is defined via the [`overflow-checks`](https://doc.rust-" +"lang.org/rustc/codegen-options/index.html#overflow-checks) compile-time " +"flag. If enabled, the program will panic (a controlled crash of the " +"program), otherwise you get wrap-around semantics. By default, you get " +"panics in debug mode (`cargo build`) and wrap-around in release mode (`cargo " +"build --release`)." msgstr "" -#: src/why-rust/modern.md:1 -msgid "# Modern Features" +#: src/why-rust/runtime.md:18 +msgid "" +"Bounds checking cannot be disabled with a compiler flag. It can also not be " +"disabled directly with the `unsafe` keyword. However, `unsafe` allows you to " +"call functions such as `slice::get_unchecked` which does not do bounds " +"checking." msgstr "" #: src/why-rust/modern.md:3 @@ -2203,72 +2391,113 @@ msgid "Rust is built with all the experience gained in the last decades." msgstr "" #: src/why-rust/modern.md:5 -msgid "## Language Features" +msgid "Language Features" msgstr "" #: src/why-rust/modern.md:7 -msgid "" -"* Enums and pattern matching.\n" -"* Generics.\n" -"* No overhead FFI.\n" -"* Zero-cost abstractions." +msgid "Enums and pattern matching." +msgstr "" + +#: src/why-rust/modern.md:8 +msgid "Generics." +msgstr "" + +#: src/why-rust/modern.md:9 +msgid "No overhead FFI." +msgstr "" + +#: src/why-rust/modern.md:10 +msgid "Zero-cost abstractions." msgstr "" #: src/why-rust/modern.md:12 -msgid "## Tooling" +msgid "Tooling" msgstr "" #: src/why-rust/modern.md:14 -msgid "" -"* Great compiler errors.\n" -"* Built-in dependency manager.\n" -"* Built-in support for testing.\n" -"* Excellent Language Server Protocol support." +msgid "Great compiler errors." +msgstr "" + +#: src/why-rust/modern.md:15 +msgid "Built-in dependency manager." +msgstr "" + +#: src/why-rust/modern.md:16 +msgid "Built-in support for testing." +msgstr "" + +#: src/why-rust/modern.md:17 +msgid "Excellent Language Server Protocol support." msgstr "" #: src/why-rust/modern.md:23 msgid "" -"* 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" -" 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" -" 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" -" 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" -" 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" -" 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" -" 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" -" crates to find a good and trusted one.\n" -" \n" -"* [rust-analyzer] is a well supported LSP implementation used in major\n" -" IDEs and text editors." +"Zero-cost abstractions, similar to C++, means that you don't have to 'pay' " +"for higher-level programming constructs with memory or CPU. For example, " +"writing a loop using `for` should result in roughly the same low level " +"instructions as using the `.iter().fold()` construct." +msgstr "" + +#: src/why-rust/modern.md:28 +msgid "" +"It may be worth mentioning that Rust enums are 'Algebraic Data Types', also " +"known as 'sum types', which allow the type system to express things like " +"`Option` and `Result`." msgstr "" -#: src/basic-syntax.md:1 -msgid "# Basic Syntax" +#: src/why-rust/modern.md:32 +msgid "" +"Remind people to read the errors --- many developers have gotten used to " +"ignore lengthy compiler output. The Rust compiler is significantly more " +"talkative than other compilers. It will often provide you with _actionable_ " +"feedback, ready to copy-paste into your code." +msgstr "" + +#: src/why-rust/modern.md:37 +msgid "" +"The Rust standard library is small compared to languages like Java, Python, " +"and Go. Rust does not come with several things you might consider standard " +"and essential:" +msgstr "" + +#: src/why-rust/modern.md:41 +msgid "a random number generator, but see [rand](https://docs.rs/rand/)." +msgstr "" + +#: src/why-rust/modern.md:42 +msgid "support for SSL or TLS, but see [rusttls](https://docs.rs/rustls/)." +msgstr "" + +#: src/why-rust/modern.md:43 +msgid "support for JSON, but see [serde_json](https://docs.rs/serde_json/)." +msgstr "" + +#: src/why-rust/modern.md:45 +msgid "" +"The reasoning behind this is that functionality in the standard library " +"cannot go away, so it has to be very stable. For the examples above, the " +"Rust community is still working on finding the best solution --- and perhaps " +"there isn't a single \"best solution\" for some of these things." +msgstr "" + +#: src/why-rust/modern.md:50 +msgid "" +"Rust comes with a built-in package manager in the form of Cargo and this " +"makes it trivial to download and compile third-party crates. A consequence " +"of this is that the standard library can be smaller." +msgstr "" + +#: src/why-rust/modern.md:54 +msgid "" +"Discovering good third-party crates can be a problem. Sites like help with this by letting you compare health metrics for crates to " +"find a good and trusted one." +msgstr "" + +#: src/why-rust/modern.md:58 +msgid "" +"[rust-analyzer](https://rust-analyzer.github.io/) is a well supported LSP " +"implementation used in major IDEs and text editors." msgstr "" #: src/basic-syntax.md:3 @@ -2276,35 +2505,102 @@ msgid "Much of the Rust syntax will be familiar to you from C, C++ or Java:" msgstr "" #: src/basic-syntax.md:5 +msgid "Blocks and scopes are delimited by curly braces." +msgstr "" + +#: src/basic-syntax.md:6 msgid "" -"* Blocks and scopes are delimited by curly braces.\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 `==`." +"Line comments are started with `//`, block comments are delimited by `/* ... " +"*/`." msgstr "" -#: src/basic-syntax/scalar-types.md:1 -msgid "# Scalar Types" +#: src/basic-syntax.md:8 +msgid "Keywords like `if` and `while` work the same." msgstr "" -#: src/basic-syntax/scalar-types.md:3 -msgid "" -"| | Types | " -"Literals |\n" -"|------------------------|--------------------------------------------|--------------------------------|\n" -"| Signed integers | `i8`, `i16`, `i32`, `i64`, `i128`, `isize` | `-10`, `0`, `1_000`, " -"`123_i64` |\n" -"| Unsigned integers | `u8`, `u16`, `u32`, `u64`, `u128`, `usize` | `0`, `123`, " -"`10_u16` |\n" -"| Floating point numbers | `f32`, `f64` | `3.14`, `-10.0e20`, " -"`2_f32` |\n" -"| Strings | `&str` | `\"foo\"`, `\"two\\nlines" -"\"` |\n" -"| Unicode scalar values | `char` | `'a'`, `'α'`, " -"`'∞'` |\n" -"| Booleans | `bool` | `true`, " -"`false` |" +#: src/basic-syntax.md:9 +msgid "Variable assignment is done with `=`, comparison is done with `==`." +msgstr "" + +#: src/basic-syntax/scalar-types.md:3 src/basic-syntax/compound-types.md:3 +#: src/exercises/day-3/safe-ffi-wrapper.md:16 +msgid "Types" +msgstr "" + +#: src/basic-syntax/scalar-types.md:3 src/basic-syntax/compound-types.md:3 +msgid "Literals" +msgstr "" + +#: src/basic-syntax/scalar-types.md:5 +msgid "Signed integers" +msgstr "" + +#: src/basic-syntax/scalar-types.md:5 +msgid "`i8`, `i16`, `i32`, `i64`, `i128`, `isize`" +msgstr "" + +#: src/basic-syntax/scalar-types.md:5 +msgid "`-10`, `0`, `1_000`, `123_i64`" +msgstr "" + +#: src/basic-syntax/scalar-types.md:6 +msgid "Unsigned integers" +msgstr "" + +#: src/basic-syntax/scalar-types.md:6 +msgid "`u8`, `u16`, `u32`, `u64`, `u128`, `usize`" +msgstr "" + +#: src/basic-syntax/scalar-types.md:6 +msgid "`0`, `123`, `10_u16`" +msgstr "" + +#: src/basic-syntax/scalar-types.md:7 +msgid "Floating point numbers" +msgstr "" + +#: src/basic-syntax/scalar-types.md:7 +msgid "`f32`, `f64`" +msgstr "" + +#: src/basic-syntax/scalar-types.md:7 +msgid "`3.14`, `-10.0e20`, `2_f32`" +msgstr "" + +#: src/basic-syntax/scalar-types.md:8 +msgid "Strings" +msgstr "" + +#: src/basic-syntax/scalar-types.md:8 +msgid "`&str`" +msgstr "" + +#: src/basic-syntax/scalar-types.md:8 +msgid "`\"foo\"`, `\"two\\nlines\"`" +msgstr "" + +#: src/basic-syntax/scalar-types.md:9 +msgid "Unicode scalar values" +msgstr "" + +#: src/basic-syntax/scalar-types.md:9 +msgid "`char`" +msgstr "" + +#: src/basic-syntax/scalar-types.md:9 +msgid "`'a'`, `'α'`, `'∞'`" +msgstr "" + +#: src/basic-syntax/scalar-types.md:10 +msgid "Booleans" +msgstr "" + +#: src/basic-syntax/scalar-types.md:10 +msgid "`bool`" +msgstr "" + +#: src/basic-syntax/scalar-types.md:10 +msgid "`true`, `false`" msgstr "" #: src/basic-syntax/scalar-types.md:12 @@ -2312,11 +2608,19 @@ msgid "The types have widths as follows:" msgstr "" #: src/basic-syntax/scalar-types.md:14 -msgid "" -"* `iN`, `uN`, and `fN` are _N_ bits wide,\n" -"* `isize` and `usize` are the width of a pointer,\n" -"* `char` is 32 bits wide,\n" -"* `bool` is 8 bits wide." +msgid "`iN`, `uN`, and `fN` are _N_ bits wide," +msgstr "" + +#: src/basic-syntax/scalar-types.md:15 +msgid "`isize` and `usize` are the width of a pointer," +msgstr "" + +#: src/basic-syntax/scalar-types.md:16 +msgid "`char` is 32 bits wide," +msgstr "" + +#: src/basic-syntax/scalar-types.md:17 +msgid "`bool` is 8 bits wide." msgstr "" #: src/basic-syntax/scalar-types.md:21 @@ -2325,40 +2629,64 @@ 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" -" either side of the quotes:\n" -"\n" -" ```rust,editable\n" -" fn main() {\n" -" println!(r#\"link\"#);\n" -" println!(\"link\");\n" -" }\n" -" ```\n" -"\n" -"- Byte strings allow you to create a `&[u8]` value directly:\n" -"\n" -" ```rust,editable\n" -" fn main() {\n" -" println!(\"{:?}\", b\"abc\");\n" -" println!(\"{:?}\", &[97, 98, 99]);\n" -" }\n" -" ```\n" -"\n" -"- All underscores in numbers can be left out, they are for legibility only.\n" -" So `1_000` can be written as `1000` (or `10_00`), and `123_i64` can be written as `123i64`." +"Raw strings allow you to create a `&str` value with escapes disabled: " +"`r\"\\n\" == \"\\\\n\"`. You can embed double-quotes by using an equal " +"amount of `#` on either side of the quotes:" msgstr "" -#: src/basic-syntax/compound-types.md:1 -msgid "# Compound Types" +#: src/basic-syntax/scalar-types.md:27 +msgid "" +"```rust,editable\n" +"fn main() {\n" +" println!(r#\"link\"#);\n" +" println!(\"link\");\n" +"}\n" +"```" +msgstr "" + +#: src/basic-syntax/scalar-types.md:34 +msgid "Byte strings allow you to create a `&[u8]` value directly:" msgstr "" -#: src/basic-syntax/compound-types.md:3 +#: src/basic-syntax/scalar-types.md:36 msgid "" -"| | Types | Literals |\n" -"|--------|-------------------------------|-----------------------------------|\n" -"| Arrays | `[T; N]` | `[20, 30, 40]`, `[0; 3]` |\n" -"| Tuples | `()`, `(T,)`, `(T1, T2)`, ... | `()`, `('x',)`, `('x', 1.2)`, ... |" +"```rust,editable\n" +"fn main() {\n" +" println!(\"{:?}\", b\"abc\");\n" +" println!(\"{:?}\", &[97, 98, 99]);\n" +"}\n" +"```" +msgstr "" + +#: src/basic-syntax/scalar-types.md:43 +msgid "" +"All underscores in numbers can be left out, they are for legibility only. So " +"`1_000` can be written as `1000` (or `10_00`), and `123_i64` can be written " +"as `123i64`." +msgstr "" + +#: src/basic-syntax/compound-types.md:5 +msgid "Arrays" +msgstr "" + +#: src/basic-syntax/compound-types.md:5 +msgid "`[T; N]`" +msgstr "" + +#: src/basic-syntax/compound-types.md:5 +msgid "`[20, 30, 40]`, `[0; 3]`" +msgstr "" + +#: src/basic-syntax/compound-types.md:6 +msgid "Tuples" +msgstr "" + +#: src/basic-syntax/compound-types.md:6 +msgid "`()`, `(T,)`, `(T1, T2)`, ..." +msgstr "" + +#: src/basic-syntax/compound-types.md:6 +msgid "`()`, `('x',)`, `('x', 1.2)`, ..." msgstr "" #: src/basic-syntax/compound-types.md:8 @@ -2397,19 +2725,28 @@ msgstr "" #: src/basic-syntax/compound-types.md:34 msgid "" -"* A value of the array type `[T; N]` holds `N` (a compile-time constant) elements of the same type " -"`T`.\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" -" format string.\n" -"\n" -"* Adding `#`, eg `{a:#?}`, invokes a \"pretty printing\" format, which can be easier to read." +"A value of the array type `[T; N]` holds `N` (a compile-time constant) " +"elements of the same type `T`. Note that the length of the array is _part of " +"its type_, which means that `[u8; 3]` and `[u8; 4]` are considered two " +"different types." +msgstr "" + +#: src/basic-syntax/compound-types.md:38 +msgid "We can use literals to assign values to arrays." +msgstr "" + +#: src/basic-syntax/compound-types.md:40 +msgid "" +"In the main function, the print statement asks for the debug implementation " +"with the `?` format parameter: `{}` gives the default output, `{:?}` gives " +"the debug output. We could also have used `{a}` and `{a:?}` without " +"specifying the value after the format string." +msgstr "" + +#: src/basic-syntax/compound-types.md:45 +msgid "" +"Adding `#`, eg `{a:#?}`, invokes a \"pretty printing\" format, which can be " +"easier to read." msgstr "" #: src/basic-syntax/compound-types.md:47 @@ -2417,23 +2754,31 @@ msgid "Tuples:" msgstr "" #: src/basic-syntax/compound-types.md:49 +msgid "Like arrays, tuples have a fixed length." +msgstr "" + +#: src/basic-syntax/compound-types.md:51 +msgid "Tuples group together values of different types into a compound type." +msgstr "" + +#: src/basic-syntax/compound-types.md:53 msgid "" -"* Like arrays, tuples have a fixed length.\n" -"\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" -"\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." +"Fields of a tuple can be accessed by the period and the index of the value, " +"e.g. `t.0`, `t.1`." msgstr "" -#: src/basic-syntax/references.md:1 -msgid "# References" +#: src/basic-syntax/compound-types.md:55 +msgid "" +"The empty tuple `()` is also known as the \"unit type\". It is both a type, " +"and the only valid value of that type - that is to say both the type and its " +"value are expressed as `()`. It is used to indicate, for example, that a " +"function or expression has no return value, as we'll see in a future slide. " +msgstr "" + +#: src/basic-syntax/compound-types.md:59 +msgid "" +"You can think of it as `void` that can be familiar to you from other " +"programming languages." msgstr "" #: src/basic-syntax/references.md:3 @@ -2458,21 +2803,28 @@ msgstr "" #: src/basic-syntax/references.md:16 msgid "" -"* 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." +"We must dereference `ref_x` when assigning to it, similar to C and C++ " +"pointers." msgstr "" -#: src/basic-syntax/references.md:25 +#: src/basic-syntax/references.md:17 +msgid "" +"Rust will auto-dereference in some cases, in particular when invoking " +"methods (try `ref_x.count_ones()`)." +msgstr "" + +#: src/basic-syntax/references.md:19 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." +"References that are declared as `mut` can be bound to different values over " +"their lifetime." msgstr "" -#: src/basic-syntax/references-dangling.md:1 -msgid "# Dangling References" +#: src/basic-syntax/references.md:25 +msgid "" +"Be sure to note the difference between `let mut ref_x: &i32` and `let ref_x: " +"&mut i32`. The first one represents a mutable reference which can be bound " +"to different values, while the second represents a reference to a mutable " +"value." msgstr "" #: src/basic-syntax/references-dangling.md:3 @@ -2494,15 +2846,17 @@ msgid "" msgstr "" #: src/basic-syntax/references-dangling.md:16 +msgid "A reference is said to \"borrow\" the value it refers to." +msgstr "" + +#: src/basic-syntax/references-dangling.md:17 msgid "" -"* A reference is said to \"borrow\" the value it refers to.\n" -"* Rust is tracking the lifetimes of all references to ensure they live long\n" -" enough.\n" -"* We will talk more about borrowing when we get to ownership." +"Rust is tracking the lifetimes of all references to ensure they live long " +"enough." msgstr "" -#: src/basic-syntax/slices.md:1 -msgid "# Slices" +#: src/basic-syntax/references-dangling.md:19 +msgid "We will talk more about borrowing when we get to ownership." msgstr "" #: src/basic-syntax/slices.md:3 @@ -2524,38 +2878,62 @@ msgid "" msgstr "" #: src/basic-syntax/slices.md:16 -msgid "" -"* Slices borrow data from the sliced type.\n" -"* Question: What happens if you modify `a[3]` right before printing `s`?" +msgid "Slices borrow data from the sliced type." +msgstr "" + +#: src/basic-syntax/slices.md:17 +msgid "Question: What happens if you modify `a[3]` right before printing `s`?" msgstr "" #: src/basic-syntax/slices.md:21 msgid "" -"* 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" -" \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" -"\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" -" \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` at this point in the execution, but you can read the data from both " -"`a` and `s` safely.\n" -" It works before you created the slice, and again after the `println`, when the slice is no longer " -"used. More details will be explained in the borrow checker section." +"We create a slice by borrowing `a` and specifying the starting and ending " +"indexes in brackets." +msgstr "" + +#: src/basic-syntax/slices.md:23 +msgid "" +"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." +msgstr "" + +#: src/basic-syntax/slices.md:25 +msgid "" +"The same is true for the last index, so `&a[2..a.len()]` and `&a[2..]` are " +"identical." +msgstr "" + +#: src/basic-syntax/slices.md:27 +msgid "" +"To easily create a slice of the full array, we can therefore use `&a[..]`." +msgstr "" + +#: src/basic-syntax/slices.md:29 +msgid "" +"`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." +msgstr "" + +#: src/basic-syntax/slices.md:31 +msgid "" +"Slices always borrow from another object. In this example, `a` has to remain " +"'alive' (in scope) for at least as long as our slice. " +msgstr "" + +#: src/basic-syntax/slices.md:33 +msgid "" +"The question about modifying `a[3]` can spark an interesting discussion, but " +"the answer is that for memory safety reasons you cannot do it through `a` at " +"this point in the execution, but you can read the data from both `a` and `s` " +"safely. It works before you created the slice, and again after the " +"`println`, when the slice is no longer used. More details will be explained " +"in the borrow checker section." msgstr "" #: src/basic-syntax/string-slices.md:1 -msgid "# `String` vs `str`" +msgid "`String` vs `str`" msgstr "" #: src/basic-syntax/string-slices.md:3 @@ -2585,41 +2963,57 @@ msgid "Rust terminology:" msgstr "" #: src/basic-syntax/string-slices.md:22 -msgid "" -"* `&str` an immutable reference to a string slice.\n" -"* `String` a mutable string buffer." +msgid "`&str` an immutable reference to a string slice." +msgstr "" + +#: src/basic-syntax/string-slices.md:23 +msgid "`String` a mutable string buffer." 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" -"\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" -"\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" -" \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" -" " +"`&str` introduces a string slice, which is an immutable reference to UTF-8 " +"encoded string data stored in a block of memory. String literals " +"(`”Hello”`), are stored in the program’s binary." +msgstr "" + +#: src/basic-syntax/string-slices.md:30 +msgid "" +"Rust’s `String` type is a wrapper around a vector of bytes. As with a " +"`Vec`, it is owned." +msgstr "" + +#: src/basic-syntax/string-slices.md:32 +msgid "" +"As with many other types `String::from()` creates a string from a string " +"literal; `String::new()` creates a new empty string, to which string data " +"can be added using the `push()` and `push_str()` methods." +msgstr "" + +#: src/basic-syntax/string-slices.md:35 +msgid "" +"The `format!()` macro is a convenient way to generate an owned string from " +"dynamic values. It accepts the same format specification as `println!()`." +msgstr "" + +#: src/basic-syntax/string-slices.md:38 +msgid "" +"You can borrow `&str` slices from `String` via `&` and optionally range " +"selection." msgstr "" -#: src/basic-syntax/functions.md:1 -msgid "# Functions" +#: src/basic-syntax/string-slices.md:40 +msgid "" +"For C++ programmers: think of `&str` as `const char*` from C++, but the one " +"that always points to a valid string in memory. Rust `String` is a rough " +"equivalent of `std::string` from C++ (main difference: it can only contain " +"UTF-8 encoded bytes and will never use a small-string optimization)." 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 @@ -2655,72 +3049,93 @@ 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. " +msgstr "" + +#: src/basic-syntax/functions.md:36 +msgid "" +"Declaration parameters are followed by a type (the reverse of some " +"programming languages), then a return type." msgstr "" -#: src/basic-syntax/rustdoc.md:1 -msgid "# Rustdoc" +#: src/basic-syntax/functions.md:37 +msgid "" +"The last expression in a function body (or any block) becomes the return " +"value. Simply omit the `;` at the end of the expression." +msgstr "" + +#: src/basic-syntax/functions.md:38 +msgid "" +"Some functions have no return value, and return the 'unit type', `()`. The " +"compiler will infer this if the `-> ()` return type is omitted." +msgstr "" + +#: src/basic-syntax/functions.md:39 +msgid "" +"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: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 "" #: src/basic-syntax/rustdoc.md:17 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" +"The contents are treated as Markdown. All published Rust library crates are " +"automatically documented at [`docs.rs`](https://docs.rs) using the [rustdoc]" +"(https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html) tool. It is " "idiomatic to document all public items in an API using this pattern." msgstr "" #: src/basic-syntax/rustdoc.md:24 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" -" real code they should be present.\n" -"\n" -"* Inner doc comments are discussed later (in the page on modules) and need not\n" -" be addressed here.\n" -"\n" -"* Rustdoc comments can contain code snippets that we can run and test using `cargo test`.\n" -" We will discuss these tests in the [Testing section](../testing/doc-tests.html)." +"Show students the generated docs for the `rand` crate at [`docs.rs/rand`]" +"(https://docs.rs/rand)." msgstr "" -#: src/basic-syntax/methods.md:1 src/methods.md:1 -msgid "# Methods" +#: src/basic-syntax/rustdoc.md:27 +msgid "" +"This course does not include rustdoc on slides, just to save space, but in " +"real code they should be present." +msgstr "" + +#: src/basic-syntax/rustdoc.md:30 +msgid "" +"Inner doc comments are discussed later (in the page on modules) and need not " +"be addressed here." +msgstr "" + +#: src/basic-syntax/rustdoc.md:33 +msgid "" +"Rustdoc comments can contain code snippets that we can run and test using " +"`cargo test`. We will discuss these tests in the [Testing section](../" +"testing/doc-tests.html)." msgstr "" #: src/basic-syntax/methods.md:3 msgid "" -"Methods are functions associated with a type. The `self` argument of a method is\n" -"an instance of the type it is associated with:" +"Methods are functions associated with a type. The `self` argument of a " +"method is an instance of the type it is associated with:" msgstr "" #: src/basic-syntax/methods.md:6 @@ -2751,30 +3166,40 @@ 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 +msgid "Add a static method called `Rectangle::new` and call this from `main`:" +msgstr "" + +#: src/basic-syntax/methods.md:36 msgid "" -"- Add a static method called `Rectangle::new` and call this from `main`:\n" -"\n" -" ```rust,editable,compile_fail\n" -" fn new(width: u32, height: u32) -> Rectangle {\n" -" Rectangle { width, height }\n" -" }\n" -" ```\n" -"\n" -"- While _technically_, Rust does not have custom constructors, static methods are commonly used to " -"initialize structs (but don't have to).\n" -" The actual constructor, `Rectangle { width, height }`, could be called directly. See the " -"[Rustnomicon](https://doc.rust-lang.org/nomicon/constructors.html).\n" -"\n" -"- Add a `Rectangle::square(width: u32)` constructor to illustrate that such static methods can take " -"arbitrary parameters." +"```rust,editable,compile_fail\n" +"fn new(width: u32, height: u32) -> Rectangle {\n" +" Rectangle { width, height }\n" +"}\n" +"```" +msgstr "" + +#: src/basic-syntax/methods.md:42 +msgid "" +"While _technically_, Rust does not have custom constructors, static methods " +"are commonly used to initialize structs (but don't have to). The actual " +"constructor, `Rectangle { width, height }`, could be called directly. See " +"the [Rustnomicon](https://doc.rust-lang.org/nomicon/constructors.html)." +msgstr "" + +#: src/basic-syntax/methods.md:45 +msgid "" +"Add a `Rectangle::square(width: u32)` constructor to illustrate that such " +"static methods can take arbitrary parameters." msgstr "" #: src/basic-syntax/functions-interlude.md:1 -msgid "# Function Overloading" +msgid "Function Overloading" msgstr "" #: src/basic-syntax/functions-interlude.md:3 @@ -2782,13 +3207,27 @@ msgid "Overloading is not supported:" msgstr "" #: src/basic-syntax/functions-interlude.md:5 -msgid "" -"* Each function has a single implementation:\n" -" * Always takes a fixed number of parameters.\n" -" * Always takes a single set of parameter types.\n" -"* Default values are not supported:\n" -" * All call sites have the same number of arguments.\n" -" * Macros are sometimes used as an alternative." +msgid "Each function has a single implementation:" +msgstr "" + +#: src/basic-syntax/functions-interlude.md:6 +msgid "Always takes a fixed number of parameters." +msgstr "" + +#: src/basic-syntax/functions-interlude.md:7 +msgid "Always takes a single set of parameter types." +msgstr "" + +#: src/basic-syntax/functions-interlude.md:8 +msgid "Default values are not supported:" +msgstr "" + +#: src/basic-syntax/functions-interlude.md:9 +msgid "All call sites have the same number of arguments." +msgstr "" + +#: src/basic-syntax/functions-interlude.md:10 +msgid "Macros are sometimes used as an alternative." msgstr "" #: src/basic-syntax/functions-interlude.md:12 @@ -2811,12 +3250,13 @@ 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 polymorphism on argument types. We will see more details in a later " +"section." msgstr "" #: src/exercises/day-1/morning.md:1 -msgid "# Day 1: Morning Exercises" +msgid "Day 1: Morning Exercises" msgstr "" #: src/exercises/day-1/morning.md:3 @@ -2824,10 +3264,11 @@ msgid "In these exercises, we will explore two parts of Rust:" msgstr "" #: src/exercises/day-1/morning.md:5 -msgid "" -"* Implicit conversions between types.\n" -"\n" -"* Arrays and `for` loops." +msgid "Implicit conversions between types." +msgstr "" + +#: src/exercises/day-1/morning.md:7 +msgid "Arrays and `for` loops." msgstr "" #: src/exercises/day-1/morning.md:11 @@ -2836,34 +3277,36 @@ 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" -" on installing Rust.\n" -"\n" -"* Alternatively, use the Rust Playground." +"Use a local Rust installation, if possible. This way you can get auto-" +"completion in your editor. See the page about [Using Cargo](../../cargo.md) " +"for details on installing Rust." +msgstr "" + +#: src/exercises/day-1/morning.md:17 +msgid "Alternatively, use the Rust Playground." 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 " "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/concurrency/afternoon.md:13 -msgid "After looking at the exercises, you can look at the [solutions] provided." -msgstr "" - -#: src/exercises/day-1/implicit-conversions.md:1 -msgid "# Implicit Conversions" +#: 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/concurrency/afternoon.md:13 +msgid "" +"After looking at the exercises, you can look at the \\[solutions\\] provided." msgstr "" #: src/exercises/day-1/implicit-conversions.md:3 msgid "" -"Rust will not automatically apply _implicit conversions_ between types ([unlike\n" -"C++][3]). You can see this in a program like this:" +"Rust will not automatically apply _implicit conversions_ between types " +"([unlike C++](https://en.cppreference.com/w/cpp/language/" +"implicit_conversion)). You can see this in a program like this:" msgstr "" #: src/exercises/day-1/implicit-conversions.md:6 @@ -2884,42 +3327,50 @@ 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" -"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" -"another type." +"The Rust integer types all implement the [`From`](https://doc.rust-lang." +"org/std/convert/trait.From.html) and [`Into`](https://doc.rust-lang.org/" +"std/convert/trait.Into.html) traits to let us convert between them. The " +"`From` trait has a single `from()` method and similarly, the `Into` " +"trait has a single `into()` method. Implementing these traits is how a type " +"expresses that it can be converted into 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" -"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`." +"The standard library has an implementation of `From for i16`, which " +"means that we can convert a variable `x` of type `i8` to an `i16` by " +"calling `i16::from(x)`. Or, simpler, with `x.into()`, because `From for " +"i16` implementation automatically create an implementation of `Into for " +"i8`." 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 sufficient to only implement `From` to get a respective `Into` " +"implementation automatically." msgstr "" #: src/exercises/day-1/implicit-conversions.md:33 +msgid "Execute the above program and look at the compiler error." +msgstr "" + +#: src/exercises/day-1/implicit-conversions.md:35 +msgid "Update the code above to use `into()` to do the conversion." +msgstr "" + +#: src/exercises/day-1/implicit-conversions.md:37 msgid "" -"1. Execute the above program and look at the compiler error.\n" -"\n" -"2. Update the code above to use `into()` to do the conversion.\n" -"\n" -"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" -" the pairs you check." +"Change the types of `x` and `y` to other things (such as `f32`, `bool`, " +"`i128`) to see which types you can convert to which other types. Try " +"converting small types to big types and the other way around. Check the " +"[standard library documentation](https://doc.rust-lang.org/std/convert/trait." +"From.html) to see if `From` is implemented for the pairs you check." msgstr "" #: src/exercises/day-1/for-loops.md:1 -msgid "# Arrays and `for` Loops" +#: src/exercises/day-1/solutions-morning.md:3 +msgid "Arrays and `for` Loops" msgstr "" #: src/exercises/day-1/for-loops.md:3 @@ -2934,7 +3385,9 @@ 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 @@ -2949,7 +3402,7 @@ msgstr "" #: src/exercises/day-1/for-loops.md:18 msgid "" -"Rust lets you iterate over things like arrays and ranges using the `for`\n" +"Rust lets you iterate over things like arrays and ranges using the `for` " "keyword:" msgstr "" @@ -2975,8 +3428,9 @@ 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 a function `transpose` which will transpose a matrix (turn rows into " +"columns):" msgstr "" #: src/exercises/day-1/for-loops.md:41 @@ -2994,7 +3448,7 @@ msgstr "" #: src/exercises/day-1/for-loops.md:49 msgid "" -"Copy the code below to and implement the\n" +"Copy the code below to and implement the " "functions:" msgstr "" @@ -3030,36 +3484,32 @@ msgid "" msgstr "" #: src/exercises/day-1/for-loops.md:80 -msgid "## Bonus Question" +msgid "Bonus Question" msgstr "" #: src/exercises/day-1/for-loops.md:82 msgid "" -"Could you use `&[i32]` slices instead of hard-coded 3 × 3 matrices for your\n" -"argument and return types? Something like `&[&[i32]]` for a two-dimensional\n" +"Could you use `&[i32]` slices instead of hard-coded 3 × 3 matrices for your " +"argument and return types? Something like `&[&[i32]]` for a two-dimensional " "slice-of-slices. Why or why not?" 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 " "implementation." msgstr "" #: src/exercises/day-1/for-loops.md:92 msgid "" -"The solution and the answer to the bonus section are available in the \n" +"The solution and the answer to the bonus section are available in the " "[Solution](solutions-morning.md#arrays-and-for-loops) section." msgstr "" -#: src/basic-syntax/variables.md:1 -msgid "# Variables" -msgstr "" - #: src/basic-syntax/variables.md:3 msgid "" -"Rust provides type safety via static typing. Variable bindings are immutable by\n" -"default:" +"Rust provides type safety via static typing. Variable bindings are immutable " +"by default:" msgstr "" #: src/basic-syntax/variables.md:6 @@ -3076,14 +3526,14 @@ 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." msgstr "" -#: src/basic-syntax/type-inference.md:1 -msgid "# Type Inference" +#: src/basic-syntax/variables.md:18 +msgid "" +"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:3 @@ -3114,23 +3564,24 @@ 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" -"The compiler does the job for us and helps us write more concise code." +"It is very important to emphasize that variables declared like this are not " +"of some sort of dynamic \"any type\" that can hold any data. The machine " +"code generated by such declaration is identical to the explicit declaration " +"of a type. 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 @@ -3150,30 +3601,32 @@ 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`](https://doc.rust-lang.org/std/iter/trait.FromIterator.html), which [`HashSet`]" -"(https://doc.rust-lang.org/std/collections/struct.HashSet.html#impl-FromIterator%3CT%3E-for-HashSet" -"%3CT,+S%3E) implements." +"[`collect`](https://doc.rust-lang.org/stable/std/iter/trait.Iterator." +"html#method.collect) relies on [`FromIterator`](https://doc.rust-lang.org/" +"std/iter/trait.FromIterator.html), which [`HashSet`](https://doc.rust-lang." +"org/std/collections/struct.HashSet.html#impl-FromIterator%3CT%3E-for-" +"HashSet%3CT,+S%3E) implements." msgstr "" #: src/basic-syntax/static-and-const.md:1 -msgid "# Static and Constant Variables" +msgid "Static and Constant Variables" msgstr "" #: src/basic-syntax/static-and-const.md:3 msgid "" -"Static and constant variables are two different ways to create globally-scoped values that\n" -"cannot be moved or reallocated during the execution of the program. " +"Static and constant variables are two different ways to create globally-" +"scoped values that cannot be moved or reallocated during the execution of " +"the program. " msgstr "" #: src/basic-syntax/static-and-const.md:6 -msgid "## `const`" +msgid "`const`" msgstr "" #: src/basic-syntax/static-and-const.md:8 msgid "" -"Constant variables are evaluated at compile time and their values are inlined\n" -"wherever they are used:" +"Constant variables are evaluated at compile time and their values are " +"inlined wherever they are used:" msgstr "" #: src/basic-syntax/static-and-const.md:11 @@ -3185,7 +3638,8 @@ 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" @@ -3198,22 +3652,25 @@ msgid "" msgstr "" #: src/basic-syntax/static-and-const.md:29 -msgid "According to the [Rust RFC Book][1] these are inlined upon use." +msgid "" +"According to the [Rust RFC Book](https://rust-lang.github.io/rfcs/0246-const-" +"vs-static.html) these are inlined upon use." msgstr "" #: src/basic-syntax/static-and-const.md:31 msgid "" -"Only functions marked `const` can be called at compile time to generate `const` values. `const` " -"functions can however be called at runtime." +"Only functions marked `const` can be called at compile time to generate " +"`const` values. `const` functions can however be called at runtime." msgstr "" #: src/basic-syntax/static-and-const.md:33 -msgid "## `static`" +msgid "`static`" msgstr "" #: src/basic-syntax/static-and-const.md:35 msgid "" -"Static variables will live during the whole execution of the program, and therefore will not move:" +"Static variables will live during the whole execution of the program, and " +"therefore will not move:" msgstr "" #: src/basic-syntax/static-and-const.md:37 @@ -3227,58 +3684,117 @@ msgid "" "```" msgstr "" -#: src/basic-syntax/static-and-const.md:45 -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 \n" -"embedded code, and the variable lives through the entirety of the program execution.\n" -"When a globally-scoped value does not have a reason to need object identity, `const` is generally " -"preferred." +#: src/basic-syntax/static-and-const.md:45 +msgid "" +"As noted in the [Rust RFC Book](https://rust-lang.github.io/rfcs/0246-const-" +"vs-static.html), 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. When a " +"globally-scoped value does not have a reason to need object identity, " +"`const` is generally preferred." +msgstr "" + +#: src/basic-syntax/static-and-const.md:49 +msgid "" +"Because `static` variables are accessible from any thread, they must be " +"`Sync`. Interior mutability is possible through a [`Mutex`](https://doc.rust-" +"lang.org/std/sync/struct.Mutex.html), atomic or similar. It is also possible " +"to have mutable statics, but they require manual synchronisation so any " +"access to them requires `unsafe` code. We will look at mutable statics\\](../" +"unsafe/mutable-static-variables.md) in the chapter on Unsafe Rust." +msgstr "" + +#: src/basic-syntax/static-and-const.md:57 +msgid "Mention that `const` behaves semantically similar to C++'s `constexpr`." +msgstr "" + +#: src/basic-syntax/static-and-const.md:58 +msgid "" +"`static`, on the other hand, is much more similar to a `const` or mutable " +"global variable in C++." +msgstr "" + +#: src/basic-syntax/static-and-const.md:59 +msgid "" +"`static` provides object identity: an address in memory and state as " +"required by types with interior mutability such as `Mutex`." +msgstr "" + +#: src/basic-syntax/static-and-const.md:60 +msgid "" +"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/static-and-const.md:61 +msgid "`thread_local` data can be created with the macro `std::thread_local`." +msgstr "" + +#: src/basic-syntax/static-and-const.md:63 +msgid "Properties table:" +msgstr "" + +#: src/basic-syntax/static-and-const.md:65 +msgid "Property" +msgstr "" + +#: src/basic-syntax/static-and-const.md:65 +msgid "Static" +msgstr "" + +#: src/basic-syntax/static-and-const.md:65 +msgid "Constant" +msgstr "" + +#: src/basic-syntax/static-and-const.md:67 +msgid "Has an address in memory" +msgstr "" + +#: src/basic-syntax/static-and-const.md:67 +#: src/basic-syntax/static-and-const.md:68 +#: src/basic-syntax/static-and-const.md:70 +#: src/basic-syntax/static-and-const.md:71 +msgid "Yes" +msgstr "" + +#: src/basic-syntax/static-and-const.md:67 +msgid "No (inlined)" +msgstr "" + +#: src/basic-syntax/static-and-const.md:68 +msgid "Lives for the entire duration of the program" +msgstr "" + +#: src/basic-syntax/static-and-const.md:68 +#: src/basic-syntax/static-and-const.md:69 +#: src/basic-syntax/static-and-const.md:71 +msgid "No" msgstr "" -#: src/basic-syntax/static-and-const.md:49 -msgid "" -"Because `static` variables are accessible from any thread, they must be `Sync`. Interior mutability\n" -"is possible through a [`Mutex`](https://doc.rust-lang.org/std/sync/struct.Mutex.html), atomic or\n" -"similar. It is also possible to have mutable statics, but they require manual synchronisation so any\n" -"access to them requires `unsafe` code. We will look at\n" -"mutable statics](../unsafe/mutable-static-variables.md) in the chapter on Unsafe Rust." +#: src/basic-syntax/static-and-const.md:69 +msgid "Can be mutable" msgstr "" -#: src/basic-syntax/static-and-const.md:57 -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" -"* `static` provides object identity: an address in memory and state as required by types with " -"interior mutability such as `Mutex`.\n" -"* It isn't super common that one would need a runtime evaluated constant, but it is helpful and safer " -"than using a static.\n" -"* `thread_local` data can be created with the macro `std::thread_local`." +#: src/basic-syntax/static-and-const.md:69 +msgid "Yes (unsafe)" msgstr "" -#: src/basic-syntax/static-and-const.md:63 -msgid "### Properties table: " +#: src/basic-syntax/static-and-const.md:70 +msgid "Evaluated at compile time" msgstr "" -#: src/basic-syntax/static-and-const.md:65 -msgid "" -"| Property | Static | Constant |\n" -"|---|---|---|\n" -"| Has an address in memory | Yes | No (inlined) |\n" -"| Lives for the entire duration of the program | Yes | No |\n" -"| Can be mutable | Yes (unsafe) | No |\n" -"| Evaluated at compile time | Yes (initialised at compile time) | Yes |\n" -"| Inlined wherever it is used | No | Yes |" +#: src/basic-syntax/static-and-const.md:70 +msgid "Yes (initialised at compile time)" msgstr "" -#: src/basic-syntax/scopes-shadowing.md:1 -msgid "# Scopes and Shadowing" +#: src/basic-syntax/static-and-const.md:71 +msgid "Inlined wherever it is used" msgstr "" #: src/basic-syntax/scopes-shadowing.md:3 msgid "" -"You can shadow variables, both those from outer scopes and variables from the\n" -"same scope:" +"You can shadow variables, both those from outer scopes and variables from " +"the same scope:" msgstr "" #: src/basic-syntax/scopes-shadowing.md:6 @@ -3303,13 +3819,26 @@ 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" -"* 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." +"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. " +msgstr "" + +#: src/basic-syntax/scopes-shadowing.md:26 +msgid "A shadowing variable can have a different type. " +msgstr "" + +#: src/basic-syntax/scopes-shadowing.md:27 +msgid "" +"Shadowing looks obscure at first, but is convenient for holding on to values " +"after `.unwrap()`." +msgstr "" + +#: src/basic-syntax/scopes-shadowing.md:28 +msgid "" +"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 @@ -3324,18 +3853,18 @@ msgid "" "```" msgstr "" -#: src/memory-management.md:1 -msgid "# Memory Management" -msgstr "" - #: src/memory-management.md:3 msgid "Traditionally, languages have fallen into two broad categories:" msgstr "" #: src/memory-management.md:5 +msgid "Full control via manual memory management: C, C++, Pascal, ..." +msgstr "" + +#: src/memory-management.md:6 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 @@ -3344,8 +3873,8 @@ msgstr "" #: src/memory-management.md:10 msgid "" -"> Full control *and* safety via compile time enforcement of correct memory\n" -"> management." +"Full control _and_ safety via compile time enforcement of correct memory " +"management." msgstr "" #: src/memory-management.md:13 @@ -3357,31 +3886,53 @@ msgid "First, let's refresh how memory management works." msgstr "" #: src/memory-management/stack-vs-heap.md:1 -msgid "# The Stack vs The Heap" +msgid "The Stack vs The Heap" msgstr "" #: src/memory-management/stack-vs-heap.md:3 -msgid "" -"* Stack: Continuous area of memory for local variables.\n" -" * Values have fixed sizes known at compile time.\n" -" * Extremely fast: just move a stack pointer.\n" -" * Easy to manage: follows function calls.\n" -" * Great memory locality.\n" -"\n" -"* Heap: Storage of values outside of function calls.\n" -" * Values have dynamic sizes determined at runtime.\n" -" * Slightly slower than the stack: some book-keeping needed.\n" -" * No guarantee of memory locality." +msgid "Stack: Continuous area of memory for local variables." +msgstr "" + +#: src/memory-management/stack-vs-heap.md:4 +msgid "Values have fixed sizes known at compile time." +msgstr "" + +#: src/memory-management/stack-vs-heap.md:5 +msgid "Extremely fast: just move a stack pointer." +msgstr "" + +#: src/memory-management/stack-vs-heap.md:6 +msgid "Easy to manage: follows function calls." +msgstr "" + +#: src/memory-management/stack-vs-heap.md:7 +msgid "Great memory locality." +msgstr "" + +#: src/memory-management/stack-vs-heap.md:9 +msgid "Heap: Storage of values outside of function calls." +msgstr "" + +#: src/memory-management/stack-vs-heap.md:10 +msgid "Values have dynamic sizes determined at runtime." +msgstr "" + +#: src/memory-management/stack-vs-heap.md:11 +msgid "Slightly slower than the stack: some book-keeping needed." +msgstr "" + +#: src/memory-management/stack-vs-heap.md:12 +msgid "No guarantee of memory locality." msgstr "" #: src/memory-management/stack.md:1 -msgid "# Stack and Heap Example" +msgid "Stack and Heap Example" msgstr "" #: src/memory-management/stack.md:3 msgid "" -"Creating a `String` puts fixed-sized metadata on the stack and dynamically sized\n" -"data, the actual string, on the heap:" +"Creating a `String` puts fixed-sized metadata on the stack and dynamically " +"sized data, the actual string, on the heap:" msgstr "" #: src/memory-management/stack.md:6 @@ -3412,33 +3963,42 @@ 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" -"\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" -"\n" -" ```rust,editable\n" -" fn main() {\n" -" let mut s1 = String::from(\"Hello\");\n" -" 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" -" // undefined behavior.\n" -" unsafe {\n" -" let (ptr, capacity, len): (usize, usize, usize) = std::mem::transmute(s1);\n" -" println!(\"ptr = {ptr:#x}, len = {len}, capacity = {capacity}\");\n" -" }\n" -" }\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." +msgstr "" + +#: src/memory-management/stack.md:30 +msgid "" +"If students ask about it, you can mention that the underlying memory is heap " +"allocated using the [System Allocator](https://doc.rust-lang.org/std/alloc/" +"struct.System.html) and custom allocators can be implemented using the " +"[Allocator API](https://doc.rust-lang.org/std/alloc/index.html)" +msgstr "" + +#: src/memory-management/stack.md:32 +msgid "" +"We can inspect the memory layout with `unsafe` code. However, you should " +"point out that this is rightfully unsafe!" msgstr "" -#: src/memory-management/manual.md:1 -msgid "# Manual Memory Management" +#: src/memory-management/stack.md:34 +msgid "" +"```rust,editable\n" +"fn main() {\n" +" let mut s1 = String::from(\"Hello\");\n" +" 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" +" // undefined behavior.\n" +" unsafe {\n" +" let (ptr, capacity, len): (usize, usize, usize) = std::mem::" +"transmute(s1);\n" +" println!(\"ptr = {ptr:#x}, len = {len}, capacity = {capacity}\");\n" +" }\n" +"}\n" +"```" msgstr "" #: src/memory-management/manual.md:3 @@ -3447,11 +4007,12 @@ 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 -msgid "## C Example" +msgid "C Example" msgstr "" #: src/memory-management/manual.md:9 @@ -3473,35 +4034,32 @@ msgstr "" #: src/memory-management/manual.md:21 msgid "" -"Memory is leaked if the function returns early between `malloc` and `free`: the\n" -"pointer is lost and we cannot deallocate the memory.\n" -"Worse, freeing the pointer twice, or accessing a freed pointer can lead to exploitable security " +"Memory is leaked if the function returns early between `malloc` and `free`: " +"the pointer is lost and we cannot deallocate the memory. Worse, freeing the " +"pointer twice, or accessing a freed pointer can lead to exploitable security " "vulnerabilities." msgstr "" -#: src/memory-management/scope-based.md:1 -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" -"raised." +"By wrapping a pointer in an object, you can free memory when the object is " +"destroyed. The compiler guarantees that this happens, even if an exception " +"is raised." msgstr "" #: src/memory-management/scope-based.md:9 msgid "" -"This is often called _resource acquisition is initialization_ (RAII) and gives\n" -"you smart pointers." +"This is often called _resource acquisition is initialization_ (RAII) and " +"gives you smart pointers." msgstr "" #: src/memory-management/scope-based.md:12 -msgid "## C++ Example" +msgid "C++ Example" msgstr "" #: src/memory-management/scope-based.md:14 @@ -3515,14 +4073,21 @@ msgstr "" #: src/memory-management/scope-based.md:20 msgid "" -"* The `std::unique_ptr` object is allocated on the stack, and points to\n" -" memory allocated on the heap.\n" -"* At the end of `say_hello`, the `std::unique_ptr` destructor will run.\n" -"* The destructor frees the `Person` object it points to." +"The `std::unique_ptr` object is allocated on the stack, and points to memory " +"allocated on the heap." +msgstr "" + +#: src/memory-management/scope-based.md:22 +msgid "At the end of `say_hello`, the `std::unique_ptr` destructor will run." +msgstr "" + +#: src/memory-management/scope-based.md:23 +msgid "The destructor frees the `Person` object it points to." 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 @@ -3534,23 +4099,27 @@ msgid "" msgstr "" #: src/memory-management/garbage-collection.md:1 -msgid "# Automatic Memory Management" +msgid "Automatic Memory Management" msgstr "" #: src/memory-management/garbage-collection.md:3 msgid "" -"An alternative to manual and scope-based memory management is automatic memory\n" -"management:" +"An alternative to manual and scope-based memory management is automatic " +"memory management:" msgstr "" #: src/memory-management/garbage-collection.md:6 +msgid "The programmer never allocates or deallocates memory explicitly." +msgstr "" + +#: src/memory-management/garbage-collection.md:7 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 -msgid "## Java Example" +msgid "Java Example" msgstr "" #: src/memory-management/garbage-collection.md:11 @@ -3567,7 +4136,7 @@ msgid "" msgstr "" #: src/memory-management/rust.md:1 -msgid "# Memory Management in Rust" +msgid "Memory Management in Rust" msgstr "" #: src/memory-management/rust.md:3 @@ -3575,13 +4144,24 @@ msgid "Memory management in Rust is a mix:" msgstr "" #: src/memory-management/rust.md:5 +msgid "Safe and correct like Java, but without a garbage collector." +msgstr "" + +#: src/memory-management/rust.md:6 +msgid "" +"Depending on which abstraction (or combination of abstractions) you choose, " +"can be a single unique pointer, reference counted, or atomically reference " +"counted." +msgstr "" + +#: src/memory-management/rust.md:7 +msgid "Scope-based like C++, but the compiler enforces full adherence." +msgstr "" + +#: src/memory-management/rust.md:8 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" -"* 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 @@ -3590,15 +4170,19 @@ 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" -"\n" -"* You may be asked about destructors here, the [Drop] trait is the Rust equivalent." +"If asked how at this point, you can mention that in Rust this is usually " +"handled by RAII wrapper types such as [Box](https://doc.rust-lang.org/std/" +"boxed/struct.Box.html), [Vec](https://doc.rust-lang.org/std/vec/struct.Vec." +"html), [Rc](https://doc.rust-lang.org/std/rc/struct.Rc.html), or [Arc]" +"(https://doc.rust-lang.org/std/sync/struct.Arc.html). These encapsulate " +"ownership and memory allocation via various means, and prevent the potential " +"errors in C." msgstr "" -#: src/memory-management/comparison.md:1 -msgid "# Comparison" +#: src/memory-management/rust.md:16 +msgid "" +"You may be asked about destructors here, the [Drop](https://doc.rust-lang." +"org/std/ops/trait.Drop.html) trait is the Rust equivalent." msgstr "" #: src/memory-management/comparison.md:3 @@ -3606,55 +4190,100 @@ msgid "Here is a rough comparison of the memory management techniques." msgstr "" #: src/memory-management/comparison.md:5 -msgid "## Pros of Different Memory Management Techniques" +msgid "Pros of Different Memory Management Techniques" msgstr "" -#: src/memory-management/comparison.md:7 -msgid "" -"* Manual like C:\n" -" * No runtime overhead.\n" -"* Automatic like Java:\n" -" * Fully automatic.\n" -" * Safe and correct.\n" -"* Scope-based like C++:\n" -" * Partially automatic.\n" -" * No runtime overhead.\n" -"* Compiler-enforced scope-based like Rust:\n" -" * Enforced by compiler.\n" -" * No runtime overhead.\n" -" * Safe and correct." +#: src/memory-management/comparison.md:7 src/memory-management/comparison.md:22 +msgid "Manual like C:" +msgstr "" + +#: src/memory-management/comparison.md:8 src/memory-management/comparison.md:14 +#: src/memory-management/comparison.md:17 +msgid "No runtime overhead." +msgstr "" + +#: src/memory-management/comparison.md:9 src/memory-management/comparison.md:26 +msgid "Automatic like Java:" +msgstr "" + +#: src/memory-management/comparison.md:10 +msgid "Fully automatic." +msgstr "" + +#: src/memory-management/comparison.md:11 +#: src/memory-management/comparison.md:18 +msgid "Safe and correct." +msgstr "" + +#: src/memory-management/comparison.md:12 +#: src/memory-management/comparison.md:29 +msgid "Scope-based like C++:" +msgstr "" + +#: src/memory-management/comparison.md:13 +msgid "Partially automatic." +msgstr "" + +#: src/memory-management/comparison.md:15 +msgid "Compiler-enforced scope-based like Rust:" +msgstr "" + +#: src/memory-management/comparison.md:16 +msgid "Enforced by compiler." msgstr "" #: src/memory-management/comparison.md:20 -msgid "## Cons of Different Memory Management Techniques" +msgid "Cons of Different Memory Management Techniques" msgstr "" -#: src/memory-management/comparison.md:22 -msgid "" -"* Manual like C:\n" -" * Use-after-free.\n" -" * Double-frees.\n" -" * Memory leaks.\n" -"* Automatic like Java:\n" -" * Garbage collection pauses.\n" -" * Destructor delays.\n" -"* Scope-based like C++:\n" -" * Complex, opt-in by programmer (on C++).\n" -" * Circular references can lead to memory leaks\n" -" * Potential runtime overhead\n" -"* Compiler-enforced and scope-based like Rust:\n" -" * Some upfront complexity.\n" -" * Can reject valid programs." +#: src/memory-management/comparison.md:23 +msgid "Use-after-free." msgstr "" -#: src/ownership.md:1 -msgid "# Ownership" +#: src/memory-management/comparison.md:24 +msgid "Double-frees." +msgstr "" + +#: src/memory-management/comparison.md:25 +msgid "Memory leaks." +msgstr "" + +#: src/memory-management/comparison.md:27 +msgid "Garbage collection pauses." +msgstr "" + +#: src/memory-management/comparison.md:28 +msgid "Destructor delays." +msgstr "" + +#: src/memory-management/comparison.md:30 +msgid "Complex, opt-in by programmer (on C++)." +msgstr "" + +#: src/memory-management/comparison.md:31 +msgid "Circular references can lead to memory leaks" +msgstr "" + +#: src/memory-management/comparison.md:32 +msgid "Potential runtime overhead" +msgstr "" + +#: src/memory-management/comparison.md:33 +msgid "Compiler-enforced and scope-based like Rust:" +msgstr "" + +#: src/memory-management/comparison.md:34 +msgid "Some upfront complexity." +msgstr "" + +#: src/memory-management/comparison.md:35 +msgid "Can reject valid programs." msgstr "" #: src/ownership.md:3 msgid "" -"All variable bindings have a _scope_ where they are valid and it is an error to\n" -"use a variable outside its scope:" +"All variable bindings have a _scope_ where they are valid and it is an error " +"to use a variable outside its scope:" msgstr "" #: src/ownership.md:6 @@ -3674,13 +4303,15 @@ msgstr "" #: src/ownership.md:18 msgid "" -"* At the end of the scope, the variable is _dropped_ and the data is freed.\n" -"* A destructor can run here to free up resources.\n" -"* We say that the variable _owns_ the value." +"At the end of the scope, the variable is _dropped_ and the data is freed." +msgstr "" + +#: src/ownership.md:19 +msgid "A destructor can run here to free up resources." msgstr "" -#: src/ownership/move-semantics.md:1 -msgid "# Move Semantics" +#: src/ownership.md:20 +msgid "We say that the variable _owns_ the value." msgstr "" #: src/ownership/move-semantics.md:3 @@ -3700,28 +4331,41 @@ msgid "" msgstr "" #: src/ownership/move-semantics.md:14 -msgid "" -"* The assignment of `s1` to `s2` transfers ownership.\n" -"* When `s1` goes out of scope, nothing happens: it does not own anything.\n" -"* When `s2` goes out of scope, the string data is freed.\n" -"* There is always _exactly_ one variable binding which owns a value." +msgid "The assignment of `s1` to `s2` transfers ownership." +msgstr "" + +#: src/ownership/move-semantics.md:15 +msgid "When `s1` goes out of scope, nothing happens: it does not own anything." +msgstr "" + +#: src/ownership/move-semantics.md:16 +msgid "When `s2` goes out of scope, the string data is freed." +msgstr "" + +#: src/ownership/move-semantics.md:17 +msgid "There is always _exactly_ one variable binding which owns a value." msgstr "" #: src/ownership/move-semantics.md:21 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" -"\n" -"* It is only the ownership that moves. Whether any machine code is generated to manipulate the data " -"itself is a matter of optimization, and such copies are aggressively optimized away.\n" -"\n" -"* Simple values (such as integers) can be marked `Copy` (see later slides).\n" -"\n" -"* In Rust, clones are explicit (by using `clone`)." +"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!)." +msgstr "" + +#: src/ownership/move-semantics.md:23 +msgid "" +"It is only the ownership that moves. Whether any machine code is generated " +"to manipulate the data itself is a matter of optimization, and such copies " +"are aggressively optimized away." +msgstr "" + +#: src/ownership/move-semantics.md:25 +msgid "" +"Simple values (such as integers) can be marked `Copy` (see later slides)." msgstr "" -#: src/ownership/moved-strings-rust.md:1 -msgid "# Moved Strings in Rust" +#: src/ownership/move-semantics.md:27 +msgid "In Rust, clones are explicit (by using `clone`)." msgstr "" #: src/ownership/moved-strings-rust.md:3 @@ -3735,9 +4379,11 @@ msgid "" msgstr "" #: src/ownership/moved-strings-rust.md:10 -msgid "" -"* The heap data from `s1` is reused for `s2`.\n" -"* When `s1` goes out of scope, nothing happens (it has been moved from)." +msgid "The heap data from `s1` is reused for `s2`." +msgstr "" + +#: src/ownership/moved-strings-rust.md:11 +msgid "When `s1` goes out of scope, nothing happens (it has been moved from)." msgstr "" #: src/ownership/moved-strings-rust.md:13 @@ -3791,7 +4437,7 @@ msgid "" msgstr "" #: src/ownership/double-free-modern-cpp.md:1 -msgid "# Extra Work in Modern C++ " +msgid "Extra Work in Modern C++" msgstr "" #: src/ownership/double-free-modern-cpp.md:3 @@ -3808,8 +4454,11 @@ 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" -"* When `s1` and `s2` go out of scope, they each free their own memory." +"The heap data from `s1` is duplicated and `s2` gets its own independent copy." +msgstr "" + +#: src/ownership/double-free-modern-cpp.md:11 +msgid "When `s1` and `s2` go out of scope, they each free their own memory." msgstr "" #: src/ownership/double-free-modern-cpp.md:13 @@ -3861,13 +4510,9 @@ msgid "" "```" msgstr "" -#: src/ownership/moves-function-calls.md:1 -msgid "# Moves in Function Calls" -msgstr "" - #: src/ownership/moves-function-calls.md:3 msgid "" -"When you pass a value to a function, the value is assigned to the function\n" +"When you pass a value to a function, the value is assigned to the function " "parameter. This transfers ownership:" msgstr "" @@ -3888,22 +4533,37 @@ 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`." +msgstr "" + +#: src/ownership/moves-function-calls.md:21 +msgid "" +"The heap memory allocated for `name` will be freed at the end of the " +"`say_hello` function." +msgstr "" + +#: src/ownership/moves-function-calls.md:22 +msgid "" +"`main` can retain ownership if it passes `name` as a reference (`&name`) and " +"if `say_hello` accepts a reference as a parameter." +msgstr "" + +#: src/ownership/moves-function-calls.md:23 +msgid "" +"Alternatively, `main` can pass a clone of `name` in the first call (`name." +"clone()`)." msgstr "" -#: src/ownership/copy-clone.md:1 -msgid "# Copying and Cloning" +#: src/ownership/moves-function-calls.md:24 +msgid "" +"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: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 @@ -3942,9 +4602,11 @@ msgid "" msgstr "" #: src/ownership/copy-clone.md:30 -msgid "" -"* After the assignment, both `p1` and `p2` own their own data.\n" -"* We can also use `p1.clone()` to explicitly copy the data." +msgid "After the assignment, both `p1` and `p2` own their own data." +msgstr "" + +#: src/ownership/copy-clone.md:31 +msgid "We can also use `p1.clone()` to explicitly copy the data." msgstr "" #: src/ownership/copy-clone.md:35 @@ -3953,11 +4615,23 @@ 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 does not work on types that implement the `Drop` trait." +"Copying refers to bitwise copies of memory regions and does not work on " +"arbitrary objects." +msgstr "" + +#: src/ownership/copy-clone.md:38 +msgid "" +"Copying does not allow for custom logic (unlike copy constructors in C++)." +msgstr "" + +#: src/ownership/copy-clone.md:39 +msgid "" +"Cloning is a more general operation and also allows for custom behavior by " +"implementing the `Clone` trait." +msgstr "" + +#: src/ownership/copy-clone.md:40 +msgid "Copying does not work on types that implement the `Drop` trait." msgstr "" #: src/ownership/copy-clone.md:42 src/ownership/lifetimes-function-calls.md:29 @@ -3966,24 +4640,30 @@ 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" -"* Show that it works if you clone `p1` instead." +"Add a `String` field to `struct Point`. It will not compile because `String` " +"is not a `Copy` type." msgstr "" -#: src/ownership/copy-clone.md:48 +#: src/ownership/copy-clone.md:45 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." +"Remove `Copy` from the `derive` attribute. The compiler error is now in the " +"`println!` for `p1`." +msgstr "" + +#: src/ownership/copy-clone.md:46 +msgid "Show that it works if you clone `p1` instead." msgstr "" -#: src/ownership/borrowing.md:1 -msgid "# Borrowing" +#: 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 at compile time. In this case the default " +"implementations of `Copy` and `Clone` traits are generated." msgstr "" #: src/ownership/borrowing.md:3 msgid "" -"Instead of transferring ownership when calling a function, you can let a\n" +"Instead of transferring ownership when calling a function, you can let a " "function _borrow_ the value:" msgstr "" @@ -4007,9 +4687,11 @@ msgid "" msgstr "" #: src/ownership/borrowing.md:22 -msgid "" -"* The `add` function _borrows_ two points and returns a new point.\n" -"* The caller retains ownership of the inputs." +msgid "The `add` function _borrows_ two points and returns a new point." +msgstr "" + +#: src/ownership/borrowing.md:23 +msgid "The caller retains ownership of the inputs." msgstr "" #: src/ownership/borrowing.md:27 @@ -4018,37 +4700,46 @@ 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] or look at " -"the assembly in [Godbolt](https://rust.godbolt.org/). 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" -" struct Point(i32, i32);\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](https://play.rust-lang.org/) or look at the " +"assembly in [Godbolt](https://rust.godbolt.org/). In the \"DEBUG\" " +"optimization level, the addresses should change, while they stay the same " +"when changing to the \"RELEASE\" setting:" +msgstr "" + +#: src/ownership/borrowing.md:30 +msgid "" +"```rust,editable\n" +"#[derive(Debug)]\n" +"struct Point(i32, i32);\n" "\n" -" fn add(p1: &Point, p2: &Point) -> Point {\n" -" let p = Point(p1.0 + p2.0, p1.1 + p2.1);\n" -" println!(\"&p.0: {:p}\", &p.0);\n" -" p\n" -" }\n" +"fn add(p1: &Point, p2: &Point) -> Point {\n" +" let p = Point(p1.0 + p2.0, p1.1 + p2.1);\n" +" println!(\"&p.0: {:p}\", &p.0);\n" +" p\n" +"}\n" "\n" -" pub fn main() {\n" -" let p1 = Point(3, 4);\n" -" let p2 = Point(10, 20);\n" -" let p3 = add(&p1, &p2);\n" -" println!(\"&p3.0: {:p}\", &p3.0);\n" -" println!(\"{p1:?} + {p2:?} = {p3:?}\");\n" -" }\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 perform a " -"simple and efficient `memcpy` copy." +"pub fn main() {\n" +" let p1 = Point(3, 4);\n" +" let p2 = Point(10, 20);\n" +" let p3 = add(&p1, &p2);\n" +" println!(\"&p3.0: {:p}\", &p3.0);\n" +" println!(\"{p1:?} + {p2:?} = {p3:?}\");\n" +"}\n" +"```" +msgstr "" + +#: src/ownership/borrowing.md:48 +msgid "The Rust compiler can do return value optimization (RVO)." msgstr "" -#: src/ownership/shared-unique-borrows.md:1 -msgid "# Shared and Unique Borrows" +#: src/ownership/borrowing.md:49 +msgid "" +"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 perform a simple and efficient `memcpy` " +"copy." msgstr "" #: src/ownership/shared-unique-borrows.md:3 @@ -4056,9 +4747,11 @@ msgid "Rust puts constraints on the ways you can borrow values:" msgstr "" #: src/ownership/shared-unique-borrows.md:5 -msgid "" -"* You can have one or more `&T` values at any given time, _or_\n" -"* You can have exactly one `&mut T` value." +msgid "You can have one or more `&T` values at any given time, _or_" +msgstr "" + +#: src/ownership/shared-unique-borrows.md:6 +msgid "You can have exactly one `&mut T` value." msgstr "" #: src/ownership/shared-unique-borrows.md:8 @@ -4081,16 +4774,21 @@ 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." +msgstr "" + +#: src/ownership/shared-unique-borrows.md:26 +msgid "" +"Move the `println!` statement for `b` before the scope that introduces `c` " +"to make the code compile." msgstr "" -#: src/ownership/lifetimes.md:1 -msgid "# Lifetimes" +#: src/ownership/shared-unique-borrows.md:27 +msgid "" +"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:3 @@ -4098,26 +4796,42 @@ msgid "A borrowed value has a _lifetime_:" msgstr "" #: src/ownership/lifetimes.md:5 +msgid "The lifetime can be implicit: `add(p1: &Point, p2: &Point) -> Point`." +msgstr "" + +#: src/ownership/lifetimes.md:6 +msgid "Lifetimes can also be explicit: `&'a Point`, `&'document str`." +msgstr "" + +#: src/ownership/lifetimes.md:7 src/ownership/lifetimes-function-calls.md:23 +msgid "" +"Read `&'a Point` as \"a borrowed `Point` which is valid for at least the " +"lifetime `a`\"." +msgstr "" + +#: src/ownership/lifetimes.md:9 +msgid "" +"Lifetimes are always inferred by the compiler: you cannot assign a lifetime " +"yourself." +msgstr "" + +#: src/ownership/lifetimes.md:11 msgid "" -"* The lifetime can be implicit: `add(p1: &Point, p2: &Point) -> Point`.\n" -"* 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" -" yourself.\n" -" * Lifetime annotations create constraints; the compiler verifies that there is\n" -" a valid solution.\n" -"* Lifetimes for function arguments and return values must be fully specified,\n" -" but Rust allows lifetimes to be elided in most cases with [a few simple\n" -" rules](https://doc.rust-lang.org/nomicon/lifetime-elision.html)." +"Lifetime annotations create constraints; the compiler verifies that there is " +"a valid solution." msgstr "" -#: src/ownership/lifetimes-function-calls.md:1 -msgid "# Lifetimes in Function Calls" +#: src/ownership/lifetimes.md:13 +msgid "" +"Lifetimes for function arguments and return values must be fully specified, " +"but Rust allows lifetimes to be elided in most cases with [a few simple " +"rules](https://doc.rust-lang.org/nomicon/lifetime-elision.html)." 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 @@ -4140,56 +4854,82 @@ msgid "" msgstr "" #: src/ownership/lifetimes-function-calls.md:21 +msgid "`'a` is a generic parameter, it is inferred by the compiler." +msgstr "" + +#: src/ownership/lifetimes-function-calls.md:22 +msgid "Lifetimes start with `'` and `'a` is a typical default name." +msgstr "" + +#: src/ownership/lifetimes-function-calls.md:25 msgid "" -"* `'a` is a generic parameter, it is inferred by the compiler.\n" -"* Lifetimes start with `'` and `'a` is a typical default name.\n" -"* Read `&'a Point` as \"a borrowed `Point` which is valid for at least the\n" -" lifetime `a`\".\n" -" * The _at least_ part is important when parameters are in different scopes." +"The _at least_ part is important when parameters are in different scopes." msgstr "" #: src/ownership/lifetimes-function-calls.md:31 msgid "" -"* Move the declaration of `p2` and `p3` into a new scope (`{ ... }`), resulting in the following " -"code:\n" -" ```rust,ignore\n" -" #[derive(Debug)]\n" -" struct Point(i32, i32);\n" -"\n" -" fn left_most<'a>(p1: &'a Point, p2: &'a Point) -> &'a Point {\n" -" if p1.0 < p2.0 { p1 } else { p2 }\n" -" }\n" -"\n" -" fn main() {\n" -" let p1: Point = Point(10, 10);\n" -" let p3: &Point;\n" -" {\n" -" let p2: Point = Point(20, 20);\n" -" p3 = left_most(&p1, &p2);\n" -" }\n" -" println!(\"left-most point: {:?}\", p3);\n" -" }\n" -" ```\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" -"* Another way to explain it:\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 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 "" - -#: src/ownership/lifetimes-data-structures.md:1 -msgid "# Lifetimes in Data Structures" +"Move the declaration of `p2` and `p3` into a new scope (`{ ... }`), " +"resulting in the following code:" +msgstr "" + +#: src/ownership/lifetimes-function-calls.md:32 +msgid "" +"```rust,ignore\n" +"#[derive(Debug)]\n" +"struct Point(i32, i32);\n" +"\n" +"fn left_most<'a>(p1: &'a Point, p2: &'a Point) -> &'a Point {\n" +" if p1.0 < p2.0 { p1 } else { p2 }\n" +"}\n" +"\n" +"fn main() {\n" +" let p1: Point = Point(10, 10);\n" +" let p3: &Point;\n" +" {\n" +" let p2: Point = Point(20, 20);\n" +" p3 = left_most(&p1, &p2);\n" +" }\n" +" println!(\"left-most point: {:?}\", p3);\n" +"}\n" +"```" +msgstr "" + +#: src/ownership/lifetimes-function-calls.md:50 +msgid "Note how this does not compile since `p3` outlives `p2`." +msgstr "" + +#: src/ownership/lifetimes-function-calls.md:52 +msgid "" +"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." +msgstr "" + +#: src/ownership/lifetimes-function-calls.md:53 +msgid "Another way to explain it:" +msgstr "" + +#: src/ownership/lifetimes-function-calls.md:54 +msgid "" +"Two references to two values are borrowed by a function and the function " +"returns another reference." +msgstr "" + +#: src/ownership/lifetimes-function-calls.md:56 +msgid "" +"It must have come from one of those two inputs (or from a global variable)." +msgstr "" + +#: src/ownership/lifetimes-function-calls.md:57 +msgid "" +"Which one is it? The compiler needs to know, so at the call site the " +"returned reference is not used for longer than a variable from where the " +"reference came from." 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 @@ -4203,7 +4943,8 @@ 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" @@ -4213,22 +4954,40 @@ msgid "" "```" msgstr "" -#: src/ownership/lifetimes-data-structures.md:25 +#: 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." +msgstr "" + +#: src/ownership/lifetimes-data-structures.md:26 +msgid "" +"If `text` is consumed before the end of the lifetime of `fox` (or `dog`), " +"the borrow checker throws an error." +msgstr "" + +#: src/ownership/lifetimes-data-structures.md:27 +msgid "" +"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." +msgstr "" + +#: src/ownership/lifetimes-data-structures.md:28 +msgid "When possible, make data structures own their data directly." +msgstr "" + +#: src/ownership/lifetimes-data-structures.md:29 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" -"* 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 -msgid "# Day 1: Afternoon Exercises" +msgid "Day 1: Afternoon Exercises" msgstr "" #: src/exercises/day-1/afternoon.md:3 @@ -4236,20 +4995,17 @@ msgid "We will look at two things:" msgstr "" #: src/exercises/day-1/afternoon.md:5 -msgid "" -"* A small book library,\n" -"\n" -"* Iterators and ownership (hard)." +msgid "A small book library," msgstr "" -#: src/exercises/day-1/book-library.md:1 -msgid "# Storing Books" +#: src/exercises/day-1/afternoon.md:7 +msgid "Iterators and ownership (hard)." 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" -"you just need to know part of its API:" +"We will learn much more about structs and the `Vec` type tomorrow. For " +"now, you just need to know part of its API:" msgstr "" #: src/exercises/day-1/book-library.md:6 @@ -4269,7 +5025,7 @@ msgstr "" #: src/exercises/day-1/book-library.md:18 msgid "" -"Use this to model a library's book collection. Copy the code below to\n" +"Use this to model a library's book collection. Copy the code below to " " and update the types to make it compile:" msgstr "" @@ -4319,7 +5075,8 @@ 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" @@ -4334,12 +5091,15 @@ msgid "" "fn main() {\n" " let library = Library::new();\n" "\n" -" //println!(\"The library is empty: library.is_empty() -> {}\", library.is_empty());\n" +" //println!(\"The library is empty: 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() -> {}\", library.is_empty());\n" +" //println!(\"The library is no longer empty: library.is_empty() -> {}\", " +"library.is_empty());\n" " //\n" " //\n" " //library.print_books();\n" @@ -4359,26 +5119,23 @@ msgstr "" msgid "[Solution](solutions-afternoon.md#designing-a-library)" msgstr "" -#: src/exercises/day-1/iterators-and-ownership.md:1 -msgid "# Iterators and Ownership" -msgstr "" - #: src/exercises/day-1/iterators-and-ownership.md:3 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" +"The ownership model of Rust affects many APIs. An example of this is the " +"[`Iterator`](https://doc.rust-lang.org/std/iter/trait.Iterator.html) and " +"[`IntoIterator`](https://doc.rust-lang.org/std/iter/trait.IntoIterator.html) " "traits." msgstr "" -#: src/exercises/day-1/iterators-and-ownership.md:8 -msgid "## `Iterator`" +#: src/exercises/day-1/iterators-and-ownership.md:8 src/bare-metal/no_std.md:28 +msgid "`Iterator`" 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 " +"`Iterator` trait simply says that you can call `next` until you get `None` " +"back:" msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:13 @@ -4432,13 +5189,14 @@ msgid "Why is this type used?" msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:48 -msgid "## `IntoIterator`" +msgid "`IntoIterator`" 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:" +"The `Iterator` trait tells you how to _iterate_ once you have created an " +"iterator. The related trait `IntoIterator` tells you how to create the " +"iterator:" msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:53 @@ -4455,19 +5213,21 @@ msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:62 msgid "" -"The syntax here means that every implementation of `IntoIterator` must\n" +"The syntax here means that every implementation of `IntoIterator` must " "declare two types:" msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:65 -msgid "" -"* `Item`: the type we iterate over, such as `i8`,\n" -"* `IntoIter`: the `Iterator` type returned by the `into_iter` method." +msgid "`Item`: the type we iterate over, such as `i8`," +msgstr "" + +#: src/exercises/day-1/iterators-and-ownership.md:66 +msgid "`IntoIter`: the `Iterator` type returned by the `into_iter` method." msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:68 msgid "" -"Note that `IntoIter` and `Item` are linked: the iterator must have the same\n" +"Note that `IntoIter` and `Item` are linked: the iterator must have the same " "`Item` type, which means that it returns `Option`" msgstr "" @@ -4479,7 +5239,8 @@ 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" @@ -4489,21 +5250,22 @@ msgid "" msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:83 -msgid "## `for` Loops" +msgid "`for` Loops" 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" -"They call `into_iter()` on an expression and iterates over the resulting\n" -"iterator:" +"Now that we know both `Iterator` and `IntoIterator`, we can build `for` " +"loops. They call `into_iter()` on an expression and iterates over the " +"resulting iterator:" msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:89 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" @@ -4522,17 +5284,15 @@ msgstr "" #: src/exercises/day-1/iterators-and-ownership.md:105 msgid "" -"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'a+Vec%3CT,+A" -"%3E)\n" -"and [`impl IntoIterator for\n" -"Vec`](https://doc.rust-lang.org/std/vec/struct.Vec.html#impl-IntoIterator-for-Vec%3CT,+A%3E)\n" -"to check your answers." +"Experiment with the code above and then consult the documentation for [`impl " +"IntoIterator for &Vec`](https://doc.rust-lang.org/std/vec/struct.Vec." +"html#impl-IntoIterator-for-%26'a+Vec%3CT,+A%3E) and [`impl IntoIterator for " +"Vec`](https://doc.rust-lang.org/std/vec/struct.Vec.html#impl-IntoIterator-" +"for-Vec%3CT,+A%3E) to check your answers." msgstr "" #: src/welcome-day-2.md:1 -msgid "# Welcome to Day 2" +msgid "Welcome to Day 2" msgstr "" #: src/welcome-day-2.md:3 @@ -4540,22 +5300,27 @@ msgid "Now that we have seen a fair amount of Rust, we will continue with:" msgstr "" #: src/welcome-day-2.md:5 +msgid "Structs, enums, methods." +msgstr "" + +#: src/welcome-day-2.md:7 +msgid "Pattern matching: destructuring enums, structs, and arrays." +msgstr "" + +#: src/welcome-day-2.md:9 msgid "" -"* Structs, enums, methods.\n" -"\n" -"* Pattern matching: destructuring enums, structs, and arrays.\n" -"\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" -" and `Arc`.\n" -"\n" -"* Modules: visibility, paths, and filesystem hierarchy." +"Control flow constructs: `if`, `if let`, `while`, `while let`, `break`, and " +"`continue`." msgstr "" -#: src/structs.md:1 -msgid "# Structs" +#: src/welcome-day-2.md:12 +msgid "" +"The Standard Library: `String`, `Option` and `Result`, `Vec`, `HashMap`, " +"`Rc` and `Arc`." +msgstr "" + +#: src/welcome-day-2.md:15 +msgid "Modules: visibility, paths, and filesystem hierarchy." msgstr "" #: src/structs.md:3 @@ -4589,27 +5354,54 @@ msgid "" "```" msgstr "" -#: src/structs.md:31 src/enums.md:34 src/enums/sizes.md:28 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:43 +#: src/structs.md:31 src/enums.md:34 src/enums/sizes.md:28 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:43 msgid "Key Points:" msgstr "" #: src/structs.md:33 +msgid "Structs work like in C or C++." +msgstr "" + +#: src/structs.md:34 +msgid "Like in C++, and unlike in C, no typedef is needed to define a type." +msgstr "" + +#: src/structs.md:35 +msgid "Unlike in C++, there is no inheritance between structs." +msgstr "" + +#: src/structs.md:36 +msgid "" +"Methods are defined in an `impl` block, which we will see in following " +"slides." +msgstr "" + +#: src/structs.md:37 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." +"This may be a good time to let people know there are different types of " +"structs. " msgstr "" -#: src/structs/tuple-structs.md:1 -msgid "# Tuple Structs" +#: src/structs.md:38 +msgid "" +"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. " +msgstr "" + +#: src/structs.md:39 +msgid "" +"The next slide will introduce Tuple structs, used when the field names are " +"not important." +msgstr "" + +#: src/structs.md:40 +msgid "" +"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:3 @@ -4656,27 +5448,45 @@ 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" -" * 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" -" * Operator overloading is discussed on Day 3 (generics).\n" -"* The example is a subtle reference to the [Mars Climate Orbiter](https://en.wikipedia.org/wiki/" -"Mars_Climate_Orbiter) failure." +"Newtypes are a great way to encode additional information about the value in " +"a primitive type, for example:" +msgstr "" + +#: src/structs/tuple-structs.md:38 +msgid "The number is measured in some units: `Newtons` in the example above." +msgstr "" + +#: src/structs/tuple-structs.md:39 +msgid "" +"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)\\`." +msgstr "" + +#: src/structs/tuple-structs.md:40 +msgid "" +"Demonstrate how to add a `f64` value to a `Newtons` type by accessing the " +"single field in the newtype." +msgstr "" + +#: src/structs/tuple-structs.md:41 +msgid "" +"Rust generally doesn’t like inexplicit things, like automatic unwrapping or " +"for instance using booleans as integers." +msgstr "" + +#: src/structs/tuple-structs.md:42 +msgid "Operator overloading is discussed on Day 3 (generics)." msgstr "" -#: src/structs/field-shorthand.md:1 -msgid "# Field Shorthand Syntax" +#: src/structs/tuple-structs.md:43 +msgid "" +"The example is a subtle reference to the [Mars Climate Orbiter](https://en." +"wikipedia.org/wiki/Mars_Climate_Orbiter) failure." msgstr "" #: src/structs/field-shorthand.md:3 msgid "" -"If you already have variables with the right names, then you can create the\n" +"If you already have variables with the right names, then you can create the " "struct using a shorthand:" msgstr "" @@ -4696,344 +5506,454 @@ msgid "" "}\n" "\n" "fn main() {\n" -" let peter = Person::new(String::from(\"Peter\"), 27);\n" -" println!(\"{peter:?}\");\n" +" let peter = Person::new(String::from(\"Peter\"), 27);\n" +" println!(\"{peter:?}\");\n" +"}\n" +"```" +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" +msgstr "" + +#: src/structs/field-shorthand.md:29 +msgid "" +"```rust,editable\n" +"#[derive(Debug)]\n" +"struct Person {\n" +" name: String,\n" +" age: u8,\n" +"}\n" +"impl Person {\n" +" fn new(name: String, age: u8) -> Self {\n" +" Self { name, age }\n" +" }\n" +"}\n" +"```" +msgstr "" + +#: src/structs/field-shorthand.md:41 +msgid "" +"Implement the `Default` trait for the struct. Define some fields and use the " +"default values for the other fields." +msgstr "" + +#: src/structs/field-shorthand.md:43 +msgid "" +"```rust,editable\n" +"#[derive(Debug)]\n" +"struct Person {\n" +" name: String,\n" +" age: u8,\n" +"}\n" +"impl Default for Person {\n" +" fn default() -> Person {\n" +" Person {\n" +" name: \"Bot\".to_string(),\n" +" age: 0,\n" +" }\n" +" }\n" +"}\n" +"fn create_default() {\n" +" let tmp = Person {\n" +" ..Person::default()\n" +" };\n" +" let tmp = Person {\n" +" name: \"Sam\".to_string(),\n" +" ..Person::default()\n" +" };\n" +"}\n" +"```" +msgstr "" + +#: src/structs/field-shorthand.md:68 +msgid "Methods are defined in the `impl` block." +msgstr "" + +#: src/structs/field-shorthand.md:69 +msgid "" +"Use struct update syntax to define a new structure using `peter`. Note that " +"the variable `peter` will no longer be accessible afterwards." +msgstr "" + +#: src/structs/field-shorthand.md:70 +msgid "" +"Use `{:#?}` when printing structs to request the `Debug` representation." +msgstr "" + +#: src/enums.md:3 +msgid "" +"The `enum` keyword allows the creation of a type which has a few different " +"variants:" +msgstr "" + +#: src/enums.md:6 +msgid "" +"```rust,editable\n" +"fn generate_random_number() -> i32 {\n" +" // Implementation based on https://xkcd.com/221/\n" +" 4 // Chosen by fair dice roll. Guaranteed to be random.\n" +"}\n" +"\n" +"#[derive(Debug)]\n" +"enum CoinFlip {\n" +" Heads,\n" +" Tails,\n" +"}\n" +"\n" +"fn flip_coin() -> CoinFlip {\n" +" let random_number = generate_random_number();\n" +" if random_number % 2 == 0 {\n" +" return CoinFlip::Heads;\n" +" } else {\n" +" return CoinFlip::Tails;\n" +" }\n" +"}\n" +"\n" +"fn main() {\n" +" println!(\"You got: {:?}\", flip_coin());\n" +"}\n" +"```" +msgstr "" + +#: src/enums.md:36 +msgid "Enumerations allow you to collect a set of values under one type" +msgstr "" + +#: src/enums.md:37 +msgid "" +"This page offers an enum type `CoinFlip` with two variants `Heads` and " +"`Tails`. You might note the namespace when using variants." +msgstr "" + +#: src/enums.md:38 +msgid "This might be a good time to compare Structs and Enums:" +msgstr "" + +#: src/enums.md:39 +msgid "" +"In both, you can have a simple version without fields (unit struct) or one " +"with different types of fields (variant payloads). " +msgstr "" + +#: src/enums.md:40 +msgid "In both, associated functions are defined within an `impl` block." +msgstr "" + +#: src/enums.md:41 +msgid "" +"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:3 +msgid "" +"You can define richer enums where the variants carry data. You can then use " +"the `match` statement to extract the data from each variant:" +msgstr "" + +#: src/enums/variant-payloads.md:6 +msgid "" +"```rust,editable\n" +"enum WebEvent {\n" +" PageLoad, // Variant without payload\n" +" KeyPress(char), // Tuple struct variant\n" +" Click { x: i64, y: i64 }, // Full struct variant\n" +"}\n" +"\n" +"#[rustfmt::skip]\n" +"fn inspect(event: WebEvent) {\n" +" match event {\n" +" WebEvent::PageLoad => println!(\"page loaded\"),\n" +" WebEvent::KeyPress(c) => println!(\"pressed '{c}'\"),\n" +" WebEvent::Click { x, y } => println!(\"clicked at x={x}, y={y}\"),\n" +" }\n" +"}\n" +"\n" +"fn main() {\n" +" let load = WebEvent::PageLoad;\n" +" let press = WebEvent::KeyPress('x');\n" +" let click = WebEvent::Click { x: 20, y: 80 };\n" +"\n" +" inspect(load);\n" +" inspect(press);\n" +" inspect(click);\n" +"}\n" +"```" +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 `=>`." +msgstr "" + +#: src/enums/variant-payloads.md:36 +msgid "" +"The expression is matched against the patterns from top to bottom. There is " +"no fall-through like in C or C++." +msgstr "" + +#: src/enums/variant-payloads.md:37 +msgid "" +"The match expression has a value. The value is the last expression in the " +"match arm which was executed." +msgstr "" + +#: src/enums/variant-payloads.md:38 +msgid "" +"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. " +msgstr "" + +#: src/enums/variant-payloads.md:39 +msgid "" +"Demonstrate what happens when the search is inexhaustive. Note the advantage " +"the Rust compiler provides by confirming when all cases are handled. " +msgstr "" + +#: src/enums/variant-payloads.md:40 +msgid "`match` inspects a hidden discriminant field in the `enum`." +msgstr "" + +#: src/enums/variant-payloads.md:41 +msgid "" +"It is possible to retrieve the discriminant by calling `std::mem::" +"discriminant()`" +msgstr "" + +#: src/enums/variant-payloads.md:42 +msgid "" +"This is useful, for example, if implementing `PartialEq` for structs where " +"comparing field values doesn't affect equality." +msgstr "" + +#: src/enums/variant-payloads.md:43 +msgid "" +"`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." +msgstr "" + +#: src/enums/sizes.md:3 +msgid "" +"Rust enums are packed tightly, taking constraints due to alignment into " +"account:" +msgstr "" + +#: src/enums/sizes.md:5 +msgid "" +"```rust,editable\n" +"use std::any::type_name;\n" +"use std::mem::{align_of, size_of};\n" +"\n" +"fn dbg_size() {\n" +" println!(\"{}: size {} bytes, align: {} bytes\",\n" +" type_name::(), size_of::(), align_of::());\n" +"}\n" +"\n" +"enum Foo {\n" +" A,\n" +" B,\n" +"}\n" +"\n" +"fn main() {\n" +" dbg_size::();\n" +"}\n" +"```" +msgstr "" + +#: src/enums/sizes.md:24 +msgid "" +"See the [Rust Reference](https://doc.rust-lang.org/reference/type-layout." +"html)." +msgstr "" + +#: src/enums/sizes.md:30 +msgid "" +"Internally Rust is using a field (discriminant) to keep track of the enum " +"variant." +msgstr "" + +#: src/enums/sizes.md:32 +msgid "" +"You can control the discriminant if needed (e.g., for compatibility with C):" +msgstr "" + +#: src/enums/sizes.md:34 +msgid "" +"```rust,editable\n" +"#[repr(u32)]\n" +"enum Bar {\n" +" A, // 0\n" +" B = 10000,\n" +" C, // 10001\n" +"}\n" +"\n" +"fn main() {\n" +" println!(\"A: {}\", Bar::A as u32);\n" +" println!(\"B: {}\", Bar::B as u32);\n" +" println!(\"C: {}\", Bar::C as u32);\n" "}\n" "```" msgstr "" -#: src/structs/field-shorthand.md:27 +#: src/enums/sizes.md:49 msgid "" -"* 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" -" struct Person {\n" -" name: String,\n" -" age: u8,\n" -" }\n" -" impl Person {\n" -" fn new(name: String, age: u8) -> Self {\n" -" Self { name, age }\n" -" }\n" -" }\n" -" ``` \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" -" struct Person {\n" -" name: String,\n" -" age: u8,\n" -" }\n" -" impl Default for Person {\n" -" fn default() -> Person {\n" -" Person {\n" -" name: \"Bot\".to_string(),\n" -" age: 0,\n" -" }\n" -" }\n" -" }\n" -" fn create_default() {\n" -" let tmp = Person {\n" -" ..Person::default()\n" -" };\n" -" let tmp = Person {\n" -" name: \"Sam\".to_string(),\n" -" ..Person::default()\n" -" };\n" -" }\n" -" ```\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 `{:#?}` when printing structs to request the `Debug` representation." -msgstr "" - -#: src/enums.md:1 -msgid "# Enums" +"Without `repr`, the discriminant type takes 2 bytes, because 10001 fits 2 " +"bytes." msgstr "" -#: src/enums.md:3 +#: src/enums/sizes.md:53 +msgid "Try out other types such as" +msgstr "" + +#: src/enums/sizes.md:55 +msgid "`dbg_size!(bool)`: size 1 bytes, align: 1 bytes," +msgstr "" + +#: src/enums/sizes.md:56 msgid "" -"The `enum` keyword allows the creation of a type which has a few\n" -"different variants:" +"`dbg_size!(Option)`: size 1 bytes, align: 1 bytes (niche optimization, " +"see below)," msgstr "" -#: src/enums.md:6 +#: src/enums/sizes.md:57 +msgid "`dbg_size!(&i32)`: size 8 bytes, align: 8 bytes (on a 64-bit machine)," +msgstr "" + +#: src/enums/sizes.md:58 msgid "" -"```rust,editable\n" -"fn generate_random_number() -> i32 {\n" -" // Implementation based on https://xkcd.com/221/\n" -" 4 // Chosen by fair dice roll. Guaranteed to be random.\n" -"}\n" -"\n" -"#[derive(Debug)]\n" -"enum CoinFlip {\n" -" Heads,\n" -" Tails,\n" -"}\n" -"\n" -"fn flip_coin() -> CoinFlip {\n" -" let random_number = generate_random_number();\n" -" if random_number % 2 == 0 {\n" -" return CoinFlip::Heads;\n" -" } else {\n" -" return CoinFlip::Tails;\n" -" }\n" -"}\n" -"\n" -"fn main() {\n" -" println!(\"You got: {:?}\", flip_coin());\n" -"}\n" -"```" +"`dbg_size!(Option<&i32>)`: size 8 bytes, align: 8 bytes (null pointer " +"optimization, see below)." msgstr "" -#: src/enums.md:36 +#: src/enums/sizes.md:60 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 `Tails`. 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, 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. " +"Niche optimization: Rust will merge unused bit patterns for the enum " +"discriminant." msgstr "" -#: src/enums/variant-payloads.md:1 -msgid "# Variant Payloads" +#: src/enums/sizes.md:63 +msgid "" +"Null pointer optimization: For [some types](https://doc.rust-lang.org/std/" +"option/#representation), Rust guarantees that `size_of::()` equals " +"`size_of::>()`." msgstr "" -#: src/enums/variant-payloads.md:3 +#: src/enums/sizes.md:67 msgid "" -"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:" +"Example code if you want to show how the bitwise representation _may_ look " +"like in practice. It's important to note that the compiler provides no " +"guarantees regarding this representation, therefore this is totally unsafe." msgstr "" -#: src/enums/variant-payloads.md:6 +#: src/enums/sizes.md:70 msgid "" "```rust,editable\n" -"enum WebEvent {\n" -" PageLoad, // Variant without payload\n" -" KeyPress(char), // Tuple struct variant\n" -" Click { x: i64, y: i64 }, // Full struct variant\n" -"}\n" +"use std::mem::transmute;\n" "\n" -"#[rustfmt::skip]\n" -"fn inspect(event: WebEvent) {\n" -" match event {\n" -" WebEvent::PageLoad => println!(\"page loaded\"),\n" -" WebEvent::KeyPress(c) => println!(\"pressed '{c}'\"),\n" -" WebEvent::Click { x, y } => println!(\"clicked at x={x}, y={y}\"),\n" -" }\n" +"macro_rules! dbg_bits {\n" +" ($e:expr, $bit_type:ty) => {\n" +" println!(\"- {}: {:#x}\", stringify!($e), transmute::<_, " +"$bit_type>($e));\n" +" };\n" "}\n" "\n" "fn main() {\n" -" let load = WebEvent::PageLoad;\n" -" let press = WebEvent::KeyPress('x');\n" -" let click = WebEvent::Click { x: 20, y: 80 };\n" +" // TOTALLY UNSAFE. Rust provides no guarantees about the bitwise\n" +" // representation of types.\n" +" unsafe {\n" +" println!(\"Bitwise representation of bool\");\n" +" dbg_bits!(false, u8);\n" +" dbg_bits!(true, u8);\n" "\n" -" inspect(load);\n" -" inspect(press);\n" -" inspect(click);\n" +" println!(\"Bitwise representation of Option\");\n" +" dbg_bits!(None::, u8);\n" +" dbg_bits!(Some(false), u8);\n" +" dbg_bits!(Some(true), u8);\n" +"\n" +" println!(\"Bitwise representation of Option>\");\n" +" dbg_bits!(Some(Some(false)), u8);\n" +" dbg_bits!(Some(Some(true)), u8);\n" +" dbg_bits!(Some(None::), u8);\n" +" dbg_bits!(None::>, u8);\n" +"\n" +" println!(\"Bitwise representation of Option<&i32>\");\n" +" dbg_bits!(None::<&i32>, usize);\n" +" dbg_bits!(Some(&0i32), usize);\n" +" }\n" "}\n" "```" msgstr "" -#: src/enums/variant-payloads.md:35 +#: src/enums/sizes.md:105 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" -"* `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" -" " -msgstr "" - -#: src/enums/sizes.md:1 -msgid "# Enum Sizes" -msgstr "" - -#: src/enums/sizes.md:3 -msgid "Rust enums are packed tightly, taking constraints due to alignment into account:" +"More complex example if you want to discuss what happens when we chain more " +"than 256 `Option`s together." msgstr "" -#: src/enums/sizes.md:5 +#: src/enums/sizes.md:107 msgid "" "```rust,editable\n" -"use std::any::type_name;\n" -"use std::mem::{align_of, size_of};\n" +"#![recursion_limit = \"1000\"]\n" "\n" -"fn dbg_size() {\n" -" println!(\"{}: size {} bytes, align: {} bytes\",\n" -" type_name::(), size_of::(), align_of::());\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" +" };\n" "}\n" "\n" -"enum Foo {\n" -" A,\n" -" B,\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" +" ($value:expr, @) => {\n" +" Some(Some($value))\n" +" };\n" +" ($value:expr, @ $($more:tt)+) => {\n" +" many_options!(many_options!($value, $($more)+), $($more)+)\n" +" };\n" "}\n" "\n" "fn main() {\n" -" dbg_size::();\n" +" // TOTALLY UNSAFE. Rust provides no guarantees about the bitwise\n" +" // representation of types.\n" +" 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" +"\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" +" 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" +" dbg_bits!(many_options!(Some(false), @@@@@@@@), u16);\n" +" dbg_bits!(many_options!(Some(true), @@@@@@@@), u16);\n" +" dbg_bits!(many_options!(None::, @@@@@@@@), u16);\n" +" }\n" "}\n" "```" msgstr "" -#: src/enums/sizes.md:24 -msgid "* See the [Rust Reference](https://doc.rust-lang.org/reference/type-layout.html)." -msgstr "" - -#: src/enums/sizes.md:30 -msgid "" -" * 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" -" \n" -" ```rust,editable\n" -" #[repr(u32)]\n" -" enum Bar {\n" -" A, // 0\n" -" B = 10000,\n" -" C, // 10001\n" -" }\n" -" \n" -" fn main() {\n" -" println!(\"A: {}\", Bar::A as u32);\n" -" println!(\"B: {}\", Bar::B as u32);\n" -" println!(\"C: {}\", Bar::C as u32);\n" -" }\n" -" ```\n" -"\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" -"\n" -" * Niche optimization: Rust will merge 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" -" 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" -"\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" -" };\n" -" }\n" -"\n" -" fn main() {\n" -" // TOTALLY UNSAFE. Rust provides no guarantees about the bitwise\n" -" // representation of types.\n" -" unsafe {\n" -" println!(\"Bitwise representation of bool\");\n" -" dbg_bits!(false, u8);\n" -" dbg_bits!(true, u8);\n" -"\n" -" println!(\"Bitwise representation of Option\");\n" -" dbg_bits!(None::, u8);\n" -" dbg_bits!(Some(false), u8);\n" -" dbg_bits!(Some(true), u8);\n" -"\n" -" println!(\"Bitwise representation of Option>\");\n" -" dbg_bits!(Some(Some(false)), u8);\n" -" dbg_bits!(Some(Some(true)), u8);\n" -" dbg_bits!(Some(None::), u8);\n" -" dbg_bits!(None::>, u8);\n" -"\n" -" println!(\"Bitwise representation of Option<&i32>\");\n" -" dbg_bits!(None::<&i32>, usize);\n" -" dbg_bits!(Some(&0i32), usize);\n" -" }\n" -" }\n" -" ```\n" -"\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" -"\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" -" };\n" -" }\n" -"\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" -" ($value:expr, @) => {\n" -" Some(Some($value))\n" -" };\n" -" ($value:expr, @ $($more:tt)+) => {\n" -" many_options!(many_options!($value, $($more)+), $($more)+)\n" -" };\n" -" }\n" -"\n" -" fn main() {\n" -" // TOTALLY UNSAFE. Rust provides no guarantees about the bitwise\n" -" // representation of types.\n" -" 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" -"\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" -" 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" -" dbg_bits!(many_options!(Some(false), @@@@@@@@), u16);\n" -" dbg_bits!(many_options!(Some(true), @@@@@@@@), u16);\n" -" dbg_bits!(many_options!(None::, @@@@@@@@), u16);\n" -" }\n" -" }\n" -" ```" -msgstr "" - #: src/methods.md:3 msgid "" -"Rust allows you to associate functions with your new types. You do this with an\n" -"`impl` block:" +"Rust allows you to associate functions with your new types. You do this with " +"an `impl` block:" msgstr "" #: src/methods.md:6 @@ -5062,67 +5982,103 @@ msgid "" msgstr "" #: src/methods.md:31 +msgid "It can be helpful to introduce methods by comparing them to functions." +msgstr "" + +#: src/methods.md:32 +msgid "" +"Methods are called on an instance of a type (such as a struct or enum), the " +"first parameter represents the instance as `self`." +msgstr "" + +#: src/methods.md:33 +msgid "" +"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." +msgstr "" + +#: src/methods.md:34 +msgid "Point out the use of the keyword `self`, a method receiver." +msgstr "" + +#: src/methods.md:35 +msgid "" +"Show that it is an abbreviated term for `self: Self` and perhaps show how " +"the struct name could also be used." +msgstr "" + +#: src/methods.md:36 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" -"* 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" -"* We describe the distinction between method receivers next." +"Explain that `Self` is a type alias for the type the `impl` block is in and " +"can be used elsewhere in the block." msgstr "" -#: src/methods/receiver.md:1 -msgid "# Method Receiver" +#: src/methods.md:37 +msgid "" +"Note how `self` is used like other structs and dot notation can be used to " +"refer to individual fields." +msgstr "" + +#: src/methods.md:38 +msgid "" +"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." +msgstr "" + +#: src/methods.md:39 +msgid "We describe the distinction between method receivers next." msgstr "" #: src/methods/receiver.md:3 msgid "" -"The `&self` above indicates that the method borrows the object immutably. There\n" -"are other possible receivers for a method:" +"The `&self` above indicates that the method borrows the object immutably. " +"There are other possible receivers for a method:" msgstr "" #: src/methods/receiver.md:6 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" -" 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" -" when the method returns, unless its ownership is explicitly\n" -" transmitted. Complete ownership does not automatically mean mutability.\n" -"* `mut self`: same as above, but the method can mutate the object. \n" -"* No receiver: this becomes a static method on the struct. Typically used to\n" -" create constructors which are called `new` by convention." +"`&self`: borrows the object from the caller using a shared and immutable " +"reference. The object can be used again afterwards." msgstr "" -#: src/methods/receiver.md:18 +#: src/methods/receiver.md:8 msgid "" -"Beyond variants on `self`, there are also\n" -"[special wrapper types](https://doc.rust-lang.org/reference/special-types-and-traits.html)\n" -"allowed to be receiver types, such as `Box`." +"`&mut self`: borrows the object from the caller using a unique and mutable " +"reference. The object can be used again afterwards." msgstr "" -#: src/methods/receiver.md:24 +#: src/methods/receiver.md:10 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." +"`self`: takes ownership of the object and moves it away from the caller. The " +"method becomes the owner of the object. The object will be dropped " +"(deallocated) when the method returns, unless its ownership is explicitly " +"transmitted. Complete ownership does not automatically mean mutability." msgstr "" -#: src/methods/example.md:1 src/concurrency/shared_state/example.md:1 -msgid "# Example" +#: src/methods/receiver.md:14 +msgid "`mut self`: same as above, but the method can mutate the object. " +msgstr "" + +#: src/methods/receiver.md:15 +msgid "" +"No receiver: this becomes a static method on the struct. Typically used to " +"create constructors which are called `new` by convention." +msgstr "" + +#: src/methods/receiver.md:18 +msgid "" +"Beyond variants on `self`, there are also [special wrapper types](https://" +"doc.rust-lang.org/reference/special-types-and-traits.html) allowed to be " +"receiver types, such as `Box`." +msgstr "" + +#: src/methods/receiver.md:24 +msgid "" +"Consider emphasizing \"shared and immutable\" and \"unique and mutable\". " +"These constraints always come together in Rust due to borrow checker rules, " +"and `self` is no exception. It isn't possible to reference a struct from " +"multiple locations and call a mutating (`&mut self`) method on it." msgstr "" #: src/methods/example.md:3 @@ -5139,7 +6095,8 @@ 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" @@ -5152,7 +6109,8 @@ 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" @@ -5170,26 +6128,38 @@ msgid "" msgstr "" #: src/methods/example.md:47 +msgid "All four methods here use a different method receiver." +msgstr "" + +#: src/methods/example.md:48 +msgid "" +"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`." +msgstr "" + +#: src/methods/example.md:49 +msgid "" +"You can showcase the error that appears when trying to call `finish` twice." +msgstr "" + +#: src/methods/example.md:50 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. " +"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." msgstr "" -#: src/pattern-matching.md:1 -msgid "# Pattern Matching" +#: src/methods/example.md:51 +msgid "" +"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:3 msgid "" -"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." +"The `match` keyword let you match a value against one or more _patterns_. " +"The comparisons are done from top to bottom and the first match wins." msgstr "" #: src/pattern-matching.md:6 @@ -5218,27 +6188,47 @@ msgstr "" #: src/pattern-matching.md:26 msgid "" -"* 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" -"* 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" -" " +"You might point out how some specific characters are being used when in a " +"pattern" +msgstr "" + +#: src/pattern-matching.md:27 +msgid "`|` as an `or`" +msgstr "" + +#: src/pattern-matching.md:28 +msgid "`..` can expand as much as it needs to be" +msgstr "" + +#: src/pattern-matching.md:29 +msgid "`1..=5` represents an inclusive range" +msgstr "" + +#: src/pattern-matching.md:30 +msgid "`_` is a wild card" +msgstr "" + +#: src/pattern-matching.md:31 +msgid "" +"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`." msgstr "" -#: src/pattern-matching/destructuring-enums.md:1 -msgid "# Destructuring Enums" +#: src/pattern-matching.md:32 +msgid "You can demonstrate matching on a reference." +msgstr "" + +#: src/pattern-matching.md:33 +msgid "" +"This might be a good time to bring up the concept of irrefutable patterns, " +"as the term can show up in error messages." 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 you inspect the structure of your types. Let us start with a simple " +"`enum` type:" msgstr "" #: src/pattern-matching/destructuring-enums.md:6 @@ -5269,21 +6259,22 @@ 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" -"`msg` is bound to the error message." +"Here we have used the arms to _destructure_ the `Result` value. In the first " +"arm, `half` is bound to the value inside the `Ok` variant. In the second " +"arm, `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`." msgstr "" -#: src/pattern-matching/destructuring-structs.md:1 -msgid "# Destructuring Structs" +#: src/pattern-matching/destructuring-enums.md:37 +msgid "" +"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:3 @@ -5304,27 +6295,31 @@ 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" "```" msgstr "" #: src/pattern-matching/destructuring-structs.md:23 -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" -" doesn't work. Change it to a `const` and see it working again." +msgid "Change the literal values in `foo` to match with the other patterns." +msgstr "" + +#: src/pattern-matching/destructuring-structs.md:24 +msgid "Add a new field to `Foo` and make changes to the pattern as needed." msgstr "" -#: src/pattern-matching/destructuring-arrays.md:1 -msgid "# Destructuring Arrays" +#: src/pattern-matching/destructuring-structs.md:25 +msgid "" +"The distinction between a capture and a constant expression can be hard to " +"spot. Try changing the `2` in the second arm to a variable, and see that it " +"subtly doesn't work. Change it to a `const` and see it working again." 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 @@ -5345,40 +6340,52 @@ msgstr "" #: src/pattern-matching/destructuring-arrays.md:21 msgid "" -"* Destructuring of slices of unknown length also works with patterns of fixed length.\n" -"\n" -"\n" -" ```rust,editable\n" -" fn main() {\n" -" inspect(&[0, -2, 3]);\n" -" inspect(&[0, -2, 3, 4]);\n" -" }\n" +"Destructuring of slices of unknown length also works with patterns of fixed " +"length." +msgstr "" + +#: src/pattern-matching/destructuring-arrays.md:24 +msgid "" +"```rust,editable\n" +"fn main() {\n" +" inspect(&[0, -2, 3]);\n" +" inspect(&[0, -2, 3, 4]);\n" +"}\n" "\n" -" #[rustfmt::skip]\n" -" fn inspect(slice: &[i32]) {\n" -" 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" -" _ => println!(\"All elements were ignored\"),\n" -" }\n" -" }\n" -" ```\n" -" \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" -"* Show matching against the tail with patterns `[.., b]` and `[a@..,b]`" +"#[rustfmt::skip]\n" +"fn inspect(slice: &[i32]) {\n" +" 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" +" _ => println!(\"All elements were ignored\"),\n" +" }\n" +"}\n" +"```" +msgstr "" + +#: src/pattern-matching/destructuring-arrays.md:41 +msgid "Create a new pattern using `_` to represent an element. " +msgstr "" + +#: src/pattern-matching/destructuring-arrays.md:42 +msgid "Add more values to the array." +msgstr "" + +#: src/pattern-matching/destructuring-arrays.md:43 +msgid "" +"Point out that how `..` will expand to account for different number of " +"elements." msgstr "" -#: src/pattern-matching/match-guards.md:1 -msgid "# Match Guards" +#: src/pattern-matching/destructuring-arrays.md:44 +msgid "Show matching against the tail with patterns `[.., b]` and `[a@..,b]`" 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" -"expression which will be executed if the pattern matches:" +"When matching, you can add a _guard_ to a pattern. This is an arbitrary " +"Boolean expression which will be executed if the pattern matches:" msgstr "" #: src/pattern-matching/match-guards.md:6 @@ -5400,18 +6407,31 @@ 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" -"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 `|`." +"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." +msgstr "" + +#: src/pattern-matching/match-guards.md:24 +msgid "" +"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 of the original `match` expression being considered." +msgstr "" + +#: src/pattern-matching/match-guards.md:26 +msgid "You can use the variables defined in the pattern in your if expression." +msgstr "" + +#: src/pattern-matching/match-guards.md:27 +msgid "" +"The condition defined in the guard applies to every expression in a pattern " +"with an `|`." msgstr "" #: src/exercises/day-2/morning.md:1 -msgid "# Day 2: Morning Exercises" +msgid "Day 2: Morning Exercises" msgstr "" #: src/exercises/day-2/morning.md:3 @@ -5419,32 +6439,29 @@ msgid "We will look at implementing methods in two contexts:" msgstr "" #: src/exercises/day-2/morning.md:5 -msgid "" -"* Simple struct which tracks health statistics.\n" -"\n" -"* Multiple structs and enums for a drawing library." +msgid "Simple struct which tracks health statistics." msgstr "" -#: src/exercises/day-2/health-statistics.md:1 -msgid "# Health Statistics" +#: src/exercises/day-2/morning.md:7 +msgid "Multiple structs and enums for a drawing library." 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" -"need to keep track of users' health statistics." +"You're working on implementing a health-monitoring system. As part of that, " +"you 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" -"struct definition. Your goal is to implement the stubbed out methods on the\n" -"`User` `struct` defined in the `impl` block." +"You'll start with some stubbed functions in an `impl` block as well as a " +"`User` struct definition. Your goal is to implement the stubbed out methods " +"on the `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 " "methods:" msgstr "" @@ -5503,7 +6520,8 @@ msgid "" " unimplemented!()\n" " }\n" "\n" -" pub fn visit_doctor(&mut self, measurements: Measurements) -> HealthReport {\n" +" pub fn visit_doctor(&mut self, measurements: Measurements) -> " +"HealthReport {\n" " unimplemented!()\n" " }\n" "}\n" @@ -5551,14 +6569,14 @@ msgid "" msgstr "" #: src/exercises/day-2/points-polygons.md:1 -msgid "# Polygon Struct" +msgid "Polygon Struct" 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" -"tests pass:" +"We will create a `Polygon` struct which contain some points. Copy the code " +"below to and fill in the missing methods to " +"make the tests pass:" msgstr "" #: src/exercises/day-2/points-polygons.md:7 @@ -5674,8 +6692,9 @@ 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 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 @@ -5684,33 +6703,28 @@ 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." msgstr "" -#: src/control-flow.md:1 -msgid "# Control Flow" +#: src/exercises/day-2/points-polygons.md:123 +msgid "" +"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: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" -"in Rust." -msgstr "" - -#: src/control-flow/blocks.md:1 -msgid "# Blocks" +"As we have seen, `if` is an expression in Rust. It is used to conditionally " +"evaluate one of two blocks, but the blocks can have a value which then " +"becomes the value of the `if` expression. Other control flow expressions " +"work similarly in Rust." msgstr "" #: src/control-flow/blocks.md:3 msgid "" -"A block in Rust contains a sequence of expressions.\n" -"Each block has a value and a type,\n" -"which are those of the last expression of the block:" +"A block in Rust contains a sequence of expressions. Each block has a value " +"and a type, which are those of the last expression of the block:" msgstr "" #: src/control-flow/blocks.md:7 @@ -5736,12 +6750,14 @@ msgid "" msgstr "" #: src/control-flow/blocks.md:26 -msgid "If the last expression ends with `;`, then the resulting value and type is `()`." +msgid "" +"If the last expression ends with `;`, then the resulting value and type is " +"`()`." msgstr "" #: src/control-flow/blocks.md:28 msgid "" -"The same rule is used for functions: the value of the function body is the\n" +"The same rule is used for functions: the value of the function body is the " "return value:" msgstr "" @@ -5760,21 +6776,24 @@ msgstr "" #: src/control-flow/blocks.md:44 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. " +msgstr "" + +#: src/control-flow/blocks.md:45 +msgid "" +"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`." msgstr "" #: src/control-flow/if-expressions.md:1 -msgid "# `if` expressions" +msgid "`if` expressions" 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" -"exactly like `if` statements in other languages:" +"You use [`if` expressions](https://doc.rust-lang.org/reference/expressions/" +"if-expr.html#if-expressions) exactly like `if` statements in other languages:" msgstr "" #: src/control-flow/if-expressions.md:7 @@ -5793,7 +6812,7 @@ msgstr "" #: src/control-flow/if-expressions.md:18 msgid "" -"In addition, you can use `if` as an expression. The last expression of each\n" +"In addition, you can use `if` as an expression. The last expression of each " "block becomes the value of the `if` expression:" msgstr "" @@ -5813,19 +6832,20 @@ 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 -msgid "# `if let` expressions" +msgid "`if let` expressions" 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:" +"The [`if let` expression](https://doc.rust-lang.org/reference/expressions/if-" +"expr.html#if-let-expressions) lets you execute different code depending on " +"whether a value matches a pattern:" msgstr "" #: src/control-flow/if-let-expressions.md:7 @@ -5842,46 +6862,62 @@ 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" -"Rust." +"See [pattern matching](../pattern-matching.md) for more details on patterns " +"in Rust." msgstr "" #: src/control-flow/if-let-expressions.md:23 msgid "" -"* Unlike `match`, `if let` does not have to cover all branches. This can make it more concise than " -"`match`.\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, execute a block which is " -"required to abort normal control flow (with `panic`/`return`/`break`/`continue`):\n" -"\n" -" ```rust,editable\n" -" fn main() {\n" -" println!(\"{:?}\", second_word_to_upper(\"foo bar\"));\n" -" }\n" -" \n" -" fn second_word_to_upper(s: &str) -> Option {\n" -" let mut it = s.split(' ');\n" -" let (Some(_), Some(item)) = (it.next(), it.next()) else {\n" -" return None;\n" -" };\n" -" Some(item.to_uppercase())\n" -" }" +"Unlike `match`, `if let` does not have to cover all branches. This can make " +"it more concise than `match`." +msgstr "" + +#: src/control-flow/if-let-expressions.md:24 +msgid "A common usage is handling `Some` values when working with `Option`." +msgstr "" + +#: src/control-flow/if-let-expressions.md:25 +msgid "" +"Unlike `match`, `if let` does not support guard clauses for pattern matching." +msgstr "" + +#: src/control-flow/if-let-expressions.md:26 +msgid "" +"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, execute a block which is required to abort " +"normal control flow (with `panic`/`return`/`break`/`continue`):" +msgstr "" + +#: src/control-flow/if-let-expressions.md:28 +msgid "" +"```rust,editable\n" +"fn main() {\n" +" println!(\"{:?}\", second_word_to_upper(\"foo bar\"));\n" +"}\n" +" \n" +"fn second_word_to_upper(s: &str) -> Option {\n" +" let mut it = s.split(' ');\n" +" let (Some(_), Some(item)) = (it.next(), it.next()) else {\n" +" return None;\n" +" };\n" +" Some(item.to_uppercase())\n" +"}\n" +"```" msgstr "" #: src/control-flow/while-expressions.md:1 -msgid "# `while` loops" +msgid "`while` loops" 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" -"works very similar to other languages:" +"The [`while` keyword](https://doc.rust-lang.org/reference/expressions/loop-" +"expr.html#predicate-loops) works very similar to other languages:" msgstr "" #: src/control-flow/while-expressions.md:6 @@ -5902,14 +6938,14 @@ msgid "" msgstr "" #: src/control-flow/while-let-expressions.md:1 -msgid "# `while let` loops" +msgid "`while let` loops" 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" -"variant which repeatedly tests a value against a pattern:" +"Like with `if let`, there is a [`while let`](https://doc.rust-lang.org/" +"reference/expressions/loop-expr.html#predicate-pattern-loops) variant which " +"repeatedly tests a value against a pattern:" msgstr "" #: src/control-flow/while-let-expressions.md:6 @@ -5928,28 +6964,33 @@ msgstr "" #: src/control-flow/while-let-expressions.md:17 msgid "" -"Here the iterator returned by `v.into_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." +"Here the iterator returned by `v.into_iter()` will return a `Option` on " +"every call to `next()`. It returns `Some(x)` until it is done, after which " +"it will 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." +msgstr "" + +#: src/control-flow/while-let-expressions.md:27 +msgid "" +"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." msgstr "" #: src/control-flow/for-expressions.md:1 -msgid "# `for` loops" +msgid "`for` loops" msgstr "" #: src/control-flow/for-expressions.md:3 msgid "" -"The [`for` loop](https://doc.rust-lang.org/std/keyword.for.html) is closely\n" -"related to the [`while let` loop](while-let-expressions.md). It will\n" +"The [`for` loop](https://doc.rust-lang.org/std/keyword.for.html) is closely " +"related to the [`while let` loop](while-let-expressions.md). It will " "automatically call `into_iter()` on the expression and then iterate over it:" msgstr "" @@ -5975,23 +7016,33 @@ msgid "You can use `break` and `continue` here as usual." msgstr "" #: src/control-flow/for-expressions.md:25 +msgid "Index iteration is not a special syntax in Rust for just that case." +msgstr "" + +#: src/control-flow/for-expressions.md:26 +msgid "`(0..10)` is a range that implements an `Iterator` trait. " +msgstr "" + +#: src/control-flow/for-expressions.md:27 +msgid "" +"`step_by` is a method that returns another `Iterator` that skips every other " +"element. " +msgstr "" + +#: src/control-flow/for-expressions.md:28 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()`." +"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 -msgid "# `loop` expressions" +msgid "`loop` expressions" 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" -"which creates an endless loop." +"Finally, there is a [`loop` keyword](https://doc.rust-lang.org/reference/" +"expressions/loop-expr.html#infinite-loops) which creates an endless loop." msgstr "" #: src/control-flow/loop-expressions.md:6 @@ -6019,22 +7070,25 @@ msgid "" msgstr "" #: src/control-flow/loop-expressions.md:27 +msgid "Break the `loop` with a value (e.g. `break 8`) and print it out." +msgstr "" + +#: src/control-flow/loop-expressions.md:28 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" -" `while` and `for` loops)." +"Note that `loop` is the only looping construct which returns a non-trivial " +"value. This is because it's guaranteed to be entered at least once (unlike " +"`while` and `for` loops)." msgstr "" #: src/control-flow/match-expressions.md:1 -msgid "# `match` expressions" +msgid "`match` expressions" 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" -"like a series of `if let` expressions:" +"The [`match` keyword](https://doc.rust-lang.org/reference/expressions/match-" +"expr.html) is used to match a value against one or more patterns. In that " +"sense, it works like a series of `if let` expressions:" msgstr "" #: src/control-flow/match-expressions.md:7 @@ -6055,37 +7109,55 @@ msgstr "" #: src/control-flow/match-expressions.md:20 msgid "" -"Like `if let`, each match arm must have the same type. The type is the last\n" +"Like `if let`, each match arm must have the same type. The type is the last " "expression of the block, if any. In the example above, the type is `()`." msgstr "" #: src/control-flow/match-expressions.md:28 +msgid "Save the match expression to a variable and print it out." +msgstr "" + +#: src/control-flow/match-expressions.md:29 +msgid "Remove `.as_deref()` and explain the error." +msgstr "" + +#: src/control-flow/match-expressions.md:30 +msgid "" +"`std::env::args().next()` returns an `Option`, but we cannot match " +"against `String`." +msgstr "" + +#: src/control-flow/match-expressions.md:31 +msgid "" +"`as_deref()` transforms an `Option` to `Option<&T::Target>`. In our case, " +"this turns `Option` into `Option<&str>`." +msgstr "" + +#: src/control-flow/match-expressions.md:32 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`." +"We can now use pattern matching to match against the `&str` inside `Option`." msgstr "" #: src/control-flow/break-continue.md:1 -msgid "# `break` and `continue`" +msgid "`break` and `continue`" 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 immediately start\n" -"the next iteration use [`continue`](https://doc.rust-lang.org/reference/expressions/loop-expr." -"html#continue-expressions)." +"If you want to exit a loop early, use [`break`](https://doc.rust-lang.org/" +"reference/expressions/loop-expr.html#break-expressions)," +msgstr "" + +#: src/control-flow/break-continue.md:4 +msgid "" +"If you want to immediately start 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" -"to break out of nested loops:" +"Both `continue` and `break` can optionally take a label argument which is " +"used to break out of nested loops:" msgstr "" #: src/control-flow/break-continue.md:10 @@ -6109,53 +7181,77 @@ 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." +#: src/control-flow/break-continue.md:28 +msgid "" +"In this case we break the outer loop after 3 iterations of the inner loop." +msgstr "" + +#: src/std.md:3 +msgid "" +"Rust comes with a standard library which helps establish a set of common " +"types used by Rust library and programs. This way, two libraries can work " +"together smoothly because they both use the same `String` type." +msgstr "" + +#: src/std.md:7 +msgid "The common vocabulary types include:" +msgstr "" + +#: src/std.md:9 +msgid "" +"[`Option` and `Result`](std/option-result.md) types: used for optional " +"values and [error handling](error-handling.md)." +msgstr "" + +#: src/std.md:12 +msgid "[`String`](std/string.md): the default string type used for owned data." msgstr "" -#: src/std.md:1 -msgid "# Standard Library" +#: src/std.md:14 +msgid "[`Vec`](std/vec.md): a standard extensible vector." msgstr "" -#: src/std.md:3 +#: src/std.md:16 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" -"smoothly because they both use the same `String` type." +"[`HashMap`](std/hashmap.md): a hash map type with a configurable hashing " +"algorithm." msgstr "" -#: src/std.md:7 -msgid "The common vocabulary types include:" +#: src/std.md:19 +msgid "[`Box`](std/box.md): an owned pointer for heap-allocated data." msgstr "" -#: src/std.md:9 +#: src/std.md:21 msgid "" -"* [`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" -"\n" -"* [`Vec`](std/vec.md): a standard extensible vector.\n" -"\n" -"* [`HashMap`](std/hashmap.md): a hash map type with a configurable hashing\n" -" algorithm.\n" -"\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" -" even the presence of an operating system. \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`." +"In fact, Rust contains several layers of the Standard Library: `core`, " +"`alloc` and `std`. " +msgstr "" + +#: src/std.md:26 +msgid "" +"`core` includes the most basic types and functions that don't depend on " +"`libc`, allocator or even the presence of an operating system. " +msgstr "" + +#: src/std.md:28 +msgid "" +"`alloc` includes types which require a global heap allocator, such as `Vec`, " +"`Box` and `Arc`." +msgstr "" + +#: src/std.md:29 +msgid "" +"Embedded Rust applications often only use `core`, and sometimes `alloc`." msgstr "" #: src/std/option-result.md:1 -msgid "# `Option` and `Result`" +msgid "`Option` and `Result`" msgstr "" #: src/std/option-result.md:3 @@ -6177,21 +7273,37 @@ msgid "" msgstr "" #: src/std/option-result.md:18 +msgid "`Option` and `Result` are widely used not just in the standard library." +msgstr "" + +#: src/std/option-result.md:19 +msgid "`Option<&T>` has zero space overhead compared to `&T`." +msgstr "" + +#: src/std/option-result.md:20 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" -"* `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." +"`Result` is the standard type to implement error handling as we will see on " +"Day 3." +msgstr "" + +#: src/std/option-result.md:21 +msgid "`binary_search` returns `Result`." msgstr "" -#: src/std/string.md:1 -msgid "# String" +#: src/std/option-result.md:22 +msgid "If found, `Result::Ok` holds the index where the element is found." +msgstr "" + +#: src/std/option-result.md:23 +msgid "" +"Otherwise, `Result::Err` contains the index where such an element should be " +"inserted." msgstr "" #: src/std/string.md:3 -msgid "[`String`][1] is the standard heap-allocated growable UTF-8 string buffer:" +msgid "" +"[`String`](https://doc.rust-lang.org/std/string/struct.String.html) is the " +"standard heap-allocated growable UTF-8 string buffer:" msgstr "" #: src/std/string.md:5 @@ -6216,38 +7328,84 @@ msgstr "" #: src/std/string.md:22 msgid "" -"`String` implements [`Deref`][2], which means that you can call all\n" -"`str` methods on a `String`." +"`String` implements [`Deref`](https://doc.rust-lang.org/std/" +"string/struct.String.html#deref-methods-str), which means that you can call " +"all `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" -" * 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" -"* 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." +"`String::new` returns a new empty string, use `String::with_capacity` when " +"you know how much data you want to push to the string." +msgstr "" + +#: src/std/string.md:31 +msgid "" +"`String::len` returns the size of the `String` in bytes (which can be " +"different from its length in characters)." +msgstr "" + +#: src/std/string.md:32 +msgid "" +"`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)." +msgstr "" + +#: src/std/string.md:33 +msgid "" +"When people refer to strings they could either be talking about `&str` or " +"`String`." +msgstr "" + +#: src/std/string.md:34 +msgid "" +"When a type implements `Deref`, the compiler will let you " +"transparently call methods from `T`." +msgstr "" + +#: src/std/string.md:35 +msgid "" +"`String` implements `Deref` which transparently gives it " +"access to `str`'s methods." +msgstr "" + +#: src/std/string.md:36 +msgid "Write and compare `let s3 = s1.deref();` and `let s3 = &*s1`;." +msgstr "" + +#: src/std/string.md:37 +msgid "" +"`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." +msgstr "" + +#: src/std/string.md:38 +msgid "Compare the different ways to index a `String`:" +msgstr "" + +#: src/std/string.md:39 +msgid "" +"To a character by using `s3.chars().nth(i).unwrap()` where `i` is in-bound, " +"out-of-bounds." +msgstr "" + +#: src/std/string.md:40 +msgid "" +"To a substring by using `s3[0..4]`, where that slice is on character " +"boundaries or not." msgstr "" #: src/std/vec.md:1 -msgid "# `Vec`" +msgid "`Vec`" msgstr "" #: src/std/vec.md:3 -msgid "[`Vec`][1] is the standard resizable heap-allocated buffer:" +msgid "" +"[`Vec`](https://doc.rust-lang.org/std/vec/struct.Vec.html) is the standard " +"resizable heap-allocated buffer:" msgstr "" #: src/std/vec.md:5 @@ -6279,27 +7437,46 @@ msgstr "" #: src/std/vec.md:29 msgid "" -"`Vec` implements [`Deref`][2], which means that you can call slice\n" +"`Vec` implements [`Deref`](https://doc.rust-lang.org/std/vec/" +"struct.Vec.html#deref-methods-%5BT%5D), which means that you can call slice " "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" -" 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" -" 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" -"* Show iterating over a vector and mutating the value:\n" -" `for e in &mut v { *e += 50; }`" +"`Vec` is a type of collection, along with `String` and `HashMap`. The data " +"it contains is stored on the heap. This means the amount of data doesn't " +"need to be known at compile time. It can grow or shrink at runtime." +msgstr "" + +#: src/std/vec.md:40 +msgid "" +"Notice how `Vec` is a generic type too, but you don't have to specify `T` " +"explicitly. As always with Rust type inference, the `T` was established " +"during the first `push` call." msgstr "" -#: src/std/hashmap.md:1 -msgid "# `HashMap`" +#: src/std/vec.md:42 +msgid "" +"`vec![...]` is a canonical macro to use instead of `Vec::new()` and it " +"supports adding initial elements to the vector." +msgstr "" + +#: src/std/vec.md:44 +msgid "" +"To index the vector you use `[` `]`, but they will panic if out of bounds. " +"Alternatively, using `get` will return an `Option`. The `pop` function will " +"remove the last element." +msgstr "" + +#: src/std/vec.md:46 +msgid "" +"Show iterating over a vector and mutating the value: `for e in &mut v { *e " +"+= 50; }`" +msgstr "" + +#: src/std/hashmap.md:1 src/bare-metal/no_std.md:46 +msgid "`HashMap`" msgstr "" #: src/std/hashmap.md:3 @@ -6313,7 +7490,8 @@ 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" @@ -6322,7 +7500,8 @@ 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" @@ -6330,8 +7509,10 @@ 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" @@ -6342,44 +7523,77 @@ 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" -"\n" -" ```rust,ignore\n" -" let pc1 = page_counts\n" -" .get(\"Harry Potter and the Sorcerer's Stone \")\n" -" .unwrap_or(&336);\n" -" let pc2 = page_counts\n" -" .entry(\"The Hunger Games\".to_string())\n" -" .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" -"\n" -" ```rust,ignore\n" -" let page_counts = HashMap::from([\n" -" (\"Harry Potter and the Sorcerer's Stone\".to_string(), 336),\n" -" (\"The Hunger Games\".to_string(), 374),\n" -" ]);\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" -" 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?" +"`HashMap` is not defined in the prelude and needs to be brought into scope." +msgstr "" + +#: src/std/hashmap.md:39 +msgid "" +"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." +msgstr "" + +#: src/std/hashmap.md:41 +msgid "" +"```rust,ignore\n" +" let pc1 = page_counts\n" +" .get(\"Harry Potter and the Sorcerer's Stone \")\n" +" .unwrap_or(&336);\n" +" let pc2 = page_counts\n" +" .entry(\"The Hunger Games\".to_string())\n" +" .or_insert(374);\n" +"```" +msgstr "" + +#: src/std/hashmap.md:49 +msgid "Unlike `vec!`, there is unfortunately no standard `hashmap!` macro." +msgstr "" + +#: src/std/hashmap.md:50 +msgid "" +"Although, since Rust 1.56, HashMap implements [`From<[(K, V); N]>`](https://" +"doc.rust-lang.org/std/collections/hash_map/struct.HashMap.html#impl-" +"From%3C%5B(K,+V);+N%5D%3E-for-HashMap%3CK,+V,+RandomState%3E), which allows " +"us to easily initialize a hash map from a literal array:" +msgstr "" + +#: src/std/hashmap.md:52 +msgid "" +"```rust,ignore\n" +" let page_counts = HashMap::from([\n" +" (\"Harry Potter and the Sorcerer's Stone\".to_string(), 336),\n" +" (\"The Hunger Games\".to_string(), 374),\n" +" ]);\n" +"```" +msgstr "" + +#: src/std/hashmap.md:59 +msgid "" +"Alternatively HashMap can be built from any `Iterator` which yields key-" +"value tuples." +msgstr "" + +#: src/std/hashmap.md:60 +msgid "" +"We are showing `HashMap`, and avoid using `&str` as key to make " +"examples easier. Using references in collections can, of course, be done, " +"but it can lead into complications with the borrow checker." +msgstr "" + +#: src/std/hashmap.md:62 +msgid "" +"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 -msgid "# `Box`" +msgid "`Box`" msgstr "" #: src/std/box.md:3 -msgid "[`Box`][1] is an owned pointer to data on the heap:" +msgid "" +"[`Box`](https://doc.rust-lang.org/std/boxed/struct.Box.html) is an owned " +"pointer to data on the heap:" msgstr "" #: src/std/box.md:5 @@ -6410,28 +7624,47 @@ msgstr "" #: src/std/box.md:26 msgid "" -"`Box` implements `Deref`, which means that you can [call methods\n" -"from `T` directly on a `Box`][2]." +"`Box` implements `Deref`, which means that you can [call " +"methods from `T` directly on a `Box`](https://doc.rust-lang.org/std/ops/" +"trait.Deref.html#more-on-deref-coercion)." 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" -"* 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." +"`Box` is like `std::unique_ptr` in C++, except that it's guaranteed to be " +"not null. " +msgstr "" + +#: src/std/box.md:35 +msgid "" +"In the above example, you can even leave out the `*` in the `println!` " +"statement thanks to `Deref`. " +msgstr "" + +#: src/std/box.md:36 +msgid "A `Box` can be useful when you:" +msgstr "" + +#: src/std/box.md:37 +msgid "" +"have a type whose size that can't be known at compile time, but the Rust " +"compiler wants to know an exact size." +msgstr "" + +#: src/std/box.md:38 +msgid "" +"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 -msgid "# Box with Recursive Data Structures" +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 @@ -6444,7 +7677,8 @@ 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" "```" @@ -6454,40 +7688,47 @@ 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 `Box` was not used 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 (`List` would be of infinite " -"size).\n" -"\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" -" " +"If `Box` was not used and we attempted to embed a `List` directly into the " +"`List`, the compiler would not compute a fixed size of the struct in memory " +"(`List` would be of infinite size)." +msgstr "" + +#: src/std/box-recursive.md:36 +msgid "" +"`Box` solves this problem as it has the same size as a regular pointer and " +"just points at the next element of the `List` in the heap." msgstr "" -#: src/std/box-niche.md:1 -msgid "# Niche Optimization" +#: src/std/box-recursive.md:39 +msgid "" +"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." 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 " "allows the compiler to optimize the memory layout:" msgstr "" @@ -6495,26 +7736,33 @@ 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 "" #: src/std/rc.md:1 -msgid "# `Rc`" +msgid "`Rc`" msgstr "" #: src/std/rc.md:3 msgid "" -"[`Rc`][1] is a reference-counted shared pointer. Use this when you need to refer\n" -"to the same data from multiple places:" +"[`Rc`](https://doc.rust-lang.org/std/rc/struct.Rc.html) is a reference-" +"counted shared pointer. Use this when you need to refer to the same data " +"from multiple places:" msgstr "" #: src/std/rc.md:6 @@ -6534,29 +7782,62 @@ 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" -" a type such as [`Cell` or `RefCell`][2].\n" -"* See [`Arc`][3] and [`Mutex`][4] if you are in a multi-threaded context.\n" -"* You can *downgrade* a shared pointer into a [`Weak`][5] pointer to create cycles\n" -" that will get dropped." +"If you need to mutate the data inside an `Rc`, you will need to wrap the " +"data in a type such as [`Cell` or `RefCell`](../concurrency/shared_state/arc." +"md)." +msgstr "" + +#: src/std/rc.md:20 +msgid "" +"See [`Arc`](https://doc.rust-lang.org/std/sync/struct.Mutex.html) and " +"[`Mutex`](https://doc.rust-lang.org/std/rc/struct.Weak.html) if you are in a " +"multi-threaded context." +msgstr "" + +#: src/std/rc.md:21 +msgid "" +"You can _downgrade_ a shared pointer into a \\[`Weak`\\]\\[5\\] pointer to " +"create cycles that will get dropped." msgstr "" #: src/std/rc.md:32 msgid "" -"* `Rc`'s count ensures that its contained value is valid for as long as there are references.\n" -"* `Rc` in Rust is like `std::shared_ptr` in C++.\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" -"* `Rc::downgrade` gives you a *weakly reference-counted* object to\n" -" create cycles that will be dropped properly (likely in combination with\n" -" `RefCell`)." +"`Rc`'s count ensures that its contained value is valid for as long as there " +"are references." +msgstr "" + +#: src/std/rc.md:33 +msgid "`Rc` in Rust is like `std::shared_ptr` in C++." +msgstr "" + +#: src/std/rc.md:34 +msgid "" +"`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." +msgstr "" + +#: src/std/rc.md:35 +msgid "" +"`make_mut` actually clones the inner value if necessary (\"clone-on-write\") " +"and returns a mutable reference." +msgstr "" + +#: src/std/rc.md:36 +msgid "Use `Rc::strong_count` to check the reference count." +msgstr "" + +#: src/std/rc.md:37 +msgid "" +"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." +msgstr "" + +#: src/std/rc.md:38 +msgid "" +"`Rc::downgrade` gives you a _weakly reference-counted_ object to create " +"cycles that will be dropped properly (likely in combination with `RefCell`)." msgstr "" #: src/std/rc.md:42 @@ -6590,10 +7871,6 @@ msgid "" "```" msgstr "" -#: src/modules.md:1 -msgid "# Modules" -msgstr "" - #: src/modules.md:3 msgid "We have seen how `impl` blocks let us namespace functions to a type." msgstr "" @@ -6626,15 +7903,18 @@ 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" -"* Modules define organization, scope, and are the focus of this section." +"Packages provide functionality and include a `Cargo.toml` file that " +"describes how to build a bundle of 1+ crates." +msgstr "" + +#: src/modules.md:29 +msgid "" +"Crates are a tree of modules, where a binary crate creates an executable and " +"a library crate compiles to a library." msgstr "" -#: src/modules/visibility.md:1 -msgid "# Visibility" +#: src/modules.md:30 +msgid "Modules define organization, scope, and are the focus of this section." msgstr "" #: src/modules/visibility.md:3 @@ -6642,11 +7922,17 @@ msgid "Modules are a privacy boundary:" msgstr "" #: src/modules/visibility.md:5 +msgid "Module items are private by default (hides implementation details)." +msgstr "" + +#: src/modules/visibility.md:6 +msgid "Parent and sibling items are always visible." +msgstr "" + +#: src/modules/visibility.md:7 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" -" descendants of `foo`." +"In other words, if an item is visible in module `foo`, it's visible in all " +"the descendants of `foo`." msgstr "" #: src/modules/visibility.md:10 @@ -6680,25 +7966,33 @@ msgid "" msgstr "" #: src/modules/visibility.md:39 -msgid "* Use the `pub` keyword to make modules public." +msgid "Use the `pub` keyword to make modules public." 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" -"* 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)." +"See the [Rust Reference](https://doc.rust-lang.org/reference/visibility-and-" +"privacy.html#pubin-path-pubcrate-pubsuper-and-pubself)." +msgstr "" + +#: src/modules/visibility.md:44 +msgid "Configuring `pub(crate)` visibility is a common pattern." msgstr "" -#: src/modules/paths.md:1 -msgid "# Paths" +#: src/modules/visibility.md:45 +msgid "Less commonly, you can give visibility to a specific path." +msgstr "" + +#: src/modules/visibility.md:46 +msgid "" +"In any case, visibility must be granted to an ancestor module (and all of " +"its descendants)." msgstr "" #: src/modules/paths.md:3 @@ -6706,20 +8000,33 @@ msgid "Paths are resolved as follows:" msgstr "" #: src/modules/paths.md:5 -msgid "" -"1. As a relative path:\n" -" * `foo` or `self::foo` refers to `foo` in the current module,\n" -" * `super::foo` refers to `foo` in the parent module.\n" -"\n" -"2. As an absolute path:\n" -" * `crate::foo` refers to `foo` in the root of the current crate,\n" -" * `bar::foo` refers to `foo` in the `bar` crate." +msgid "As a relative path:" +msgstr "" + +#: src/modules/paths.md:6 +msgid "`foo` or `self::foo` refers to `foo` in the current module," +msgstr "" + +#: src/modules/paths.md:7 +msgid "`super::foo` refers to `foo` in the parent module." +msgstr "" + +#: src/modules/paths.md:9 +msgid "As an absolute path:" +msgstr "" + +#: src/modules/paths.md:10 +msgid "`crate::foo` refers to `foo` in the root of the current crate," +msgstr "" + +#: src/modules/paths.md:11 +msgid "`bar::foo` refers to `foo` in the `bar` crate." msgstr "" #: src/modules/paths.md:13 msgid "" -"A module can bring symbols from another module into scope with `use`.\n" -"You will typically see something like this at the top of each module:" +"A module can bring symbols from another module into scope with `use`. You " +"will typically see something like this at the top of each module:" msgstr "" #: src/modules/paths.md:16 @@ -6730,12 +8037,9 @@ msgid "" "```" msgstr "" -#: src/modules/filesystem.md:1 -msgid "# Filesystem Hierarchy" -msgstr "" - #: src/modules/filesystem.md:3 -msgid "Omitting the module content will tell Rust to look for it in another file:" +msgid "" +"Omitting the module content will tell Rust to look for it in another file:" msgstr "" #: src/modules/filesystem.md:5 @@ -6747,8 +8051,9 @@ msgstr "" #: src/modules/filesystem.md:9 msgid "" -"This tells rust that the `garden` module content is found at `src/garden.rs`.\n" -"Similarly, a `garden::vegetables` module can be found at `src/garden/vegetables.rs`." +"This tells rust that the `garden` module content is found at `src/garden." +"rs`. Similarly, a `garden::vegetables` module can be found at `src/garden/" +"vegetables.rs`." msgstr "" #: src/modules/filesystem.md:12 @@ -6756,21 +8061,25 @@ msgid "The `crate` root is in:" msgstr "" #: src/modules/filesystem.md:14 -msgid "" -"* `src/lib.rs` (for a library crate)\n" -"* `src/main.rs` (for a binary crate)" +msgid "`src/lib.rs` (for a library crate)" +msgstr "" + +#: src/modules/filesystem.md:15 +msgid "`src/main.rs` (for a binary crate)" msgstr "" #: src/modules/filesystem.md:17 msgid "" -"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." +"Modules defined in files can be documented, too, using \"inner doc " +"comments\". These document the item that contains them -- in this case, a " +"module." msgstr "" #: src/modules/filesystem.md:20 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" @@ -6787,70 +8096,93 @@ msgstr "" #: src/modules/filesystem.md:37 msgid "" -"* Before Rust 2018, modules needed to be located at `module/mod.rs` instead of `module.rs`, and this " -"is still a working alternative for editions after 2018.\n" -"\n" -"* The main reason to introduce `filename.rs` as alternative to `filename/mod.rs`\n" -" was because many files named `mod.rs` can be hard to distinguish in IDEs.\n" -"\n" -"* Deeper nesting can use folders, even if the main module is a file:\n" -"\n" -" ```ignore\n" -" src/\n" -" ├── main.rs\n" -" ├── top_module.rs\n" -" └── top_module/\n" -" └── sub_module.rs\n" -" ```\n" -"\n" -"* The place rust will look for modules can be changed with a compiler directive:\n" -"\n" -" ```rust,ignore\n" -" #[path = \"some/path.rs\"]\n" -" 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" -" `some_module_test.rs`, similar to the convention in Go." +"Before Rust 2018, modules needed to be located at `module/mod.rs` instead of " +"`module.rs`, and this is still a working alternative for editions after 2018." +msgstr "" + +#: src/modules/filesystem.md:39 +msgid "" +"The main reason to introduce `filename.rs` as alternative to `filename/mod." +"rs` was because many files named `mod.rs` can be hard to distinguish in IDEs." +msgstr "" + +#: src/modules/filesystem.md:42 +msgid "Deeper nesting can use folders, even if the main module is a file:" +msgstr "" + +#: src/modules/filesystem.md:44 +msgid "" +"```ignore\n" +"src/\n" +"├── main.rs\n" +"├── top_module.rs\n" +"└── top_module/\n" +" └── sub_module.rs\n" +"```" +msgstr "" + +#: src/modules/filesystem.md:52 +msgid "" +"The place rust will look for modules can be changed with a compiler " +"directive:" +msgstr "" + +#: src/modules/filesystem.md:54 +msgid "" +"```rust,ignore\n" +"#[path = \"some/path.rs\"]\n" +"mod some_module;\n" +"```" +msgstr "" + +#: src/modules/filesystem.md:59 +msgid "" +"This is useful, for example, if you would like to place tests for a module " +"in a file named `some_module_test.rs`, similar to the convention in Go." msgstr "" #: src/exercises/day-2/afternoon.md:1 -msgid "# Day 2: Afternoon Exercises" +msgid "Day 2: Afternoon Exercises" msgstr "" #: src/exercises/day-2/afternoon.md:3 msgid "The exercises for this afternoon will focus on strings and iterators." msgstr "" -#: src/exercises/day-2/luhn.md:1 -msgid "# Luhn Algorithm" -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" -"following to validate the credit card number:" +"The [Luhn algorithm](https://en.wikipedia.org/wiki/Luhn_algorithm) is used " +"to validate credit card numbers. The algorithm takes a string as input and " +"does the following to validate the credit card number:" msgstr "" #: src/exercises/day-2/luhn.md:7 +msgid "Ignore all spaces. Reject number with less than two digits." +msgstr "" + +#: src/exercises/day-2/luhn.md:9 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" -" we double `3` and `1`.\n" -"\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" -"\n" -"* The credit card number is valid if the sum ends with `0`." +"Moving from right to left, double every second digit: for the number `1234`, " +"we double `3` and `1`." +msgstr "" + +#: src/exercises/day-2/luhn.md:12 +msgid "" +"After doubling a digit, sum the digits. So doubling `7` becomes `14` which " +"becomes `5`." +msgstr "" + +#: src/exercises/day-2/luhn.md:15 +msgid "Sum all the undoubled and doubled digits." +msgstr "" + +#: src/exercises/day-2/luhn.md:17 +msgid "The credit card number is valid if the sum ends with `0`." msgstr "" #: src/exercises/day-2/luhn.md:19 msgid "" -"Copy the following code to and implement the\n" +"Copy the following code to and implement the " "function:" msgstr "" @@ -6906,21 +8238,17 @@ msgid "" "```" msgstr "" -#: src/exercises/day-2/strings-iterators.md:1 -msgid "# Strings and Iterators" -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" -"_request paths_. The path prefixes can contain a wildcard character which\n" -"matches a full segment. See the unit tests below." +"In this exercise, you are implementing a routing component of a web server. " +"The server is configured with a number of _path prefixes_ which are matched " +"against _request paths_. The path prefixes can contain a wildcard character " +"which matches a full segment. See the unit tests below." msgstr "" #: src/exercises/day-2/strings-iterators.md:8 msgid "" -"Copy the following code to and make the tests\n" +"Copy the following code to and make the tests " "pass. Try avoiding allocating a `Vec` for your intermediate results:" msgstr "" @@ -6937,12 +8265,15 @@ 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" @@ -6960,7 +8291,8 @@ 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" @@ -6970,7 +8302,7 @@ msgid "" msgstr "" #: src/welcome-day-3.md:1 -msgid "# Welcome to Day 3" +msgid "Welcome to Day 3" msgstr "" #: src/welcome-day-3.md:3 @@ -6979,33 +8311,34 @@ msgstr "" #: src/welcome-day-3.md:5 msgid "" -"* Traits: deriving traits, default methods, and important standard library\n" -" traits.\n" -"\n" -"* Generics: generic data types, generic methods, monomorphization, and trait\n" -" objects.\n" -"\n" -"* Error handling: panics, `Result`, and the try operator `?`.\n" -"\n" -"* Testing: unit tests, documentation tests, and integration tests.\n" -"\n" -"* Unsafe Rust: raw pointers, static variables, unsafe functions, and extern\n" -" functions." +"Traits: deriving traits, default methods, and important standard library " +"traits." msgstr "" -#: src/generics.md:1 -msgid "# Generics" +#: src/welcome-day-3.md:8 +msgid "" +"Generics: generic data types, generic methods, monomorphization, and trait " +"objects." msgstr "" -#: src/generics.md:3 +#: src/welcome-day-3.md:11 +msgid "Error handling: panics, `Result`, and the try operator `?`." +msgstr "" + +#: src/welcome-day-3.md:13 +msgid "Testing: unit tests, documentation tests, and integration tests." +msgstr "" + +#: src/welcome-day-3.md:15 msgid "" -"Rust support generics, which lets you abstract algorithms or data structures\n" -"(such as sorting or a binary tree)\n" -"over the types used or stored." +"Unsafe Rust: raw pointers, static variables, unsafe functions, and extern " +"functions." msgstr "" -#: src/generics/data-types.md:1 -msgid "# Generic Data Types" +#: src/generics.md:3 +msgid "" +"Rust support generics, which lets you abstract algorithms or data structures " +"(such as sorting or a binary tree) over the types used or stored." msgstr "" #: src/generics/data-types.md:3 @@ -7030,14 +8363,11 @@ msgid "" msgstr "" #: src/generics/data-types.md:21 -msgid "" -"* Try declaring a new variable `let p = Point { x: 5, y: 10.0 };`.\n" -"\n" -"* Fix the code to allow points that have elements of different types." +msgid "Try declaring a new variable `let p = Point { x: 5, y: 10.0 };`." msgstr "" -#: src/generics/methods.md:1 -msgid "# Generic Methods" +#: src/generics/data-types.md:23 +msgid "Fix the code to allow points that have elements of different types." msgstr "" #: src/generics/methods.md:3 @@ -7067,17 +8397,28 @@ 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" -" * 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`." +"_Q:_ Why `T` is specified twice in `impl Point {}`? Isn't that " +"redundant?" +msgstr "" + +#: src/generics/methods.md:26 +msgid "" +"This is because it is a generic implementation section for generic type. " +"They are independently generic." +msgstr "" + +#: src/generics/methods.md:27 +msgid "It means these methods are defined for any `T`." msgstr "" -#: src/generics/monomorphization.md:1 -msgid "# Monomorphization" +#: src/generics/methods.md:28 +msgid "It is possible to write `impl Point { .. }`. " +msgstr "" + +#: src/generics/methods.md:29 +msgid "" +"`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:3 @@ -7120,16 +8461,13 @@ msgstr "" #: src/generics/monomorphization.md:31 msgid "" -"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 "" - -#: src/traits.md:1 -msgid "# Traits" +"This is a zero-cost abstraction: you get exactly the same result as if you " +"had hand-coded the data structures without the abstraction." 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 @@ -7153,7 +8491,8 @@ 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" @@ -7171,12 +8510,10 @@ msgid "" "```" msgstr "" -#: src/traits/trait-objects.md:1 -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 @@ -7200,7 +8537,8 @@ 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" @@ -7224,58 +8562,94 @@ 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" -"* 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::<&dyn Pet>());\n" -" println!(\"{}\", std::mem::size_of::>());\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." +msgstr "" + +#: src/traits/trait-objects.md:73 +msgid "" +"`dyn Pet` is a way to tell the compiler about a dynamically sized type that " +"implements `Pet`." msgstr "" -#: src/traits/deriving-traits.md:1 -msgid "# Deriving Traits" +#: src/traits/trait-objects.md:74 +msgid "" +"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." +msgstr "" + +#: src/traits/trait-objects.md:75 +msgid "Compare these outputs in the above example:" +msgstr "" + +#: src/traits/trait-objects.md:76 +msgid "" +"```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::<&dyn Pet>());\n" +" println!(\"{}\", std::mem::size_of::>());\n" +"```" msgstr "" #: src/traits/deriving-traits.md:3 msgid "" -"Rust derive macros work by automatically generating code that implements the specified traits for a " -"data structure." +"Rust derive macros work by automatically generating code that implements the " +"specified traits for a data structure." msgstr "" #: src/traits/deriving-traits.md:5 @@ -7301,10 +8675,6 @@ msgid "" "```" msgstr "" -#: src/traits/default-methods.md:1 -msgid "# Default Methods" -msgstr "" - #: src/traits/default-methods.md:3 msgid "Traits can implement behavior in terms of other trait methods:" msgstr "" @@ -7339,43 +8709,58 @@ 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" -"\n" -"* Move method `not_equals` to a new trait `NotEquals`.\n" -"\n" -"* Make `Equals` a super trait for `NotEquals`.\n" -" ```rust,editable,compile_fail\n" -" trait NotEquals: Equals {\n" -" fn not_equals(&self, other: &Self) -> bool {\n" -" !self.equals(other)\n" -" }\n" -" }\n" -" ```\n" -"\n" -"* Provide a blanket implementation of `NotEquals` for `Equals`.\n" -" ```rust,editable,compile_fail\n" -" trait NotEquals {\n" -" fn not_equals(&self, other: &Self) -> bool;\n" +"Traits may specify pre-implemented (default) methods and methods that users " +"are required to implement themselves. Methods with default implementations " +"can rely on required methods." +msgstr "" + +#: src/traits/default-methods.md:35 +msgid "Move method `not_equals` to a new trait `NotEquals`." +msgstr "" + +#: src/traits/default-methods.md:37 +msgid "Make `Equals` a super trait for `NotEquals`." +msgstr "" + +#: src/traits/default-methods.md:38 +msgid "" +"```rust,editable,compile_fail\n" +"trait NotEquals: Equals {\n" +" fn not_equals(&self, other: &Self) -> bool {\n" +" !self.equals(other)\n" " }\n" +"}\n" +"```" +msgstr "" + +#: src/traits/default-methods.md:46 +msgid "Provide a blanket implementation of `NotEquals` for `Equals`." +msgstr "" + +#: src/traits/default-methods.md:47 +msgid "" +"```rust,editable,compile_fail\n" +"trait NotEquals {\n" +" fn not_equals(&self, other: &Self) -> bool;\n" +"}\n" "\n" -" impl NotEquals for T where T: Equals {\n" -" fn not_equals(&self, other: &Self) -> bool {\n" -" !self.equals(other)\n" -" }\n" +"impl NotEquals for T where T: Equals {\n" +" fn not_equals(&self, other: &Self) -> bool {\n" +" !self.equals(other)\n" " }\n" -" ```\n" -" * With the blanket implementation, you no longer need `Equals` as a super trait for `NotEqual`.\n" -" " +"}\n" +"```" msgstr "" -#: src/traits/trait-bounds.md:1 -msgid "# Trait Bounds" +#: src/traits/default-methods.md:58 +msgid "" +"With the blanket implementation, you no longer need `Equals` as a super " +"trait for `NotEqual`." 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 " "some trait, so that you can call this trait's methods." msgstr "" @@ -7428,21 +8813,26 @@ msgid "" msgstr "" #: src/traits/trait-bounds.md:46 +msgid "It declutters the function signature if you have many parameters." +msgstr "" + +#: src/traits/trait-bounds.md:47 +msgid "It has additional features making it more powerful." +msgstr "" + +#: src/traits/trait-bounds.md:48 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`." msgstr "" #: src/traits/impl-trait.md:1 -msgid "# `impl Trait`" +msgid "`impl Trait`" msgstr "" #: src/traits/impl-trait.md:3 msgid "" -"Similar to trait bounds, an `impl Trait` syntax can be used in function\n" +"Similar to trait bounds, an `impl Trait` syntax can be used in function " "arguments and return values:" msgstr "" @@ -7463,62 +8853,101 @@ msgid "" msgstr "" #: src/traits/impl-trait.md:19 -msgid "* `impl Trait` allows you to work with types which you cannot name." +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" -"\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" -" 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" -" Vec<_> = foo.collect()` or with the turbofish, `foo.collect::>()`." +"For a parameter, `impl Trait` is like an anonymous generic parameter with a " +"trait bound." msgstr "" -#: src/traits/impl-trait.md:37 +#: src/traits/impl-trait.md:27 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" -"independent generic parameters." +"For a return type, it means that the return type is some concrete type that " +"implements the trait, without naming the type. This can be useful when you " +"don't want to expose the concrete type in a public API." msgstr "" -#: src/traits/important-traits.md:1 -msgid "# Important Traits" +#: src/traits/impl-trait.md:31 +msgid "" +"Inference is hard in return position. A function returning `impl Foo` picks " +"the concrete type it returns, without writing it out in the source. A " +"function returning a generic type like `collect() -> B` can return any " +"type satisfying `B`, and the caller may need to choose one, such as with " +"`let x: 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 nothing here enforces that it is _the same_ `impl Display` " +"type. If we used a single `T: Display`, it would enforce the constraint " +"that input `T` and return `T` type are the same type. It would not work for " +"this particular function, as the type we expect as input is likely not what " +"`format!` returns. If we wanted to do the same via `: Display` syntax, we'd " +"need two independent generic parameters." 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 msgid "" -"* [`Iterator`][1] and [`IntoIterator`][2] used in `for` loops,\n" -"* [`From`][3] and [`Into`][4] used to convert values,\n" -"* [`Read`][5] and [`Write`][6] used for IO,\n" -"* [`Add`][7], [`Mul`][8], ... used for operator overloading, and\n" -"* [`Drop`][9] used for defining destructors.\n" -"* [`Default`][10] used to construct a default instance of a type." +"[`Iterator`](https://doc.rust-lang.org/std/iter/trait.Iterator.html) and " +"[`IntoIterator`](https://doc.rust-lang.org/std/iter/trait.IntoIterator.html) " +"used in `for` loops," +msgstr "" + +#: src/traits/important-traits.md:6 +msgid "" +"[`From`](https://doc.rust-lang.org/std/convert/trait.From.html) and [`Into`]" +"(https://doc.rust-lang.org/std/convert/trait.Into.html) used to convert " +"values," +msgstr "" + +#: src/traits/important-traits.md:7 +msgid "" +"[`Read`](https://doc.rust-lang.org/std/io/trait.Read.html) and [`Write`]" +"(https://doc.rust-lang.org/std/io/trait.Write.html) used for IO," +msgstr "" + +#: src/traits/important-traits.md:8 +msgid "" +"[`Add`](https://doc.rust-lang.org/std/ops/trait.Add.html), [`Mul`](https://" +"doc.rust-lang.org/std/ops/trait.Mul.html), ... used for operator " +"overloading, and" +msgstr "" + +#: src/traits/important-traits.md:9 +msgid "" +"[`Drop`](https://doc.rust-lang.org/std/ops/trait.Drop.html) used for " +"defining destructors." +msgstr "" + +#: src/traits/important-traits.md:10 +msgid "" +"[`Default`](https://doc.rust-lang.org/std/default/trait.Default.html) used " +"to construct a default instance of a type." msgstr "" #: src/traits/iterator.md:1 -msgid "# Iterators" +msgid "Iterators" msgstr "" #: src/traits/iterator.md:3 -msgid "You can implement the [`Iterator`][1] trait on your own types:" +msgid "" +"You can implement the [`Iterator`](https://doc.rust-lang.org/std/iter/trait." +"Iterator.html) trait on your own types:" msgstr "" #: src/traits/iterator.md:5 @@ -7551,25 +8980,26 @@ 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" -" 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" -" you can iterate over a vector with `for i in some_vec { .. }` but\n" -" `some_vec.next()` doesn't exist." +"The `Iterator` trait implements many common functional programming " +"operations over collections (e.g. `map`, `filter`, `reduce`, etc). This is " +"the trait where you can find all the documentation about them. In Rust these " +"functions should produce the code as efficient as equivalent imperative " +"implementations." msgstr "" -#: src/traits/from-iterator.md:1 -msgid "# FromIterator" +#: src/traits/iterator.md:37 +msgid "" +"`IntoIterator` is the trait that makes for loops work. It is implemented by " +"collection types such as `Vec` and references to them such as `&Vec` " +"and `&[T]`. Ranges also implement it. This is why you can iterate over a " +"vector with `for i in some_vec { .. }` but `some_vec.next()` doesn't exist." msgstr "" #: src/traits/from-iterator.md:3 -msgid "[`FromIterator`][1] lets you build a collection from an [`Iterator`][2]." +msgid "" +"[`FromIterator`](https://doc.rust-lang.org/std/iter/trait.FromIterator.html) " +"lets you build a collection from an [`Iterator`](https://doc.rust-lang.org/" +"std/iter/trait.Iterator.html)." msgstr "" #: src/traits/from-iterator.md:5 @@ -7587,25 +9017,25 @@ msgstr "" #: src/traits/from-iterator.md:17 msgid "" -"`Iterator` implements\n" -"`fn collect(self) -> B\n" -"where\n" -" B: FromIterator,\n" -" Self: Sized`" +"`Iterator` implements `fn collect(self) -> B where B: FromIterator, Self: Sized`" msgstr "" #: src/traits/from-iterator.md:23 msgid "" -"There are also implementations which let you do cool things like convert an\n" +"There are also implementations which let you do cool things like convert an " "`Iterator>` into a `Result, E>`." msgstr "" #: src/traits/from-into.md:1 -msgid "# `From` and `Into`" +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`](https://doc.rust-lang.org/std/convert/trait.From." +"html) and [`Into`](https://doc.rust-lang.org/std/convert/trait.Into.html) to " +"facilitate type conversions:" msgstr "" #: src/traits/from-into.md:5 @@ -7622,7 +9052,10 @@ msgid "" msgstr "" #: src/traits/from-into.md:15 -msgid "[`Into`][2] is automatically implemented when [`From`][1] is implemented:" +msgid "" +"[`Into`](https://doc.rust-lang.org/std/convert/trait.Into.html) is " +"automatically implemented when [`From`](https://doc.rust-lang.org/std/" +"convert/trait.From.html) is implemented:" msgstr "" #: src/traits/from-into.md:17 @@ -7640,19 +9073,27 @@ 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." +msgstr "" + +#: src/traits/from-into.md:30 +msgid "" +"When declaring a function argument input type like \"anything that can be " +"converted into a `String`\", the rule is opposite, you should use `Into`. " +"Your function will accept types that implement `From` and those that _only_ " +"implement `Into`." msgstr "" #: src/traits/read-write.md:1 -msgid "# `Read` and `Write`" +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`](https://doc.rust-lang.org/std/io/trait.Read.html) and " +"[`BufRead`](https://doc.rust-lang.org/std/io/trait.BufRead.html), you can " +"abstract over `u8` sources:" msgstr "" #: src/traits/read-write.md:5 @@ -7677,7 +9118,9 @@ msgid "" msgstr "" #: src/traits/read-write.md:23 -msgid "Similarly, [`Write`][3] lets you abstract over `u8` sinks:" +msgid "" +"Similarly, [`Write`](https://doc.rust-lang.org/std/io/trait.Write.html) lets " +"you abstract over `u8` sinks:" msgstr "" #: src/traits/read-write.md:25 @@ -7701,11 +9144,13 @@ msgid "" msgstr "" #: src/traits/drop.md:1 -msgid "# The `Drop` Trait" +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`](https://doc.rust-lang.org/std/ops/trait.Drop." +"html) can specify code to run when they go out of scope:" msgstr "" #: src/traits/drop.md:5 @@ -7743,20 +9188,27 @@ msgid "Discussion points:" msgstr "" #: src/traits/drop.md:36 +msgid "Why doesn't `Drop::drop` take `self`?" +msgstr "" + +#: src/traits/drop.md:37 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" -" the block, resulting in another call to `Drop::drop`, and a stack\n" -" overflow!\n" -"* Try replacing `drop(a)` with `a.drop()`." +"Short-answer: If it did, `std::mem::drop` would be called at the end of the " +"block, resulting in another call to `Drop::drop`, and a stack overflow!" +msgstr "" + +#: src/traits/drop.md:40 +msgid "Try replacing `drop(a)` with `a.drop()`." msgstr "" #: src/traits/default.md:1 -msgid "# The `Default` Trait" +msgid "The `Default` Trait" msgstr "" #: src/traits/default.md:3 -msgid "[`Default`][1] trait produces a default value for a type." +msgid "" +"[`Default`](https://doc.rust-lang.org/std/default/trait.Default.html) trait " +"produces a default value for a type." msgstr "" #: src/traits/default.md:5 @@ -7797,22 +9249,50 @@ msgstr "" #: src/traits/default.md:40 msgid "" -" * It can be implemented directly or it can be derived via `#[derive(Default)]`.\n" -" * A derived implementation will produce a value 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" -" * 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.\n" -" * the `..` syntax is called [struct update syntax][2]" +"It can be implemented directly or it can be derived via `#[derive(Default)]`." +msgstr "" + +#: src/traits/default.md:41 +msgid "" +"A derived implementation will produce a value where all fields are set to " +"their default values." +msgstr "" + +#: src/traits/default.md:42 +msgid "This means all types in the struct must implement `Default` too." +msgstr "" + +#: src/traits/default.md:43 +msgid "" +"Standard Rust types often implement `Default` with reasonable values (e.g. " +"`0`, `\"\"`, etc)." +msgstr "" + +#: src/traits/default.md:44 +msgid "The partial struct copy works nicely with default." +msgstr "" + +#: src/traits/default.md:45 +msgid "" +"Rust standard library is aware that types can implement `Default` and " +"provides convenience methods that use it." +msgstr "" + +#: src/traits/default.md:46 +msgid "" +"the `..` syntax is called [struct update syntax](https://doc.rust-lang.org/" +"book/ch05-01-defining-structs.html#creating-instances-from-other-instances-" +"with-struct-update-syntax)" msgstr "" #: src/traits/operators.md:1 -msgid "# `Add`, `Mul`, ..." +msgid "`Add`, `Mul`, ..." msgstr "" #: src/traits/operators.md:3 -msgid "Operator overloading is implemented via traits in [`std::ops`][1]:" +msgid "" +"Operator overloading is implemented via traits in [`std::ops`](https://doc." +"rust-lang.org/std/ops/index.html):" msgstr "" #: src/traits/operators.md:5 @@ -7839,28 +9319,44 @@ msgstr "" #: src/traits/operators.md:28 msgid "" -"* 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" -" call site.\n" -"* Why is `Output` an associated type? Could it be made a type parameter of the method?\n" -" * Short answer: Function type parameters are controlled by the caller, but\n" -" associated types (like `Output`) are controlled by the implementor of a\n" -" trait.\n" -"* You could implement `Add` for two different types, e.g.\n" -" `impl Add<(i32, i32)> for Point` would add a tuple to a `Point`." +"You could implement `Add` for `&Point`. In which situations is that useful? " +msgstr "" + +#: src/traits/operators.md:29 +msgid "" +"Answer: `Add:add` consumes `self`. If type `T` for which you are overloading " +"the operator is not `Copy`, you should consider overloading the operator for " +"`&T` as well. This avoids unnecessary cloning on the call site." +msgstr "" + +#: src/traits/operators.md:33 +msgid "" +"Why is `Output` an associated type? Could it be made a type parameter of the " +"method?" +msgstr "" + +#: src/traits/operators.md:34 +msgid "" +"Short answer: Function type parameters are controlled by the caller, but " +"associated types (like `Output`) are controlled by the implementor of a " +"trait." +msgstr "" + +#: src/traits/operators.md:37 +msgid "" +"You could implement `Add` for two different types, e.g. `impl Add<(i32, " +"i32)> for Point` would add a tuple to a `Point`." msgstr "" #: src/traits/closures.md:1 -msgid "# Closures" +msgid "Closures" msgstr "" #: src/traits/closures.md:3 msgid "" -"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" +"Closures or lambda expressions have types which cannot be named. However, " +"they implement special [`Fn`](https://doc.rust-lang.org/std/ops/trait.Fn." +"html), [`FnMut`](https://doc.rust-lang.org/std/ops/trait.FnMut.html), and " "[`FnOnce`](https://doc.rust-lang.org/std/ops/trait.FnOnce.html) traits:" msgstr "" @@ -7893,39 +9389,40 @@ msgstr "" #: src/traits/closures.md:34 msgid "" -"An `Fn` (e.g. `add_3`) neither consumes nor mutates captured values, or perhaps captures\n" -"nothing at all. It can be called multiple times concurrently." +"An `Fn` (e.g. `add_3`) neither consumes nor mutates captured values, or " +"perhaps captures nothing at all. It can be called multiple times " +"concurrently." msgstr "" #: src/traits/closures.md:37 msgid "" -"An `FnMut` (e.g. `accumulate`) might mutate captured values. You can call it multiple times,\n" -"but not concurrently." +"An `FnMut` (e.g. `accumulate`) might mutate captured values. You can call it " +"multiple times, but not concurrently." msgstr "" #: src/traits/closures.md:40 msgid "" -"If you have an `FnOnce` (e.g. `multiply_sum`), you may only call it once. It might consume\n" -"captured values." +"If you have an `FnOnce` (e.g. `multiply_sum`), you may only call it once. It " +"might consume captured values." msgstr "" #: src/traits/closures.md:43 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" -"is called for." +"`FnMut` is a subtype of `FnOnce`. `Fn` is a subtype of `FnMut` and `FnOnce`. " +"I.e. you can use an `FnMut` wherever an `FnOnce` is called for, and you can " +"use an `Fn` wherever an `FnMut` or `FnOnce` is called for." msgstr "" #: src/traits/closures.md:47 msgid "" -"The compiler also infers `Copy` (e.g. for `add_3`) and `Clone` (e.g. `multiply_sum`),\n" -"depending on what the closure captures." +"The compiler also infers `Copy` (e.g. for `add_3`) and `Clone` (e.g. " +"`multiply_sum`), depending on what the closure captures." msgstr "" #: src/traits/closures.md:50 msgid "" -"By default, closures will capture by reference if they can. The `move` keyword makes them capture\n" -"by value." +"By default, closures will capture by reference if they can. The `move` " +"keyword makes them capture by value." msgstr "" #: src/traits/closures.md:52 @@ -7943,20 +9440,16 @@ msgid "" msgstr "" #: src/exercises/day-3/morning.md:1 -msgid "# Day 3: Morning Exercises" +msgid "Day 3: Morning Exercises" msgstr "" #: src/exercises/day-3/morning.md:3 msgid "We will design a classical GUI library traits and trait objects." msgstr "" -#: src/exercises/day-3/simple-gui.md:1 -msgid "# A Simple GUI Library" -msgstr "" - #: src/exercises/day-3/simple-gui.md:3 msgid "" -"Let us design a classical GUI library using our new knowledge of traits and\n" +"Let us design a classical GUI library using our new knowledge of traits and " "trait objects." msgstr "" @@ -7965,11 +9458,17 @@ msgid "We will have a number of widgets in our library:" msgstr "" #: src/exercises/day-3/simple-gui.md:8 +msgid "`Window`: has a `title` and contains other widgets." +msgstr "" + +#: src/exercises/day-3/simple-gui.md:9 msgid "" -"* `Window`: has a `title` and contains other widgets.\n" -"* `Button`: has a `label` and a callback function which is invoked when the\n" -" button is pressed.\n" -"* `Label`: has a `label`." +"`Button`: has a `label` and a callback function which is invoked when the " +"button is pressed." +msgstr "" + +#: src/exercises/day-3/simple-gui.md:11 +msgid "`Label`: has a `label`." msgstr "" #: src/exercises/day-3/simple-gui.md:13 @@ -7978,7 +9477,7 @@ msgstr "" #: src/exercises/day-3/simple-gui.md:15 msgid "" -"Copy the code below to , fill in the missing\n" +"Copy the code below to , fill in the missing " "`draw_into` methods so that you implement the `Widget` trait:" msgstr "" @@ -8087,7 +9586,8 @@ 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" @@ -8116,10 +9616,10 @@ 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" -"formatting operators. In particular, notice how you can pad with different\n" -"characters (here a `'/'`) and how you can control alignment:" +"If you want to draw aligned text, you can use the [fill/alignment](https://" +"doc.rust-lang.org/std/fmt/index.html#fillalignment) formatting operators. In " +"particular, notice how you can pad with different characters (here a `'/'`) " +"and how you can control alignment:" msgstr "" #: src/exercises/day-3/simple-gui.md:147 @@ -8135,7 +9635,8 @@ 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 @@ -8152,22 +9653,16 @@ msgid "" "```" msgstr "" -#: src/error-handling.md:1 -msgid "# Error Handling" -msgstr "" - #: src/error-handling.md:3 msgid "Error handling in Rust is done using explicit control flow:" msgstr "" #: src/error-handling.md:5 -msgid "" -"* Functions that can have errors list this in their return type,\n" -"* There are no exceptions." +msgid "Functions that can have errors list this in their return type," msgstr "" -#: src/error-handling/panics.md:1 -msgid "# Panics" +#: src/error-handling.md:6 +msgid "There are no exceptions." msgstr "" #: src/error-handling/panics.md:3 @@ -8185,18 +9680,26 @@ msgid "" msgstr "" #: src/error-handling/panics.md:12 +msgid "Panics are for unrecoverable and unexpected errors." +msgstr "" + +#: src/error-handling/panics.md:13 +msgid "Panics are symptoms of bugs in the program." +msgstr "" + +#: src/error-handling/panics.md:14 msgid "" -"* Panics are for unrecoverable and unexpected errors.\n" -" * Panics are symptoms of bugs in the program.\n" -"* Use non-panicking APIs (such as `Vec::get`) if crashing is not acceptable." +"Use non-panicking APIs (such as `Vec::get`) if crashing is not acceptable." msgstr "" #: src/error-handling/panic-unwind.md:1 -msgid "# Catching the Stack Unwinding" +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 @@ -8220,19 +9723,22 @@ msgstr "" #: src/error-handling/panic-unwind.md:21 msgid "" -"* This can be useful in servers which should keep running even if a single\n" -" request crashes.\n" -"* This does not work if `panic = 'abort'` is set in your `Cargo.toml`." +"This can be useful in servers which should keep running even if a single " +"request crashes." +msgstr "" + +#: src/error-handling/panic-unwind.md:23 +msgid "This does not work if `panic = 'abort'` is set in your `Cargo.toml`." msgstr "" #: src/error-handling/result.md:1 -msgid "# Structured Error Handling with `Result`" +msgid "Structured Error Handling with `Result`" msgstr "" #: src/error-handling/result.md:3 msgid "" -"We have already seen the `Result` enum. This is used pervasively when errors are\n" -"expected as part of normal operation:" +"We have already seen the `Result` enum. This is used pervasively when errors " +"are expected as part of normal operation:" msgstr "" #: src/error-handling/result.md:6 @@ -8259,24 +9765,27 @@ 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 explicitly extract it. This encourages error checking. In the " +"case where an error should never happen, `unwrap()` or `expect()` can be " +"called, and this is a signal of the developer intent too." +msgstr "" + +#: src/error-handling/result.md:30 +msgid "" +"`Result` documentation is a recommended read. Not during the course, but it " +"is worth mentioning. It contains a lot of convenience methods and functions " +"that help functional-style programming. " msgstr "" #: src/error-handling/try-operator.md:1 -msgid "# Propagating Errors with `?`" +msgid "Propagating Errors with `?`" 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 common" +"The try-operator `?` is used to return errors to the caller. It lets you " +"turn the common" msgstr "" #: src/error-handling/try-operator.md:6 @@ -8333,29 +9842,39 @@ msgid "" msgstr "" #: 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)`." +msgstr "" + +#: src/error-handling/try-operator.md:51 +#: src/error-handling/converting-error-types-example.md:53 +msgid "" +"Use the `fs::write` call to test out the different scenarios: no file, empty " +"file, file with username." +msgstr "" + +#: src/error-handling/try-operator.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.\n" -"* The return type of the function has to be compatible with the nested functions it calls. For " -"instance,\n" -"a function returning a `Result` can only apply the `?` operator on a function returning a \n" -"`Result`. It cannot apply the `?` operator on a function returning a `Result` \n" -"or an `Option`. Reciprocally, a function returning an `Option` can only apply the `?` " -"operator \n" -"on a function returning an `Option`.\n" -" * You can convert incompatible types into one another with the different `Option` and `Result` " -"methods \n" -" such as `Option::ok_or`, `Result::ok`, `Result::err`." +"The return type of the function has to be compatible with the nested " +"functions it calls. For instance, a function returning a `Result` " +"can only apply the `?` operator on a function returning a `Result`. It cannot apply the `?` operator on a function returning a `Result` or an `Option`. Reciprocally, a function returning an " +"`Option` can only apply the `?` operator on a function returning an " +"`Option`." msgstr "" -#: src/error-handling/converting-error-types.md:1 src/error-handling/converting-error-types-example.md:1 -msgid "# Converting Error Types" +#: src/error-handling/try-operator.md:57 +msgid "" +"You can convert incompatible types into one another with the different " +"`Option` and `Result` methods such as `Option::ok_or`, `Result::ok`, " +"`Result::err`." 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 @@ -8381,7 +9900,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 " "type returned by the function:" msgstr "" @@ -8405,7 +9924,8 @@ 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" @@ -8433,35 +9953,25 @@ msgid "" "```" msgstr "" -#: 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." -msgstr "" - #: src/error-handling/converting-error-types-example.md:55 msgid "" -"It is good practice for all error types that don't need to be `no_std` to implement `std::error::" -"Error`, which requires `Debug` and `Display`. The `Error` crate for `core` is only available in " -"[nightly](https://github.com/rust-lang/rust/issues/103765), so not fully `no_std` compatible yet." +"It is good practice for all error types that don't need to be `no_std` to " +"implement `std::error::Error`, which requires `Debug` and `Display`. The " +"`Error` crate for `core` is only available in [nightly](https://github.com/" +"rust-lang/rust/issues/103765), so not fully `no_std` compatible yet." msgstr "" #: src/error-handling/converting-error-types-example.md:57 msgid "" -"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 "" - -#: src/error-handling/deriving-error-enums.md:1 -msgid "# Deriving Error Enums" +"It's generally helpful for them to implement `Clone` and `Eq` too where " +"possible, to make life easier for tests and consumers of your library. In " +"this case we can't easily do so, because `io::Error` doesn't implement them." 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" -"error enum like we did on the previous page:" +"The [thiserror](https://docs.rs/thiserror/) crate is a popular way to create " +"an error enum like we did on the previous page:" msgstr "" #: src/error-handling/deriving-error-enums.md:6 @@ -8500,23 +10010,20 @@ 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" -"It also works for structs." +"`thiserror`'s derive macro automatically implements `std::error::Error`, and " +"optionally `Display` (if the `#[error(...)]` attributes are provided) and " +"`From` (if the `#[from]` attribute is added). It also works for structs." msgstr "" #: src/error-handling/deriving-error-enums.md:43 msgid "It doesn't affect your public API, which makes it good for libraries." msgstr "" -#: src/error-handling/dynamic-errors.md:1 -msgid "# Dynamic Error Types" -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" -"all the different possibilities. `std::error::Error` makes this easy." +"Sometimes we want to allow any type of error to be returned without writing " +"our own enum covering all the different possibilities. `std::error::Error` " +"makes this easy." msgstr "" #: src/error-handling/dynamic-errors.md:6 @@ -8552,21 +10059,18 @@ 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 the program. As such it's generally not a good " +"idea to use `Box` in the public API of a library, but it can be a " +"good option in a program where you just want to display the error message " "somewhere." msgstr "" -#: src/error-handling/error-contexts.md:1 -msgid "# Adding Context to Errors" -msgstr "" - #: src/error-handling/error-contexts.md:3 msgid "" -"The widely used [anyhow](https://docs.rs/anyhow/) crate can help you add\n" -"contextual information to your errors and allows you to have fewer\n" -"custom error types:" +"The widely used [anyhow](https://docs.rs/anyhow/) crate can help you add " +"contextual information to your errors and allows you to have fewer custom " +"error types:" msgstr "" #: src/error-handling/error-contexts.md:7 @@ -8599,17 +10103,26 @@ msgid "" msgstr "" #: src/error-handling/error-contexts.md:35 +msgid "`anyhow::Result` is a type alias for `Result`." +msgstr "" + +#: src/error-handling/error-contexts.md:36 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" -" similar usage patterns and ergonomics to `(T, error)` from Go." +"`anyhow::Error` is essentially a wrapper around `Box`. As such " +"it's again generally not a good choice for the public API of a library, but " +"is widely used in applications." msgstr "" -#: src/testing.md:1 -msgid "# Testing" +#: src/error-handling/error-contexts.md:38 +msgid "" +"Actual error type inside of it can be extracted for examination if necessary." +msgstr "" + +#: src/error-handling/error-contexts.md:39 +msgid "" +"Functionality provided by `anyhow::Result` may be familiar to Go " +"developers, as it provides similar usage patterns and ergonomics to `(T, " +"error)` from Go." msgstr "" #: src/testing.md:3 @@ -8617,14 +10130,11 @@ msgid "Rust and Cargo come with a simple unit test framework:" msgstr "" #: src/testing.md:5 -msgid "" -"* Unit tests are supported throughout your code.\n" -"\n" -"* Integration tests are supported via the `tests/` directory." +msgid "Unit tests are supported throughout your code." msgstr "" -#: src/testing/unit-tests.md:1 -msgid "# Unit Tests" +#: src/testing.md:7 +msgid "Integration tests are supported via the `tests/` directory." msgstr "" #: src/testing/unit-tests.md:3 @@ -8662,14 +10172,10 @@ msgstr "" msgid "Use `cargo test` to find and run the unit tests." msgstr "" -#: src/testing/test-modules.md:1 -msgid "# Test Modules" -msgstr "" - #: src/testing/test-modules.md:3 msgid "" -"Unit tests are often put in a nested module (run tests on the\n" -"[Playground](https://play.rust-lang.org/)):" +"Unit tests are often put in a nested module (run tests on the [Playground]" +"(https://play.rust-lang.org/)):" msgstr "" #: src/testing/test-modules.md:6 @@ -8696,13 +10202,11 @@ msgid "" msgstr "" #: src/testing/test-modules.md:26 -msgid "" -"* This lets you unit test private helpers.\n" -"* The `#[cfg(test)]` attribute is only active when you run `cargo test`." +msgid "This lets you unit test private helpers." msgstr "" -#: src/testing/doc-tests.md:1 -msgid "# Documentation Tests" +#: src/testing/test-modules.md:27 +msgid "The `#[cfg(test)]` attribute is only active when you run `cargo test`." msgstr "" #: src/testing/doc-tests.md:3 @@ -8726,15 +10230,17 @@ msgid "" msgstr "" #: src/testing/doc-tests.md:18 -msgid "" -"* Code blocks in `///` comments are automatically seen as Rust code.\n" -"* The code will be compiled and executed as part of `cargo test`.\n" -"* Test the above code on the [Rust Playground](https://play.rust-lang.org/?" -"version=stable&mode=debug&edition=2021&gist=3ce2ad13ea1302f6572cb15cd96becf0)." +msgid "Code blocks in `///` comments are automatically seen as Rust code." +msgstr "" + +#: src/testing/doc-tests.md:19 +msgid "The code will be compiled and executed as part of `cargo test`." msgstr "" -#: src/testing/integration-tests.md:1 -msgid "# Integration Tests" +#: src/testing/doc-tests.md:20 +msgid "" +"Test the above code on the [Rust Playground](https://play.rust-lang.org/?" +"version=stable&mode=debug&edition=2021&gist=3ce2ad13ea1302f6572cb15cd96becf0)." msgstr "" #: src/testing/integration-tests.md:3 @@ -8762,7 +10268,7 @@ msgid "These tests only have access to the public API of your crate." msgstr "" #: src/testing/useful-crates.md:1 -msgid "## Useful crates for writing tests" +msgid "Useful crates for writing tests" msgstr "" #: src/testing/useful-crates.md:3 @@ -8775,14 +10281,18 @@ 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" -"* [proptest](https://docs.rs/proptest): Property-based testing for Rust.\n" -"* [rstest](https://docs.rs/rstest): Support for fixtures and parameterised tests." +"[googletest](https://docs.rs/googletest): Comprehensive test assertion " +"library in the tradition of GoogleTest for C++." +msgstr "" + +#: src/testing/useful-crates.md:8 +msgid "[proptest](https://docs.rs/proptest): Property-based testing for Rust." msgstr "" -#: src/unsafe.md:1 -msgid "# Unsafe Rust" +#: src/testing/useful-crates.md:9 +msgid "" +"[rstest](https://docs.rs/rstest): Support for fixtures and parameterised " +"tests." msgstr "" #: src/unsafe.md:3 @@ -8790,21 +10300,25 @@ msgid "The Rust language has two parts:" msgstr "" #: src/unsafe.md:5 +msgid "**Safe Rust:** memory safe, no undefined behavior possible." +msgstr "" + +#: src/unsafe.md:6 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" -"what Unsafe Rust is." +"We will be seeing mostly safe Rust in this course, but it's important to " +"know what Unsafe Rust is." msgstr "" #: src/unsafe.md:11 msgid "" -"Unsafe code is usually small and isolated, and its correctness should be carefully\n" -"documented. It is usually wrapped in a safe abstraction layer." +"Unsafe code is usually small and isolated, and its correctness should be " +"carefully documented. It is usually wrapped in a safe abstraction layer." msgstr "" #: src/unsafe.md:14 @@ -8812,30 +10326,38 @@ msgid "Unsafe Rust gives you access to five new capabilities:" msgstr "" #: src/unsafe.md:16 -msgid "" -"* Dereference raw pointers.\n" -"* Access or modify mutable static variables.\n" -"* Access `union` fields.\n" -"* Call `unsafe` functions, including `extern` functions.\n" -"* Implement `unsafe` traits." +msgid "Dereference raw pointers." +msgstr "" + +#: src/unsafe.md:17 +msgid "Access or modify mutable static variables." +msgstr "" + +#: src/unsafe.md:18 +msgid "Access `union` fields." +msgstr "" + +#: src/unsafe.md:19 +msgid "Call `unsafe` functions, including `extern` functions." +msgstr "" + +#: src/unsafe.md:20 +msgid "Implement `unsafe` traits." 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" -"and the [Rustonomicon](https://doc.rust-lang.org/nomicon/)." +"We will briefly cover unsafe capabilities next. For full details, please see " +"[Chapter 19.1 in the Rust Book](https://doc.rust-lang.org/book/ch19-01-" +"unsafe-rust.html) 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" -"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." -msgstr "" - -#: src/unsafe/raw-pointers.md:1 -msgid "# Dereferencing Raw Pointers" +"Unsafe Rust does not mean the code is incorrect. It means that developers " +"have turned off the compiler safety features and have to write correct code " +"by themselves. It means the compiler no longer enforces Rust's memory-safety " +"rules." msgstr "" #: src/unsafe/raw-pointers.md:3 @@ -8852,7 +10374,8 @@ 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" @@ -8867,33 +10390,43 @@ 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" -"operations it is doing." +"It is good practice (and required by the Android Rust style guide) to write " +"a comment for each `unsafe` block explaining how the code inside it " +"satisfies the safety requirements of the unsafe operations it is doing." msgstr "" #: src/unsafe/raw-pointers.md:31 msgid "" -"In the case of pointer dereferences, this means that the pointers must be\n" +"In the case of pointer dereferences, this means that the pointers must be " "[_valid_](https://doc.rust-lang.org/std/ptr/index.html#safety), i.e.:" msgstr "" #: src/unsafe/raw-pointers.md:34 +msgid "The pointer must be non-null." +msgstr "" + +#: src/unsafe/raw-pointers.md:35 msgid "" -" * The pointer must be non-null.\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" -" reference may be used to access the memory." +"The pointer must be _dereferenceable_ (within the bounds of a single " +"allocated object)." msgstr "" -#: src/unsafe/raw-pointers.md:41 -msgid "In most cases the pointer must also be properly aligned." +#: src/unsafe/raw-pointers.md:36 +msgid "The object must not have been deallocated." +msgstr "" + +#: src/unsafe/raw-pointers.md:37 +msgid "There must not be concurrent accesses to the same location." +msgstr "" + +#: src/unsafe/raw-pointers.md:38 +msgid "" +"If the pointer was obtained by casting a reference, the underlying object " +"must be live and no reference may be used to access the memory." msgstr "" -#: src/unsafe/mutable-static-variables.md:1 -msgid "# Mutable Static Variables" +#: src/unsafe/raw-pointers.md:41 +msgid "In most cases the pointer must also be properly aligned." msgstr "" #: src/unsafe/mutable-static-variables.md:3 @@ -8913,7 +10446,7 @@ msgstr "" #: src/unsafe/mutable-static-variables.md:13 msgid "" -"However, since data races can occur, it is unsafe to read and write mutable\n" +"However, since data races can occur, it is unsafe to read and write mutable " "static variables:" msgstr "" @@ -8936,12 +10469,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." -msgstr "" - -#: src/unsafe/unions.md:1 -msgid "# Unions" +"Using a mutable static is generally a bad idea, but there are some cases " +"where it might make sense in low-level `no_std` code, such as implementing a " +"heap allocator or working with some C APIs." msgstr "" #: src/unsafe/unions.md:3 @@ -8967,25 +10497,22 @@ 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" -"for interacting with C library APIs." +"Unions are very rarely needed in Rust as you can usually use an enum. They " +"are occasionally needed 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" -"wrapper such as the [`zerocopy`](https://crates.io/crates/zerocopy) crate." -msgstr "" - -#: src/unsafe/calling-unsafe-functions.md:1 -msgid "# Calling Unsafe Functions" +"If you just want to reinterpret bytes as a different type, you probably want " +"[`std::mem::transmute`](https://doc.rust-lang.org/stable/std/mem/fn." +"transmute.html) or a safe wrapper such as the [`zerocopy`](https://crates.io/" +"crates/zerocopy) crate." msgstr "" #: src/unsafe/calling-unsafe-functions.md:3 msgid "" -"A function or method can be marked `unsafe` if it has extra preconditions you\n" -"must uphold to avoid undefined behaviour:" +"A function or method can be marked `unsafe` if it has extra preconditions " +"you must uphold to avoid undefined behaviour:" msgstr "" #: src/unsafe/calling-unsafe-functions.md:6 @@ -8994,7 +10521,8 @@ 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" @@ -9002,11 +10530,13 @@ 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" @@ -9015,14 +10545,10 @@ msgid "" "```" msgstr "" -#: src/unsafe/writing-unsafe-functions.md:1 -msgid "# Writing Unsafe Functions" -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" -"behaviour." +"You can mark your own functions as `unsafe` if they require particular " +"conditions to avoid undefined behaviour." msgstr "" #: src/unsafe/writing-unsafe-functions.md:6 @@ -9054,22 +10580,25 @@ 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 prohibit this with `#[deny(unsafe_op_in_unsafe_fn)]`. " +"Try adding it and see what happens." msgstr "" #: src/unsafe/extern-functions.md:1 -msgid "# Calling External Code" +msgid "Calling External Code" 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 " "them is thus unsafe:" msgstr "" @@ -9091,31 +10620,27 @@ 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" -"arbitrary circumstances." +"This is usually only a problem for extern functions which do things with " +"pointers which might violate Rust's memory model, but in general any C " +"function might have undefined behaviour under any 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)." -msgstr "" - -#: src/unsafe/unsafe-traits.md:1 -msgid "# Implementing Unsafe Traits" +"The `\"C\"` in this example is the ABI; [other ABIs are available too]" +"(https://doc.rust-lang.org/reference/items/external-blocks.html)." msgstr "" #: src/unsafe/unsafe-traits.md:3 msgid "" -"Like with functions, you can mark a trait as `unsafe` if the implementation must guarantee\n" -"particular conditions to avoid undefined behaviour." +"Like with functions, you can mark a trait as `unsafe` if the implementation " +"must guarantee 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):" +"For example, the `zerocopy` crate has an unsafe trait that looks [something " +"like this](https://docs.rs/zerocopy/latest/zerocopy/trait.AsBytes.html):" msgstr "" #: src/unsafe/unsafe-traits.md:9 @@ -9130,7 +10655,8 @@ 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" @@ -9142,101 +10668,173 @@ 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" -"the trait to be safely implemented." +"There should be a `# Safety` section on the Rustdoc for the trait explaining " +"the requirements for 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." +msgstr "" + +#: src/unsafe/unsafe-traits.md:35 +msgid "The built-in `Send` and `Sync` traits are unsafe." +msgstr "" + +#: src/exercises/day-3/afternoon.md:1 +msgid "Day 3: Afternoon Exercises" +msgstr "" + +#: src/exercises/day-3/afternoon.md:3 +msgid "Let us build a safe wrapper for reading directory content!" +msgstr "" + +#: src/exercises/day-3/afternoon.md:5 +msgid "" +"For this exercise, we suggest using a local dev environment instead of the " +"Playground. This will allow you to run your binary on your own machine." +msgstr "" + +#: src/exercises/day-3/afternoon.md:8 +msgid "" +"To get started, follow the [running locally](../../cargo/running-locally.md) " +"instructions." +msgstr "" + +#: src/exercises/day-3/afternoon.md:14 +msgid "" +"After looking at the exercise, you can look at the [solution](solutions-" +"afternoon.md) provided." +msgstr "" + +#: src/exercises/day-3/safe-ffi-wrapper.md:3 +msgid "" +"Rust has great support for calling functions through a _foreign function " +"interface_ (FFI). We will use this to build a safe wrapper for the `libc` " +"functions you would use from C to read the filenames of a directory." +msgstr "" + +#: src/exercises/day-3/safe-ffi-wrapper.md:7 +msgid "You will want to consult the manual pages:" +msgstr "" + +#: src/exercises/day-3/safe-ffi-wrapper.md:9 +msgid "[`opendir(3)`](https://man7.org/linux/man-pages/man3/opendir.3.html)" +msgstr "" + +#: src/exercises/day-3/safe-ffi-wrapper.md:10 +msgid "[`readdir(3)`](https://man7.org/linux/man-pages/man3/readdir.3.html)" +msgstr "" + +#: src/exercises/day-3/safe-ffi-wrapper.md:11 +msgid "[`closedir(3)`](https://man7.org/linux/man-pages/man3/closedir.3.html)" +msgstr "" + +#: src/exercises/day-3/safe-ffi-wrapper.md:13 +msgid "" +"You will also want to browse the [`std::ffi`](https://doc.rust-lang.org/std/" +"ffi/) module. There you find a number of string types which you need for the " +"exercise:" +msgstr "" + +#: src/exercises/day-3/safe-ffi-wrapper.md:16 +msgid "Encoding" +msgstr "" + +#: src/exercises/day-3/safe-ffi-wrapper.md:16 +msgid "Use" +msgstr "" + +#: src/exercises/day-3/safe-ffi-wrapper.md:18 +msgid "" +"[`str`](https://doc.rust-lang.org/std/primitive.str.html) and [`String`]" +"(https://doc.rust-lang.org/std/string/struct.String.html)" +msgstr "" + +#: src/exercises/day-3/safe-ffi-wrapper.md:18 +msgid "UTF-8" msgstr "" -#: src/unsafe/unsafe-traits.md:33 -msgid "The actual safety section for `AsBytes` is rather longer and more complicated." +#: src/exercises/day-3/safe-ffi-wrapper.md:18 +msgid "Text processing in Rust" msgstr "" -#: src/unsafe/unsafe-traits.md:35 -msgid "The built-in `Send` and `Sync` traits are unsafe." +#: src/exercises/day-3/safe-ffi-wrapper.md:19 +msgid "" +"[`CStr`](https://doc.rust-lang.org/std/ffi/struct.CStr.html) and [`CString`]" +"(https://doc.rust-lang.org/std/ffi/struct.CString.html)" msgstr "" -#: src/exercises/day-3/afternoon.md:1 -msgid "# Day 3: Afternoon Exercises" +#: src/exercises/day-3/safe-ffi-wrapper.md:19 +msgid "NUL-terminated" msgstr "" -#: src/exercises/day-3/afternoon.md:3 -msgid "Let us build a safe wrapper for reading directory content!" +#: src/exercises/day-3/safe-ffi-wrapper.md:19 +msgid "Communicating with C functions" msgstr "" -#: src/exercises/day-3/afternoon.md:5 +#: src/exercises/day-3/safe-ffi-wrapper.md:20 msgid "" -"For this exercise, we suggest using a local dev environment instead\n" -"of the Playground. This will allow you to run your binary on your own machine." +"[`OsStr`](https://doc.rust-lang.org/std/ffi/struct.OsStr.html) and " +"[`OsString`](https://doc.rust-lang.org/std/ffi/struct.OsString.html)" msgstr "" -#: src/exercises/day-3/afternoon.md:8 -msgid "To get started, follow the [running locally] instructions." +#: src/exercises/day-3/safe-ffi-wrapper.md:20 +msgid "OS-specific" msgstr "" -#: src/exercises/day-3/afternoon.md:14 -msgid "After looking at the exercise, you can look at the [solution] provided." +#: src/exercises/day-3/safe-ffi-wrapper.md:20 +msgid "Communicating with the OS" msgstr "" -#: src/exercises/day-3/safe-ffi-wrapper.md:1 -msgid "# Safe FFI Wrapper" +#: src/exercises/day-3/safe-ffi-wrapper.md:22 +msgid "You will convert between all these types:" msgstr "" -#: src/exercises/day-3/safe-ffi-wrapper.md:3 +#: src/exercises/day-3/safe-ffi-wrapper.md:24 msgid "" -"Rust has great support for calling functions through a _foreign function\n" -"interface_ (FFI). We will use this to build a safe wrapper for the `libc`\n" -"functions you would use from C to read the filenames of a directory." +"`&str` to `CString`: you need to allocate space for a trailing `\\0` " +"character," msgstr "" -#: src/exercises/day-3/safe-ffi-wrapper.md:7 -msgid "You will want to consult the manual pages:" +#: src/exercises/day-3/safe-ffi-wrapper.md:25 +msgid "`CString` to `*const i8`: you need a pointer to call C functions," msgstr "" -#: src/exercises/day-3/safe-ffi-wrapper.md:9 +#: src/exercises/day-3/safe-ffi-wrapper.md:26 msgid "" -"* [`opendir(3)`](https://man7.org/linux/man-pages/man3/opendir.3.html)\n" -"* [`readdir(3)`](https://man7.org/linux/man-pages/man3/readdir.3.html)\n" -"* [`closedir(3)`](https://man7.org/linux/man-pages/man3/closedir.3.html)" +"`*const i8` to `&CStr`: you need something which can find the trailing `\\0` " +"character," msgstr "" -#: src/exercises/day-3/safe-ffi-wrapper.md:13 +#: src/exercises/day-3/safe-ffi-wrapper.md:27 msgid "" -"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:" +"`&CStr` to `&[u8]`: a slice of bytes is the universal interface for \"some " +"unknow data\"," msgstr "" -#: src/exercises/day-3/safe-ffi-wrapper.md:16 +#: src/exercises/day-3/safe-ffi-wrapper.md:28 msgid "" -"| 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 |" -msgstr "" - -#: src/exercises/day-3/safe-ffi-wrapper.md:22 -msgid "You will convert between all these types:" +"`&[u8]` to `&OsStr`: `&OsStr` is a step towards `OsString`, use [`OsStrExt`]" +"(https://doc.rust-lang.org/std/os/unix/ffi/trait.OsStrExt.html) to create it," msgstr "" -#: src/exercises/day-3/safe-ffi-wrapper.md:24 +#: src/exercises/day-3/safe-ffi-wrapper.md:31 msgid "" -"- `&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" -"- `&[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" -" to create it,\n" -"- `&OsStr` to `OsString`: you need to clone the data in `&OsStr` to be able to return it and call\n" -" `readdir` again." +"`&OsStr` to `OsString`: you need to clone the data in `&OsStr` to be able to " +"return it and call `readdir` again." msgstr "" #: src/exercises/day-3/safe-ffi-wrapper.md:34 -msgid "The [Nomicon] also has a very useful chapter about FFI." +msgid "" +"The [Nomicon](https://doc.rust-lang.org/nomicon/ffi.html) also has a very " +"useful chapter about FFI." 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 " "functions and methods:" msgstr "" @@ -9255,10 +10853,12 @@ 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 according to the Linux man page for readdir(3), where ino_t and\n" +" // Layout according to the Linux man page for readdir(3), where ino_t " +"and\n" " // off_t are resolved according to the definitions in\n" " // /usr/include/x86_64-linux-gnu/{sys/types.h, bits/typesizes.h}.\n" " #[cfg(not(target_os = \"macos\"))]\n" @@ -9289,11 +10889,14 @@ msgid "" " #[cfg(not(all(target_os = \"macos\", target_arch = \"x86_64\")))]\n" " pub fn readdir(s: *mut DIR) -> *const dirent;\n" "\n" -" // See https://github.com/rust-lang/libc/issues/414 and the section on\n" +" // See https://github.com/rust-lang/libc/issues/414 and the section " +"on\n" " // _DARWIN_FEATURE_64_BIT_INODE in the macOS man page for stat(2).\n" " //\n" -" // \"Platforms that existed before these updates were available\" refers\n" -" // to macOS (as opposed to iOS / wearOS / etc.) on Intel and PowerPC.\n" +" // \"Platforms that existed before these updates were available\" " +"refers\n" +" // to macOS (as opposed to iOS / wearOS / etc.) on Intel and " +"PowerPC.\n" " #[cfg(all(target_os = \"macos\", target_arch = \"x86_64\"))]\n" " #[link_name = \"readdir$INODE64\"]\n" " pub fn readdir(s: *mut DIR) -> *const dirent;\n" @@ -9343,32 +10946,28 @@ msgid "" msgstr "" #: src/android.md:1 -msgid "# Welcome to Rust in Android" +msgid "Welcome to Rust in Android" msgstr "" #: src/android.md:3 msgid "" -"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." +"Rust is supported for native platform development on Android. This means " +"that you can write new operating system services in Rust, as well as " +"extending 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" -"> parses some raw bytes would be ideal." -msgstr "" - -#: src/android/setup.md:1 -msgid "# Setup" +"We will attempt to call Rust from one of your own projects today. So try to " +"find a little corner of your code base where we can move some lines of code " +"to Rust. The fewer dependencies and \"exotic\" types the better. Something " +"that parses some raw bytes would be ideal." msgstr "" #: src/android/setup.md:3 msgid "" -"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:" +"We will be using an Android Virtual Device to test our code. Make sure you " +"have access to one or create a new one with:" msgstr "" #: src/android/setup.md:6 @@ -9382,12 +10981,8 @@ msgstr "" #: src/android/setup.md:12 msgid "" -"Please see the [Android Developer\n" -"Codelab](https://source.android.com/docs/setup/start) for details." -msgstr "" - -#: src/android/build-rules.md:1 -msgid "# Build Rules" +"Please see the [Android Developer Codelab](https://source.android.com/docs/" +"setup/start) for details." msgstr "" #: src/android/build-rules.md:3 @@ -9395,26 +10990,83 @@ msgid "The Android build system (Soong) supports Rust via a number of modules:" msgstr "" #: src/android/build-rules.md:5 +msgid "Module Type" +msgstr "" + +#: src/android/build-rules.md:5 +msgid "Description" +msgstr "" + +#: src/android/build-rules.md:7 +msgid "`rust_binary`" +msgstr "" + +#: src/android/build-rules.md:7 +msgid "Produces a Rust binary." +msgstr "" + +#: src/android/build-rules.md:8 +msgid "`rust_library`" +msgstr "" + +#: src/android/build-rules.md:8 +msgid "Produces a Rust library, and provides both `rlib` and `dylib` variants." +msgstr "" + +#: src/android/build-rules.md:9 +msgid "`rust_ffi`" +msgstr "" + +#: src/android/build-rules.md:9 +msgid "" +"Produces a Rust C library usable by `cc` modules, and provides both static " +"and shared variants." +msgstr "" + +#: src/android/build-rules.md:10 +msgid "`rust_proc_macro`" +msgstr "" + +#: src/android/build-rules.md:10 +msgid "" +"Produces a `proc-macro` Rust library. These are analogous to compiler " +"plugins." +msgstr "" + +#: src/android/build-rules.md:11 +msgid "`rust_test`" +msgstr "" + +#: src/android/build-rules.md:11 +msgid "Produces a Rust test binary that uses the standard Rust test harness." +msgstr "" + +#: src/android/build-rules.md:12 +msgid "`rust_fuzz`" +msgstr "" + +#: src/android/build-rules.md:12 +msgid "Produces a Rust fuzz binary leveraging `libfuzzer`." +msgstr "" + +#: src/android/build-rules.md:13 +msgid "`rust_protobuf`" +msgstr "" + +#: src/android/build-rules.md:13 msgid "" -"| Module Type | " -"Description |\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" -"| `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. |" +"Generates source and produces a Rust library that provides an interface for " +"a particular protobuf." +msgstr "" + +#: src/android/build-rules.md:14 +msgid "`rust_bindgen`" +msgstr "" + +#: src/android/build-rules.md:14 +msgid "" +"Generates source and produces a Rust library containing Rust bindings to C " +"libraries." msgstr "" #: src/android/build-rules.md:16 @@ -9422,13 +11074,13 @@ msgid "We will look at `rust_binary` and `rust_library` next." msgstr "" #: src/android/build-rules/binary.md:1 -msgid "# Rust Binaries" +msgid "Rust Binaries" 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" -"the following files:" +"Let us start with a simple application. At the root of an AOSP checkout, " +"create the following files:" msgstr "" #: src/android/build-rules/binary.md:6 src/android/build-rules/library.md:13 @@ -9483,7 +11135,7 @@ msgid "" msgstr "" #: src/android/build-rules/library.md:1 -msgid "# Rust Libraries" +msgid "Rust Libraries" msgstr "" #: src/android/build-rules/library.md:3 @@ -9495,10 +11147,14 @@ msgid "Here we declare a dependency on two libraries:" msgstr "" #: src/android/build-rules/library.md:7 +msgid "`libgreeting`, which we define below," +msgstr "" + +#: src/android/build-rules/library.md:8 msgid "" -"* `libgreeting`, which we define below,\n" -"* `libtextwrap`, which is a crate already vendored in\n" -" [`external/rust/crates/`][crates]." +"`libtextwrap`, which is a crate already vendored in [`external/rust/crates/`]" +"(https://cs.android.com/android/platform/superproject/+/master:external/rust/" +"crates/)." msgstr "" #: src/android/build-rules/library.md:15 @@ -9562,7 +11218,8 @@ 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" "```" msgstr "" @@ -9575,24 +11232,22 @@ msgid "" "```" msgstr "" -#: src/android/aidl.md:1 -msgid "# AIDL" -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:" +"The [Android Interface Definition Language (AIDL)](https://developer.android." +"com/guide/components/aidl) is supported in Rust:" msgstr "" #: src/android/aidl.md:6 -msgid "" -"* Rust code can call existing AIDL servers,\n" -"* You can create new AIDL servers in Rust." +msgid "Rust code can call existing AIDL servers," +msgstr "" + +#: src/android/aidl.md:7 +msgid "You can create new AIDL servers in Rust." msgstr "" #: src/android/aidl/interface.md:1 -msgid "# AIDL Interfaces" +msgid "AIDL Interfaces" msgstr "" #: src/android/aidl/interface.md:3 @@ -9600,7 +11255,8 @@ 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 @@ -9617,7 +11273,7 @@ msgid "" msgstr "" #: src/android/aidl/interface.md:17 -msgid "*birthday_service/aidl/Android.bp*:" +msgid "_birthday_service/aidl/Android.bp_:" msgstr "" #: src/android/aidl/interface.md:19 @@ -9638,12 +11294,12 @@ 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" -"partition." +"Add `vendor_available: true` if your AIDL file is used by a binary in the " +"vendor partition." msgstr "" #: src/android/aidl/implementation.md:1 -msgid "# Service Implementation" +msgid "Service Implementation" msgstr "" #: src/android/aidl/implementation.md:3 @@ -9651,15 +11307,15 @@ msgid "We can now implement the AIDL service:" msgstr "" #: src/android/aidl/implementation.md:5 -msgid "*birthday_service/src/lib.rs*:" +msgid "_birthday_service/src/lib.rs_:" msgstr "" #: src/android/aidl/implementation.md:7 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" @@ -9668,17 +11324,20 @@ 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 -msgid "*birthday_service/Android.bp*:" +#: src/android/aidl/implementation.md:26 src/android/aidl/server.md:28 +#: src/android/aidl/client.md:37 +msgid "_birthday_service/Android.bp_:" msgstr "" #: src/android/aidl/implementation.md:28 @@ -9697,7 +11356,7 @@ msgid "" msgstr "" #: src/android/aidl/server.md:1 -msgid "# AIDL Server" +msgid "AIDL Server" msgstr "" #: src/android/aidl/server.md:3 @@ -9705,7 +11364,7 @@ msgid "Finally, we can create a server which exposes the service:" msgstr "" #: src/android/aidl/server.md:5 -msgid "*birthday_service/src/server.rs*:" +msgid "_birthday_service/src/server.rs_:" msgstr "" #: src/android/aidl/server.md:7 @@ -9713,8 +11372,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" @@ -9726,7 +11385,8 @@ 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" @@ -9750,10 +11410,6 @@ msgid "" "```" msgstr "" -#: src/android/aidl/deploy.md:1 -msgid "# Deploy" -msgstr "" - #: src/android/aidl/deploy.md:3 msgid "We can now build, push, and start the service:" msgstr "" @@ -9762,7 +11418,8 @@ msgstr "" msgid "" "```shell\n" "m birthday_server\n" -"adb push \"$ANDROID_PRODUCT_OUT/system/bin/birthday_server /data/local/tmp\"\n" +"adb push \"$ANDROID_PRODUCT_OUT/system/bin/birthday_server /data/local/" +"tmp\"\n" "adb shell /data/local/tmp/birthday_server\n" "```" msgstr "" @@ -9812,7 +11469,7 @@ msgid "" msgstr "" #: src/android/aidl/client.md:1 -msgid "# AIDL Client" +msgid "AIDL Client" msgstr "" #: src/android/aidl/client.md:3 @@ -9820,21 +11477,22 @@ msgid "Finally, we can create a Rust client for our new service." msgstr "" #: src/android/aidl/client.md:5 -msgid "*birthday_service/src/client.rs*:" +msgid "_birthday_service/src/client.rs_:" msgstr "" #: src/android/aidl/client.md:7 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" @@ -9849,7 +11507,8 @@ 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" @@ -9885,7 +11544,8 @@ msgstr "" msgid "" "```shell\n" "m birthday_client\n" -"adb push \"$ANDROID_PRODUCT_OUT/system/bin/birthday_client /data/local/tmp\"\n" +"adb push \"$ANDROID_PRODUCT_OUT/system/bin/birthday_client /data/local/" +"tmp\"\n" "adb shell /data/local/tmp/birthday_client Charlie 60\n" "```" msgstr "" @@ -9897,14 +11557,10 @@ msgid "" "```" msgstr "" -#: src/android/aidl/changing.md:1 -msgid "# Changing API" -msgstr "" - #: src/android/aidl/changing.md:3 msgid "" -"Let us extend the API with more functionality: we want to let clients specify a\n" -"list of lines for the birthday card:" +"Let us extend the API with more functionality: we want to let clients " +"specify a list of lines for the birthday card:" msgstr "" #: src/android/aidl/changing.md:6 @@ -9920,14 +11576,10 @@ msgid "" "```" msgstr "" -#: src/android/logging.md:1 src/bare-metal/aps/logging.md:1 -msgid "# Logging" -msgstr "" - #: src/android/logging.md:3 msgid "" -"You should use the `log` crate to automatically log to `logcat` (on-device) or\n" -"`stdout` (on-host):" +"You should use the `log` crate to automatically log to `logcat` (on-device) " +"or `stdout` (on-host):" msgstr "" #: src/android/logging.md:6 @@ -9985,7 +11637,8 @@ msgstr "" msgid "" "```shell\n" "m hello_rust_logs\n" -"adb push \"$ANDROID_PRODUCT_OUT/system/bin/hello_rust_logs /data/local/tmp\"\n" +"adb push \"$ANDROID_PRODUCT_OUT/system/bin/hello_rust_logs /data/local/" +"tmp\"\n" "adb shell /data/local/tmp/hello_rust_logs\n" "```" msgstr "" @@ -10005,40 +11658,40 @@ msgstr "" msgid "" "```text\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 "" -#: src/android/interoperability.md:1 -msgid "# Interoperability" -msgstr "" - #: src/android/interoperability.md:3 msgid "" -"Rust has excellent support for interoperability with other languages. This means\n" -"that you can:" +"Rust has excellent support for interoperability with other languages. This " +"means that you can:" msgstr "" #: src/android/interoperability.md:6 -msgid "" -"* Call Rust functions from other languages.\n" -"* Call functions written in other languages from Rust." +msgid "Call Rust functions from other languages." +msgstr "" + +#: src/android/interoperability.md:7 +msgid "Call functions written in other languages from Rust." msgstr "" #: src/android/interoperability.md:9 msgid "" -"When you call functions in a foreign language we say that you're using a\n" +"When you call functions in a foreign language we say that you're using a " "_foreign function interface_, also known as FFI." msgstr "" #: src/android/interoperability/with-c.md:1 -msgid "# Interoperability with C" +msgid "Interoperability with C" msgstr "" #: src/android/interoperability/with-c.md:3 msgid "" -"Rust has full support for linking object files with a C calling convention.\n" +"Rust has full support for linking object files with a C calling convention. " "Similarly, you can export Rust functions and call them from C." msgstr "" @@ -10063,14 +11716,14 @@ msgstr "" #: src/android/interoperability/with-c.md:20 msgid "" -"We already saw this in the [Safe FFI Wrapper\n" -"exercise](../../exercises/day-3/safe-ffi-wrapper.md)." +"We already saw this in the [Safe FFI Wrapper exercise](../../exercises/day-3/" +"safe-ffi-wrapper.md)." msgstr "" #: src/android/interoperability/with-c.md:23 msgid "" -"> This assumes full knowledge of the target platform. Not recommended for\n" -"> production." +"This assumes full knowledge of the target platform. Not recommended for " +"production." msgstr "" #: src/android/interoperability/with-c.md:26 @@ -10078,13 +11731,13 @@ msgid "We will look at better options next." msgstr "" #: src/android/interoperability/with-c/bindgen.md:1 -msgid "# Using Bindgen" +msgid "Using Bindgen" msgstr "" #: src/android/interoperability/with-c/bindgen.md:3 msgid "" -"The [bindgen](https://rust-lang.github.io/rust-bindgen/introduction.html) tool\n" -"can auto-generate bindings from a C header file." +"The [bindgen](https://rust-lang.github.io/rust-bindgen/introduction.html) " +"tool can auto-generate bindings from a C header file." msgstr "" #: src/android/interoperability/with-c/bindgen.md:6 @@ -10130,8 +11783,10 @@ msgstr "" msgid "Add this to your `Android.bp` file:" msgstr "" -#: src/android/interoperability/with-c/bindgen.md:35 src/android/interoperability/with-c/bindgen.md:55 -#: src/android/interoperability/with-c/bindgen.md:69 src/android/interoperability/with-c/bindgen.md:108 +#: src/android/interoperability/with-c/bindgen.md:35 +#: src/android/interoperability/with-c/bindgen.md:55 +#: src/android/interoperability/with-c/bindgen.md:69 +#: src/android/interoperability/with-c/bindgen.md:108 msgid "_interoperability/bindgen/Android.bp_:" msgstr "" @@ -10147,7 +11802,7 @@ msgstr "" #: src/android/interoperability/with-c/bindgen.md:44 msgid "" -"Create a wrapper header file for the library (not strictly needed in this\n" +"Create a wrapper header file for the library (not strictly needed in this " "example):" msgstr "" @@ -10222,7 +11877,8 @@ 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 "" @@ -10254,7 +11910,7 @@ msgid "" msgstr "" #: src/android/interoperability/with-c/rust.md:1 -msgid "# Calling Rust" +msgid "Calling Rust" msgstr "" #: src/android/interoperability/with-c/rust.md:3 @@ -10359,48 +12015,44 @@ msgstr "" msgid "" "```shell\n" "m analyze_numbers\n" -"adb push \"$ANDROID_PRODUCT_OUT/system/bin/analyze_numbers /data/local/tmp\"\n" +"adb push \"$ANDROID_PRODUCT_OUT/system/bin/analyze_numbers /data/local/" +"tmp\"\n" "adb shell /data/local/tmp/analyze_numbers\n" "```" 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." -msgstr "" - -#: src/android/interoperability/cpp.md:1 -msgid "# With C++" +"`#[no_mangle]` disables Rust's usual name mangling, so the exported symbol " +"will just be the name of the function. You can also use `#[export_name = " +"\"some_name\"]` to specify whatever name you want." msgstr "" #: src/android/interoperability/cpp.md:3 msgid "" -"The [CXX crate][1] makes it possible to do safe interoperability between Rust\n" -"and C++." +"The [CXX crate](https://cxx.rs/) makes it possible to do safe " +"interoperability between Rust and C++." msgstr "" #: src/android/interoperability/cpp.md:6 msgid "The overall approach looks like this:" msgstr "" -#: src/android/interoperability/cpp.md:8 -msgid "" -msgstr "" - #: src/android/interoperability/cpp.md:10 -msgid "See the [CXX tutorial][2] for an full example of using this." +msgid "" +"See the [CXX tutorial](https://cxx.rs/tutorial.html) for an full example of " +"using this." msgstr "" #: src/android/interoperability/java.md:1 -msgid "# Interoperability with Java" +msgid "Interoperability with Java" msgstr "" #: src/android/interoperability/java.md:3 msgid "" -"Java can load shared objects via [Java Native Interface\n" -"(JNI)](https://en.wikipedia.org/wiki/Java_Native_Interface). The [`jni`\n" -"crate](https://docs.rs/jni/) allows you to create a compatible library." +"Java can load shared objects via [Java Native Interface (JNI)](https://en." +"wikipedia.org/wiki/Java_Native_Interface). The [`jni` crate](https://docs.rs/" +"jni/) allows you to create a compatible library." msgstr "" #: src/android/interoperability/java.md:7 @@ -10435,7 +12087,8 @@ 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 "" @@ -10502,72 +12155,79 @@ 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/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" -"try to integrate some Rust into it. Some suggestions:" +"This is a group exercise: We will look at one of the projects you work with " +"and try to integrate some Rust into it. Some suggestions:" msgstr "" #: src/exercises/android/morning.md:6 -msgid "" -"* Call your AIDL service with a client written in Rust.\n" -"\n" -"* Move a function from your project to Rust and call it." +msgid "Call your AIDL service with a client written in Rust." +msgstr "" + +#: src/exercises/android/morning.md:8 +msgid "Move a function from your project to Rust and call it." msgstr "" #: src/exercises/android/morning.md:12 msgid "" -"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." +"No solution is provided here since this is open-ended: it relies on someone " +"in the class having a piece of code which you can turn in to Rust on the fly." msgstr "" #: src/bare-metal.md:1 -msgid "# Welcome to Bare Metal Rust" +msgid "Welcome to Bare Metal Rust" 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" -"experience with bare-metal programming in some other language such as C." +"This is a standalone one-day course about bare-metal Rust, aimed at people " +"who are familiar with the basics of Rust (perhaps from completing the " +"Comprehensive Rust course), and ideally also have some 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" -"be divided into several parts:" +"Today we will talk about 'bare-metal' Rust: running Rust code without an OS " +"underneath us. This will be divided into several parts:" msgstr "" #: src/bare-metal.md:10 -msgid "" -"- What is `no_std` Rust?\n" -"- Writing firmware for microcontrollers.\n" -"- Writing bootloader / kernel code for application processors.\n" -"- Some useful crates for bare-metal Rust development." +msgid "What is `no_std` Rust?" +msgstr "" + +#: src/bare-metal.md:11 +msgid "Writing firmware for microcontrollers." +msgstr "" + +#: src/bare-metal.md:12 +msgid "Writing bootloader / kernel code for application processors." +msgstr "" + +#: src/bare-metal.md:13 +msgid "Some useful crates for bare-metal Rust development." 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 as an example. It's a [development board](https://" +"tech.microbit.org/hardware/) based on the Nordic nRF51822 microcontroller " +"with some LEDs and buttons, an I2C-connected accelerometer and compass, and " "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" @@ -10576,13 +12236,15 @@ 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" "```" @@ -10606,27 +12268,14 @@ msgid "" msgstr "" #: src/bare-metal/no_std.md:1 -msgid "# `no_std`" -msgstr "" - -#: src/bare-metal/no_std.md:3 -msgid "" -"\n" -"\n" -"\n" -"\n" -"\n" -"\n" -"\n" -"\n" -"\n" -"
" +msgid "`no_std`" msgstr "" #: src/bare-metal/no_std.md:7 msgid "`core`" msgstr "" -#: src/bare-metal/no_std.md:9 src/bare-metal/no_std.md:14 -msgid "" -"" -msgstr "" - -#: src/bare-metal/no_std.md:12 +#: src/bare-metal/no_std.md:12 src/bare-metal/alloc.md:1 msgid "`alloc`" msgstr "" @@ -10634,72 +12283,100 @@ msgstr "" msgid "`std`" msgstr "" -#: src/bare-metal/no_std.md:19 -msgid "" -"
" +#: src/bare-metal/no_std.md:24 +msgid "Slices, `&str`, `CStr`" msgstr "" -#: src/bare-metal/no_std.md:24 -msgid "" -"* Slices, `&str`, `CStr`\n" -"* `NonZeroU8`...\n" -"* `Option`, `Result`\n" -"* `Display`, `Debug`, `write!`...\n" -"* `Iterator`\n" -"* `panic!`, `assert_eq!`...\n" -"* `NonNull` and all the usual pointer-related functions\n" -"* `Future` and `async`/`await`\n" -"* `fence`, `AtomicBool`, `AtomicPtr`, `AtomicU32`...\n" -"* `Duration`" +#: src/bare-metal/no_std.md:25 +msgid "`NonZeroU8`..." msgstr "" -#: src/bare-metal/no_std.md:35 src/bare-metal/no_std.md:42 -msgid "" -"" +#: src/bare-metal/no_std.md:26 +msgid "`Option`, `Result`" +msgstr "" + +#: src/bare-metal/no_std.md:27 +msgid "`Display`, `Debug`, `write!`..." +msgstr "" + +#: src/bare-metal/no_std.md:29 +msgid "`panic!`, `assert_eq!`..." +msgstr "" + +#: src/bare-metal/no_std.md:30 +msgid "`NonNull` and all the usual pointer-related functions" +msgstr "" + +#: src/bare-metal/no_std.md:31 +msgid "`Future` and `async`/`await`" +msgstr "" + +#: src/bare-metal/no_std.md:32 +msgid "`fence`, `AtomicBool`, `AtomicPtr`, `AtomicU32`..." +msgstr "" + +#: src/bare-metal/no_std.md:33 +msgid "`Duration`" msgstr "" #: src/bare-metal/no_std.md:38 -msgid "" -"* `Box`, `Cow`, `Arc`, `Rc`\n" -"* `Vec`, `BinaryHeap`, `BtreeMap`, `LinkedList`, `VecDeque`\n" -"* `String`, `CString`, `format!`" +msgid "`Box`, `Cow`, `Arc`, `Rc`" +msgstr "" + +#: src/bare-metal/no_std.md:39 +msgid "`Vec`, `BinaryHeap`, `BtreeMap`, `LinkedList`, `VecDeque`" +msgstr "" + +#: src/bare-metal/no_std.md:40 +msgid "`String`, `CString`, `format!`" msgstr "" #: src/bare-metal/no_std.md:45 -msgid "" -"* `Error`\n" -"* `HashMap`\n" -"* `Mutex`, `Condvar`, `Barrier`, `Once`, `RwLock`, `mpsc`\n" -"* `File` and the rest of `fs`\n" -"* `println!`, `Read`, `Write`, `Stdin`, `Stdout` and the rest of `io`\n" -"* `Path`, `OsString`\n" -"* `net`\n" -"* `Command`, `Child`, `ExitCode`\n" -"* `spawn`, `sleep` and the rest of `thread`\n" -"* `SystemTime`, `Instant`" +msgid "`Error`" msgstr "" -#: src/bare-metal/no_std.md:56 -msgid "" -"
\n" -"\n" -"
" +#: src/bare-metal/no_std.md:47 +msgid "`Mutex`, `Condvar`, `Barrier`, `Once`, `RwLock`, `mpsc`" +msgstr "" + +#: src/bare-metal/no_std.md:48 +msgid "`File` and the rest of `fs`" +msgstr "" + +#: src/bare-metal/no_std.md:49 +msgid "`println!`, `Read`, `Write`, `Stdin`, `Stdout` and the rest of `io`" +msgstr "" + +#: src/bare-metal/no_std.md:50 +msgid "`Path`, `OsString`" +msgstr "" + +#: src/bare-metal/no_std.md:51 +msgid "`net`" +msgstr "" + +#: src/bare-metal/no_std.md:52 +msgid "`Command`, `Child`, `ExitCode`" +msgstr "" + +#: src/bare-metal/no_std.md:53 +msgid "`spawn`, `sleep` and the rest of `thread`" +msgstr "" + +#: src/bare-metal/no_std.md:54 +msgid "`SystemTime`, `Instant`" msgstr "" #: src/bare-metal/no_std.md:62 -msgid "" -"* `HashMap` depends on RNG.\n" -"* `std` re-exports the contents of both `core` and `alloc`." +msgid "`HashMap` depends on RNG." +msgstr "" + +#: src/bare-metal/no_std.md:63 +msgid "`std` re-exports the contents of both `core` and `alloc`." msgstr "" #: src/bare-metal/minimal.md:1 -msgid "# A minimal `no_std` program" +msgid "A minimal `no_std` program" msgstr "" #: src/bare-metal/minimal.md:3 @@ -10718,25 +12395,34 @@ msgid "" msgstr "" #: src/bare-metal/minimal.md:17 +msgid "This will compile to an empty binary." +msgstr "" + +#: src/bare-metal/minimal.md:18 +msgid "`std` provides a panic handler; without it we must provide our own." +msgstr "" + +#: src/bare-metal/minimal.md:19 +msgid "It can also be provided by another crate, such as `panic-halt`." +msgstr "" + +#: src/bare-metal/minimal.md:20 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" -" `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" -" for Rust code to run." +"Depending on the target, you may need to compile with `panic = \"abort\"` to " +"avoid an error about `eh_personality`." msgstr "" -#: src/bare-metal/alloc.md:1 -msgid "# `alloc`" +#: src/bare-metal/minimal.md:22 +msgid "" +"Note that there is no `main` or any other entry point; it's up to you to " +"define your own entry point. This will typically involve a linker script and " +"some assembly code to set things up ready for Rust code to run." 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)." +"To use `alloc` you must implement a [global (heap) allocator](https://doc." +"rust-lang.org/stable/std/alloc/trait.GlobalAlloc.html)." msgstr "" #: src/bare-metal/alloc.md:6 @@ -10758,7 +12444,8 @@ 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" @@ -10775,24 +12462,38 @@ 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" -" 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" -" we get its panic handler.\n" -"* This example will build but not run, as it doesn't have an entry point." +"`buddy_system_allocator` is a third-party crate implementing a basic buddy " +"system allocator. Other crates are available, or you can write your own or " +"hook into your existing allocator." +msgstr "" + +#: src/bare-metal/alloc.md:41 +msgid "" +"The const parameter of `LockedHeap` is the max order of the allocator; i.e. " +"in this case it can allocate regions of up to 2\\*\\*32 bytes." msgstr "" -#: src/bare-metal/microcontrollers.md:1 -msgid "# Microcontrollers" +#: src/bare-metal/alloc.md:43 +msgid "" +"If any crate in your dependency tree depends on `alloc` then you must have " +"exactly one global allocator defined in your binary. Usually this is done in " +"the top-level binary crate." +msgstr "" + +#: src/bare-metal/alloc.md:45 +msgid "" +"`extern crate panic_halt as _` is necessary to ensure that the `panic_halt` " +"crate is linked in so we get its panic handler." +msgstr "" + +#: src/bare-metal/alloc.md:47 +msgid "This example will build but not run, as it doesn't have an entry point." 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 @@ -10815,24 +12516,25 @@ 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" -" to the reset handler doesn't make sense.\n" -"* Run the example with `cargo embed --bin minimal`" +"The `cortex_m_rt::entry` macro requires that the function have type `fn() -" +"> !`, because returning to the reset handler doesn't make sense." msgstr "" -#: src/bare-metal/microcontrollers/mmio.md:1 -msgid "# Raw MMIO" +#: src/bare-metal/microcontrollers.md:27 +msgid "Run the example with `cargo embed --bin minimal`" 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" -"micro:bit:" +"Most microcontrollers access peripherals via memory-mapped IO. Let's try " +"turning on an LED on our micro:bit:" msgstr "" #: src/bare-metal/microcontrollers/mmio.md:6 @@ -10866,23 +12568,29 @@ 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" @@ -10895,11 +12603,15 @@ msgid "" 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." +msgid "" +"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 "" @@ -10911,14 +12623,14 @@ msgid "" msgstr "" #: src/bare-metal/microcontrollers/pacs.md:1 -msgid "# Peripheral Access Crates" +msgid "Peripheral Access Crates" 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" -"files." +"[`svd2rust`](https://crates.io/crates/svd2rust) generates mostly-safe Rust " +"wrappers for memory-mapped peripherals from [CMSIS-SVD](https://www.keil.com/" +"pack/doc/CMSIS/SVD/html/index.html) files." msgstr "" #: src/bare-metal/microcontrollers/pacs.md:7 @@ -10966,15 +12678,31 @@ msgstr "" #: src/bare-metal/microcontrollers/pacs.md:49 msgid "" -"* 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" -" and so on.\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." +"SVD (System View Description) files are XML files typically provided by " +"silicon vendors which describe the memory map of the device." +msgstr "" + +#: src/bare-metal/microcontrollers/pacs.md:51 +msgid "" +"They are organised by peripheral, register, field and value, with names, " +"descriptions, addresses and so on." +msgstr "" + +#: src/bare-metal/microcontrollers/pacs.md:53 +msgid "" +"SVD files are often buggy and incomplete, so there are various projects " +"which patch the mistakes, add missing details, and publish the generated " +"crates." +msgstr "" + +#: src/bare-metal/microcontrollers/pacs.md:55 +msgid "`cortex-m-rt` provides the vector table, among other things." +msgstr "" + +#: src/bare-metal/microcontrollers/pacs.md:56 +msgid "" +"If you `cargo install cargo-binutils` then you can run `cargo objdump --bin " +"pac -- -d --no-show-raw-insn` to see the resulting binary." msgstr "" #: src/bare-metal/microcontrollers/pacs.md:61 @@ -10985,14 +12713,15 @@ msgid "" msgstr "" #: src/bare-metal/microcontrollers/hals.md:1 -msgid "# HAL crates" +msgid "HAL crates" 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" -"from [`embedded-hal`](https://crates.io/crates/embedded-hal)." +"[HAL crates](https://github.com/rust-embedded/awesome-embedded-rust#hal-" +"implementation-crates) for many microcontrollers provide wrappers around " +"various peripherals. These generally implement traits from [`embedded-hal`]" +"(https://crates.io/crates/embedded-hal)." msgstr "" #: src/bare-metal/microcontrollers/hals.md:7 @@ -11030,9 +12759,13 @@ 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" -" MSP430, AVR and PIC microcontrollers." +"`set_low` and `set_high` are methods on the `embedded_hal` `OutputPin` trait." +msgstr "" + +#: src/bare-metal/microcontrollers/hals.md:40 +msgid "" +"HAL crates exist for many Cortex-M and RISC-V devices, including various " +"STM32, GD32, nRF, NXP, MSP430, AVR and PIC microcontrollers." msgstr "" #: src/bare-metal/microcontrollers/hals.md:45 @@ -11043,11 +12776,13 @@ msgid "" msgstr "" #: src/bare-metal/microcontrollers/board-support.md:1 -msgid "# Board support crates" +msgid "Board support crates" 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." +msgid "" +"Board support crates provide a further level of wrapping for a specific " +"board for convenience." msgstr "" #: src/bare-metal/microcontrollers/board-support.md:5 @@ -11076,11 +12811,18 @@ 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" -" initialisation.\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." +"In this case the board support crate is just providing more useful names, " +"and a bit of initialisation." +msgstr "" + +#: src/bare-metal/microcontrollers/board-support.md:30 +msgid "" +"The crate may also include drivers for some on-board devices outside of the " +"microcontroller itself." +msgstr "" + +#: src/bare-metal/microcontrollers/board-support.md:32 +msgid "`microbit-v2` includes a simple driver for the LED matrix." msgstr "" #: src/bare-metal/microcontrollers/board-support.md:36 @@ -11091,7 +12833,7 @@ msgid "" msgstr "" #: src/bare-metal/microcontrollers/type-state.md:1 -msgid "# The type state pattern" +msgid "The type state pattern" msgstr "" #: src/bare-metal/microcontrollers/type-state.md:3 @@ -11110,14 +12852,17 @@ 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" @@ -11126,94 +12871,177 @@ 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" -" 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" -" 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" -" 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" -" * Many HAL crates follow this pattern." +"Pins don't implement `Copy` or `Clone`, so only one instance of each can " +"exist. Once a pin is moved out of the port struct nobody else can take it." +msgstr "" + +#: src/bare-metal/microcontrollers/type-state.md:34 +msgid "" +"Changing the configuration of a pin consumes the old pin instance, so you " +"can’t keep use the old instance afterwards." +msgstr "" + +#: src/bare-metal/microcontrollers/type-state.md:36 +msgid "" +"The type of a value indicates the state that it is in: e.g. in this case, " +"the configuration state of a GPIO pin. This encodes the state machine into " +"the type system, and ensures that you don't try to use a pin in a certain " +"way without properly configuring it first. Illegal state transitions are " +"caught at compile time." +msgstr "" + +#: src/bare-metal/microcontrollers/type-state.md:40 +msgid "" +"You can call `is_high` on an input pin and `set_high` on an output pin, but " +"not vice-versa." +msgstr "" + +#: src/bare-metal/microcontrollers/type-state.md:41 +msgid "Many HAL crates follow this pattern." +msgstr "" + +#: src/bare-metal/microcontrollers/embedded-hal.md:1 +msgid "`embedded-hal`" +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 covering common microcontroller peripherals." +msgstr "" + +#: src/bare-metal/microcontrollers/embedded-hal.md:6 +msgid "GPIO" +msgstr "" + +#: src/bare-metal/microcontrollers/embedded-hal.md:7 +msgid "ADC" +msgstr "" + +#: src/bare-metal/microcontrollers/embedded-hal.md:8 +msgid "I2C, SPI, UART, CAN" +msgstr "" + +#: src/bare-metal/microcontrollers/embedded-hal.md:9 +msgid "RNG" +msgstr "" + +#: src/bare-metal/microcontrollers/embedded-hal.md:10 +msgid "Timers" +msgstr "" + +#: src/bare-metal/microcontrollers/embedded-hal.md:11 +msgid "Watchdogs" +msgstr "" + +#: src/bare-metal/microcontrollers/embedded-hal.md:13 +msgid "" +"Other crates then implement [drivers](https://github.com/rust-embedded/" +"awesome-embedded-rust#driver-crates) in terms of these 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 Raspberry Pi." +msgstr "" + +#: src/bare-metal/microcontrollers/embedded-hal.md:21 +msgid "" +"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 +msgid "`probe-rs`, `cargo-embed`" +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 integrated." +msgstr "" + +#: src/bare-metal/microcontrollers/probe-rs.md:6 +msgid "SWD" +msgstr "" + +#: src/bare-metal/microcontrollers/probe-rs.md:6 +msgid " and JTAG via CMSIS-DAP, ST-Link and J-Link probes" +msgstr "" + +#: src/bare-metal/microcontrollers/probe-rs.md:7 +msgid "GDB stub and Microsoft " +msgstr "" + +#: src/bare-metal/microcontrollers/probe-rs.md:7 +msgid "DAP" +msgstr "" + +#: src/bare-metal/microcontrollers/probe-rs.md:7 +msgid " server" msgstr "" -#: src/bare-metal/microcontrollers/embedded-hal.md:1 -msgid "# `embedded-hal`" +#: src/bare-metal/microcontrollers/probe-rs.md:8 +msgid "Cargo integration" 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" -"covering common microcontroller peripherals." +#: src/bare-metal/microcontrollers/probe-rs.md:10 +msgid "`cargo-embed` is a cargo subcommand to build and flash binaries, log " msgstr "" -#: src/bare-metal/microcontrollers/embedded-hal.md:6 -msgid "" -" * GPIO\n" -" * ADC\n" -" * I2C, SPI, UART, CAN\n" -" * RNG\n" -" * Timers\n" -" * Watchdogs" +#: src/bare-metal/microcontrollers/probe-rs.md:11 +msgid "RTT" msgstr "" -#: src/bare-metal/microcontrollers/embedded-hal.md:13 +#: src/bare-metal/microcontrollers/probe-rs.md:11 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." +" output and connect GDB. It's configured by an `Embed.toml` file in your " +"project directory." msgstr "" -#: src/bare-metal/microcontrollers/embedded-hal.md:19 +#: src/bare-metal/microcontrollers/probe-rs.md:16 msgid "" -" * 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." +"[CMSIS-DAP](https://arm-software.github.io/CMSIS_5/DAP/html/index.html) is " +"an Arm standard protocol over USB for an in-circuit debugger to access the " +"CoreSight Debug Access Port of various Arm Cortex processors. It's what the " +"on-board debugger on the BBC micro:bit uses." msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md:1 -msgid "# `probe-rs`, `cargo-embed`" +#: src/bare-metal/microcontrollers/probe-rs.md:19 +msgid "" +"ST-Link is a range of in-circuit debuggers from ST Microelectronics, J-Link " +"is a range from SEGGER." msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md:3 +#: src/bare-metal/microcontrollers/probe-rs.md:21 msgid "" -"[probe-rs](https://probe.rs/) is a handy toolset for embedded debugging, like OpenOCD but better\n" -"integrated." +"The Debug Access Port is usually either a 5-pin JTAG interface or 2-pin " +"Serial Wire Debug." msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md:6 +#: src/bare-metal/microcontrollers/probe-rs.md:22 msgid "" -"* SWD and JTAG via CMSIS-DAP, ST-Link and J-Link probes\n" -"* GDB stub and Microsoft DAP server\n" -"* Cargo integration" +"probe-rs is a library which you can integrate into your own tools if you " +"want to." msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md:10 +#: src/bare-metal/microcontrollers/probe-rs.md:23 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" -"`Embed.toml` file in your project directory." +"The [Microsoft Debug Adapter Protocol](https://microsoft.github.io/debug-" +"adapter-protocol/) lets VSCode and other IDEs debug code running on any " +"supported microcontroller." 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" -" 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" -"* 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" -" through a number of ringbuffers." +#: src/bare-metal/microcontrollers/probe-rs.md:25 +msgid "cargo-embed is a binary built using the probe-rs library." msgstr "" -#: src/bare-metal/microcontrollers/debugging.md:1 -msgid "# Debugging" +#: src/bare-metal/microcontrollers/probe-rs.md:26 +msgid "" +"RTT (Real Time Transfers) is a mechanism to transfer data between the debug " +"host and the target through a number of ringbuffers." msgstr "" #: src/bare-metal/microcontrollers/debugging.md:3 @@ -11249,8 +13077,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 "" @@ -11270,49 +13098,102 @@ msgid "" "```" msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md:1 src/bare-metal/aps/other-projects.md:1 -msgid "# Other projects" +#: src/bare-metal/microcontrollers/other-projects.md:1 +#: src/bare-metal/aps/other-projects.md:1 +msgid "Other projects" msgstr "" #: src/bare-metal/microcontrollers/other-projects.md:3 +msgid "[RTIC](https://rtic.rs/)" +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:4 +msgid "\"Real-Time Interrupt-driven Concurrency\"" +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:5 +msgid "" +"Shared resource management, message passing, task scheduling, timer queue" +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:6 +msgid "[Embassy](https://embassy.dev/)" +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:7 +msgid "`async` executors with priorities, timers, networking, USB" +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:8 +msgid "[TockOS](https://www.tockos.org/documentation/getting-started)" +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:9 +msgid "" +"Security-focused RTOS with preemptive scheduling and Memory Protection Unit " +"support" +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:10 +msgid "[Hubris](https://hubris.oxide.computer/)" +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:11 +msgid "" +"Microkernel RTOS from Oxide Computer Company with memory protection, " +"unprivileged drivers, IPC" +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:12 +msgid "[Bindings for FreeRTOS](https://github.com/lobaro/FreeRTOS-rust)" +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:13 msgid "" -" * [RTIC](https://rtic.rs/)\n" -" * \"Real-Time Interrupt-driven Concurrency\"\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" -" * [Hubris](https://hubris.oxide.computer/)\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)." +"Some platforms have `std` implementations, e.g. [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." +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:19 +msgid "It doesn't include any HALs." +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:20 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" -" 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." +"It uses the Cortex-M NVIC (Nested Virtual Interrupt Controller) for " +"scheduling rather than a proper kernel." 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." +#: src/bare-metal/microcontrollers/other-projects.md:22 +msgid "Cortex-M only." +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:23 +msgid "" +"Google uses TockOS on the Haven microcontroller for Titan security keys." +msgstr "" + +#: src/bare-metal/microcontrollers/other-projects.md:24 +msgid "" +"FreeRTOS is mostly written in C, but there are Rust bindings for writing " +"applications." msgstr "" -#: src/exercises/bare-metal/compass.md:1 -msgid "# Compass" +#: 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." 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" -"time, try displaying it on the LEDs somehow too, or use the buttons somehow." +"We will read the direction from an I2C compass, and log the readings to a " +"serial port. If you have time, try displaying it on the LEDs somehow too, or " +"use the buttons somehow." msgstr "" #: src/exercises/bare-metal/compass.md:6 @@ -11321,38 +13202,52 @@ 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" -" [micro:bit hardware](https://tech.microbit.org/hardware/).\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" -" trait. The\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" -" 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" -" it shouldn't be necessary for this exercise." +"Check the documentation for the [`lsm303agr`](https://docs.rs/lsm303agr/" +"latest/lsm303agr/) and [`microbit-v2`](https://docs.rs/microbit-v2/latest/" +"microbit/) crates, as well as the [micro:bit hardware](https://tech.microbit." +"org/hardware/)." +msgstr "" + +#: src/exercises/bare-metal/compass.md:11 +msgid "" +"The LSM303AGR Inertial Measurement Unit is connected to the internal I2C bus." +msgstr "" + +#: src/exercises/bare-metal/compass.md:12 +msgid "" +"TWI is another name for I2C, so the I2C master peripheral is called TWIM." +msgstr "" + +#: src/exercises/bare-metal/compass.md:13 +msgid "" +"The LSM303AGR driver needs something implementing the `embedded_hal::" +"blocking::i2c::WriteRead` trait. The [`microbit::hal::Twim`](https://docs.rs/" +"microbit-v2/latest/microbit/hal/struct.Twim.html) struct implements this." +msgstr "" + +#: src/exercises/bare-metal/compass.md:17 +msgid "" +"You have a [`microbit::Board`](https://docs.rs/microbit-v2/latest/microbit/" +"struct.Board.html) struct with fields for the various pins and peripherals." +msgstr "" + +#: src/exercises/bare-metal/compass.md:19 +msgid "" +"You can also look at the [nRF52833 datasheet](https://infocenter.nordicsemi." +"com/pdf/nRF52833_PS_v1.5.pdf) if you want, but 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" -"directory for the following files." +"Download the [exercise template](../../comprehensive-rust-exercises.zip) and " +"look in the `compass` directory for the following files." msgstr "" #: src/exercises/bare-metal/compass.md:26 src/exercises/bare-metal/rtc.md:19 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-async.md:11 -msgid "" -msgstr "" - #: src/exercises/bare-metal/compass.md:30 msgid "" "```rust,compile_fail\n" @@ -11394,12 +13289,6 @@ msgstr "" 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 -msgid "" -msgstr "" - #: src/exercises/bare-metal/compass.md:68 msgid "" "```toml\n" @@ -11424,10 +13313,6 @@ msgstr "" msgid "`Embed.toml` (you shouldn't need to change this):" msgstr "" -#: src/exercises/bare-metal/compass.md:87 -msgid "" -msgstr "" - #: src/exercises/bare-metal/compass.md:89 msgid "" "```toml\n" @@ -11446,10 +13331,6 @@ msgstr "" msgid "`.cargo/config.toml` (you shouldn't need to change this):" msgstr "" -#: src/exercises/bare-metal/compass.md:102 src/exercises/bare-metal/rtc.md:987 -msgid "" -msgstr "" - #: src/exercises/bare-metal/compass.md:104 msgid "" "```toml\n" @@ -11473,7 +13354,8 @@ 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 @@ -11488,31 +13370,34 @@ msgid "Use Ctrl+A Ctrl+Q to quit picocom." msgstr "" #: src/bare-metal/aps.md:1 -msgid "# Application processors" +msgid "Application processors" 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" -"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." +"So far we've talked about microcontrollers, such as the Arm Cortex-M series. " +"Now let's try writing something for Cortex-A. For simplicity we'll just work " +"with QEMU's aarch64 ['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" -" 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" -" virtual machines." +"Broadly speaking, microcontrollers don't have an MMU or multiple levels of " +"privilege (exception levels on Arm CPUs, rings on x86), while application " +"processors do." msgstr "" -#: src/bare-metal/aps/entry-point.md:1 -msgid "# Getting Ready to Rust" +#: src/bare-metal/aps.md:11 +msgid "" +"QEMU supports emulating various different machines or board models for each " +"architecture. The 'virt' board doesn't correspond to any particular real " +"hardware, but is designed purely for virtual machines." msgstr "" #: src/bare-metal/aps/entry-point.md:3 -msgid "Before we can start running Rust code, we need to do some initialisation." +msgid "" +"Before we can start running Rust code, we need to do some initialisation." msgstr "" #: src/bare-metal/aps/entry-point.md:5 @@ -11522,7 +13407,8 @@ msgid "" ".global entry\n" "entry:\n" " /*\n" -" * Load and apply the memory management configuration, ready to enable MMU and\n" +" * Load and apply the memory management configuration, ready to enable " +"MMU and\n" " * caches.\n" " */\n" " adrp x30, idmap\n" @@ -11541,7 +13427,8 @@ msgid "" " mov_i x30, .Lsctlrval\n" "\n" " /*\n" -" * Ensure everything before this point has completed, then invalidate any\n" +" * Ensure everything before this point has completed, then invalidate " +"any\n" " * potentially stale local TLB entries before they start being used.\n" " */\n" " isb\n" @@ -11551,7 +13438,8 @@ msgid "" " isb\n" "\n" " /*\n" -" * Configure sctlr_el1 to enable MMU and cache and don't proceed until this\n" +" * Configure sctlr_el1 to enable MMU and cache and don't proceed until " +"this\n" " * has completed.\n" " */\n" " msr sctlr_el1, x30\n" @@ -11590,39 +13478,87 @@ msgstr "" #: src/bare-metal/aps/entry-point.md:77 msgid "" -"* This is the same as it would be for C: initialising the processor state, zeroing the BSS, and\n" -" setting up the stack pointer.\n" -" * The BSS (block starting symbol, for historical reasons) is the part of the object file which\n" -" containing statically allocated variables which are initialised to zero. They are omitted from\n" -" the image, to avoid wasting space on zeroes. The compiler assumes that the loader will take care\n" -" of zeroing them.\n" -"* The BSS may already be zeroed, depending on how memory is initialised and the image is loaded, but\n" -" we zero it to be sure.\n" -"* We need to enable the MMU and cache before reading or writing any memory. If we don't:\n" -" * Unaligned accesses will fault. We build the Rust code for the `aarch64-unknown-none` target\n" -" which sets `+strict-align` to prevent the compiler generating unaligned accesses, so it should\n" -" be fine in this case, but this is not necessarily the case in general.\n" -" * If it were running in a VM, this can lead to cache coherency issues. The problem is that the VM\n" -" is accessing memory directly with the cache disabled, while the host has cachable aliases to the\n" -" same memory. Even if the host doesn't explicitly access the memory, speculative accesses can\n" -" lead to cache fills, and then changes from one or the other will get lost when the cache is\n" -" cleaned or the VM enables the cache. (Cache is keyed by physical address, not VA or IPA.)\n" -"* For simplicity, we just use a hardcoded pagetable (see `idmap.S`) which identity maps the first 1\n" -" GiB of address space for devices, the next 1 GiB for DRAM, and another 1 GiB higher up for more\n" -" devices. This matches the memory layout that QEMU uses.\n" -"* We also set up the exception vector (`vbar_el1`), which we'll see more about later.\n" -"* All examples this afternoon assume we will be running at exception level 1 (EL1). If you need to\n" -" run at a different exception level you'll need to modify `entry.S` accordingly." +"This is the same as it would be for C: initialising the processor state, " +"zeroing the BSS, and setting up the stack pointer." +msgstr "" + +#: src/bare-metal/aps/entry-point.md:79 +msgid "" +"The BSS (block starting symbol, for historical reasons) is the part of the " +"object file which containing statically allocated variables which are " +"initialised to zero. They are omitted from the image, to avoid wasting space " +"on zeroes. The compiler assumes that the loader will take care of zeroing " +"them." +msgstr "" + +#: src/bare-metal/aps/entry-point.md:83 +msgid "" +"The BSS may already be zeroed, depending on how memory is initialised and " +"the image is loaded, but we zero it to be sure." +msgstr "" + +#: src/bare-metal/aps/entry-point.md:85 +msgid "" +"We need to enable the MMU and cache before reading or writing any memory. If " +"we don't:" +msgstr "" + +#: src/bare-metal/aps/entry-point.md:86 +msgid "" +"Unaligned accesses will fault. We build the Rust code for the `aarch64-" +"unknown-none` target which sets `+strict-align` to prevent the compiler " +"generating unaligned accesses, so it should be fine in this case, but this " +"is not necessarily the case in general." +msgstr "" + +#: src/bare-metal/aps/entry-point.md:89 +msgid "" +"If it were running in a VM, this can lead to cache coherency issues. The " +"problem is that the VM is accessing memory directly with the cache disabled, " +"while the host has cachable aliases to the same memory. Even if the host " +"doesn't explicitly access the memory, speculative accesses can lead to cache " +"fills, and then changes from one or the other will get lost when the cache " +"is cleaned or the VM enables the cache. (Cache is keyed by physical address, " +"not VA or IPA.)" +msgstr "" + +#: src/bare-metal/aps/entry-point.md:94 +msgid "" +"For simplicity, we just use a hardcoded pagetable (see `idmap.S`) which " +"identity maps the first 1 GiB of address space for devices, the next 1 GiB " +"for DRAM, and another 1 GiB higher up for more devices. This matches the " +"memory layout that QEMU uses." +msgstr "" + +#: src/bare-metal/aps/entry-point.md:97 +msgid "" +"We also set up the exception vector (`vbar_el1`), which we'll see more about " +"later." +msgstr "" + +#: src/bare-metal/aps/entry-point.md:98 +msgid "" +"All examples this afternoon assume we will be running at exception level 1 " +"(EL1). If you need to run at a different exception level you'll need to " +"modify `entry.S` accordingly." msgstr "" #: src/bare-metal/aps/inline-assembly.md:1 -msgid "# Inline assembly" +msgid "Inline assembly" 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, to make an " +msgstr "" + +#: src/bare-metal/aps/inline-assembly.md:4 +msgid "HVC" +msgstr "" + +#: src/bare-metal/aps/inline-assembly.md:4 +msgid " to tell the firmware to power off the system:" msgstr "" #: src/bare-metal/aps/inline-assembly.md:6 @@ -11663,56 +13599,99 @@ 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`](https://crates.io/crates/" +"smccc) 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" -" 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" -" 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" -" 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" -" make sure it doesn't change these registers.\n" -"* Run the example in QEMU with `make qemu_psci` under `src/bare-metal/aps/examples`." +"PSCI is the Arm Power State Coordination Interface, a standard set of " +"functions to manage system and CPU power states, among other things. It is " +"implemented by EL3 firmware and hypervisors on many systems." +msgstr "" + +#: src/bare-metal/aps/inline-assembly.md:46 +msgid "" +"The `0 => _` syntax means initialise the register to 0 before running the " +"inline assembly code, and ignore its contents afterwards. We need to use " +"`inout` rather than `in` because the call could potentially clobber the " +"contents of the registers." +msgstr "" + +#: src/bare-metal/aps/inline-assembly.md:49 +msgid "" +"This `main` function needs to be `#[no_mangle]` and `extern \"C\"` because " +"it is called from our entry point in `entry.S`." +msgstr "" + +#: src/bare-metal/aps/inline-assembly.md:51 +msgid "" +"`_x0`–`_x3` are the values of registers `x0`–`x3`, which are conventionally " +"used by the bootloader to pass things like a pointer to the device tree. " +"According to the standard aarch64 calling convention (which is what `extern " +"\"C\"` specifies to use), registers `x0`–`x7` are used for the first 8 " +"arguments passed to a function, so `entry.S` doesn't need to do anything " +"special except make sure it doesn't change these registers." +msgstr "" + +#: src/bare-metal/aps/inline-assembly.md:56 +msgid "" +"Run the example in QEMU with `make qemu_psci` under `src/bare-metal/aps/" +"examples`." msgstr "" #: src/bare-metal/aps/mmio.md:1 -msgid "# Volatile memory access for MMIO" +msgid "Volatile memory access for MMIO" msgstr "" #: src/bare-metal/aps/mmio.md:3 +msgid "Use `pointer::read_volatile` and `pointer::write_volatile`." +msgstr "" + +#: src/bare-metal/aps/mmio.md:4 +msgid "Never hold a reference." +msgstr "" + +#: src/bare-metal/aps/mmio.md:5 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" -" 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" -" 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." +"Volatile access: read or write operations may have side-effects, so prevent " +"the compiler or hardware from reordering, duplicating or eliding them." +msgstr "" + +#: src/bare-metal/aps/mmio.md:11 +msgid "" +"Usually if you write and then read, e.g. via a mutable reference, the " +"compiler may assume that the value read is the same as the value just " +"written, and not bother actually reading memory." +msgstr "" + +#: src/bare-metal/aps/mmio.md:13 +msgid "" +"Some existing crates for volatile access to hardware do hold references, but " +"this is unsound. Whenever a reference exist, the compiler may choose to " +"dereference it." +msgstr "" + +#: src/bare-metal/aps/mmio.md:15 +msgid "" +"Use the `addr_of!` macro to get struct field pointers from a pointer to the " +"struct." msgstr "" #: src/bare-metal/aps/uart.md:1 -msgid "# Let's write a UART driver" +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](https://developer.arm.com/" +"documentation/ddi0183/g) UART, so let's write a driver for that." msgstr "" #: src/bare-metal/aps/uart.md:5 @@ -11729,13 +13708,16 @@ 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" @@ -11760,7 +13742,8 @@ 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" "```" @@ -11768,28 +13751,36 @@ 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" -" 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" -" about the safety\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." +"Note that `Uart::new` is unsafe while the other methods are safe. This is " +"because as long as the caller of `Uart::new` guarantees that its safety " +"requirements are met (i.e. that there is only ever one instance of the " +"driver for a given UART, and nothing else aliasing its address space), then " +"it is always safe to call `write_byte` later because we can assume the " +"necessary preconditions." +msgstr "" + +#: src/bare-metal/aps/uart.md:60 +msgid "" +"We could have done it the other way around (making `new` safe but " +"`write_byte` unsafe), but that would be much less convenient to use as every " +"place that calls `write_byte` would need to reason about the safety" msgstr "" -#: src/bare-metal/aps/uart.md:66 -msgid "" +#: src/bare-metal/aps/uart.md:63 +msgid "" +"This is a common pattern for writing safe wrappers of unsafe code: moving " +"the burden of proof for soundness from a large number of places to a smaller " +"number of places." msgstr "" #: src/bare-metal/aps/uart/traits.md:1 -msgid "# More traits" +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 @@ -11814,52 +13805,194 @@ 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." +msgstr "" + +#: src/bare-metal/aps/uart/traits.md:25 +msgid "" +"Run the example in QEMU with `make qemu_minimal` under `src/bare-metal/aps/" +"examples`." msgstr "" #: src/bare-metal/aps/better-uart.md:1 -msgid "# A better UART driver" +msgid "A better UART driver" 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" -"access in a structured way." +"The PL011 actually has [a bunch more registers](https://developer.arm.com/" +"documentation/ddi0183/g/programmers-model/summary-of-registers), and adding " +"offsets to construct pointers to access them is error-prone and hard to " +"read. Plus, some of them are bit fields which would be nice to access in a " +"structured way." msgstr "" #: src/bare-metal/aps/better-uart.md:7 -msgid "" -"| Offset | Register name | Width |\n" -"| ------ | ------------- | ----- |\n" -"| 0x00 | DR | 12 |\n" -"| 0x04 | RSR | 4 |\n" -"| 0x18 | FR | 9 |\n" -"| 0x20 | ILPR | 8 |\n" -"| 0x24 | IBRD | 16 |\n" -"| 0x28 | FBRD | 6 |\n" -"| 0x2c | LCR_H | 8 |\n" -"| 0x30 | CR | 16 |\n" -"| 0x34 | IFLS | 6 |\n" -"| 0x38 | IMSC | 11 |\n" -"| 0x3c | RIS | 11 |\n" -"| 0x40 | MIS | 11 |\n" -"| 0x44 | ICR | 11 |\n" -"| 0x48 | DMACR | 3 |" +msgid "Offset" msgstr "" -#: src/bare-metal/aps/better-uart.md:26 -msgid "- There are also some ID registers which have been omitted for brevity." +#: src/bare-metal/aps/better-uart.md:7 +msgid "Register name" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:7 +msgid "Width" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:9 +msgid "0x00" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:9 +msgid "DR" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:9 +msgid "12" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:10 +msgid "0x04" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:10 +msgid "RSR" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:10 +msgid "4" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:11 +msgid "0x18" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:11 +msgid "FR" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:11 +msgid "9" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:12 +msgid "0x20" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:12 +msgid "ILPR" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:12 src/bare-metal/aps/better-uart.md:15 +msgid "8" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:13 +msgid "0x24" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:13 +msgid "IBRD" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:13 src/bare-metal/aps/better-uart.md:16 +msgid "16" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:14 +msgid "0x28" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:14 +msgid "FBRD" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:14 src/bare-metal/aps/better-uart.md:17 +msgid "6" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:15 +msgid "0x2c" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:15 +msgid "LCR_H" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:16 +msgid "0x30" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:16 +msgid "CR" msgstr "" -#: src/bare-metal/aps/better-uart/bitflags.md:1 -msgid "# Bitflags" +#: src/bare-metal/aps/better-uart.md:17 +msgid "0x34" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:17 +msgid "IFLS" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:18 +msgid "0x38" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:18 +msgid "IMSC" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:18 src/bare-metal/aps/better-uart.md:19 +#: src/bare-metal/aps/better-uart.md:20 src/bare-metal/aps/better-uart.md:21 +msgid "11" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:19 +msgid "0x3c" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:19 +msgid "RIS" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:20 +msgid "0x40" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:20 +msgid "MIS" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:21 +msgid "0x44" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:21 +msgid "ICR" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:22 +msgid "0x48" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:22 +msgid "DMACR" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:22 +msgid "3" +msgstr "" + +#: src/bare-metal/aps/better-uart.md:26 +msgid "There are also some ID registers which have been omitted for brevity." 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." +msgid "" +"The [`bitflags`](https://crates.io/crates/bitflags) crate is useful for " +"working with bitflags." msgstr "" #: src/bare-metal/aps/better-uart/bitflags.md:5 @@ -11897,16 +14030,17 @@ 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" -" implementations to get and set flags." +"The `bitflags!` macro creates a newtype something like `Flags(u16)`, along " +"with a bunch of method implementations to get and set flags." msgstr "" #: src/bare-metal/aps/better-uart/registers.md:1 -msgid "# Multiple registers" +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 @@ -11948,14 +14082,11 @@ 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" -" compiler to (among other things) reorder fields however it sees fit." -msgstr "" - -#: src/bare-metal/aps/better-uart/driver.md:1 -msgid "# Driver" +"[`#[repr(C)]`](https://doc.rust-lang.org/reference/type-layout.html#the-c-" +"representation) tells the compiler to lay the struct fields out in order, " +"following the same rules as C. This is necessary for our struct to have a " +"predictable layout, as default Rust representation allows the compiler to " +"(among other things) reorder fields however it sees fit." msgstr "" #: src/bare-metal/aps/better-uart/driver.md:3 @@ -11972,13 +14103,16 @@ 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" @@ -12002,12 +14136,14 @@ 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" @@ -12024,18 +14160,19 @@ 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" -" an intermediate reference, which would be unsound." +"Note the use of `addr_of!` / `addr_of_mut!` to get pointers to individual " +"fields without creating 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 -msgid "# Using it" +#: 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" -"bytes." +"Let's write a small program using our driver to write to the serial console, " +"and echo incoming bytes." msgstr "" #: src/bare-metal/aps/better-uart/using.md:6 @@ -12059,7 +14196,8 @@ 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" @@ -12086,16 +14224,21 @@ 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" -" 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`." +"As in the [inline assembly](../inline-assembly.md) example, this `main` " +"function is called from our entry point code in `entry.S`. See the speaker " +"notes there for details." +msgstr "" + +#: src/bare-metal/aps/better-uart/using.md:53 +msgid "" +"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" -"implementing the `Log` trait." +"It would be nice to be able to use the logging macros from the [`log`]" +"(https://crates.io/crates/log) crate. We can do this by implementing the " +"`Log` trait." msgstr "" #: src/bare-metal/aps/logging.md:6 @@ -12133,7 +14276,8 @@ 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" @@ -12144,7 +14288,9 @@ 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 @@ -12172,7 +14318,8 @@ 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" @@ -12194,21 +14341,22 @@ msgid "" 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`." +msgid "Note that our panic handler can now log details of panics." msgstr "" -#: src/bare-metal/aps/exceptions.md:1 -msgid "# Exceptions" +#: src/bare-metal/aps/logging/using.md:47 +msgid "" +"Run the example in QEMU with `make qemu_logger` under `src/bare-metal/aps/" +"examples`." msgstr "" #: src/bare-metal/aps/exceptions.md:3 msgid "" -"AArch64 defines an exception vector table with 16 entries, for 4 types of exceptions (synchronous,\n" -"IRQ, FIQ, SError) from 4 states (current EL with SP0, current EL with SPx, lower EL using AArch64,\n" -"lower EL using AArch32). We implement this in assembly to save volatile registers to the stack\n" -"before calling into Rust code:" +"AArch64 defines an exception vector table with 16 entries, for 4 types of " +"exceptions (synchronous, IRQ, FIQ, SError) from 4 states (current EL with " +"SP0, current EL with SPx, lower EL using AArch64, lower EL using AArch32). " +"We implement this in assembly to save volatile registers to the stack before " +"calling into Rust code:" msgstr "" #: src/bare-metal/aps/exceptions.md:8 @@ -12268,67 +14416,114 @@ msgid "" "```" msgstr "" -#: src/bare-metal/aps/exceptions.md:64 +#: src/bare-metal/aps/exceptions.md:64 +msgid "EL is exception level; all our examples this afternoon run in EL1." +msgstr "" + +#: src/bare-metal/aps/exceptions.md:65 +msgid "" +"For simplicity we aren't distinguishing between SP0 and SPx for the current " +"EL exceptions, or between AArch32 and AArch64 for the lower EL exceptions." +msgstr "" + +#: src/bare-metal/aps/exceptions.md:67 +msgid "" +"For this example we just log the exception and power down, as we don't " +"expect any of them to actually happen." +msgstr "" + +#: src/bare-metal/aps/exceptions.md:69 +msgid "" +"We can think of exception handlers and our main execution context more or " +"less like different threads. [`Send` and `Sync`](../../concurrency/send-sync." +"md) will control what we can share between them, just like with threads. For " +"example, if we want to share some value between exception handlers and the " +"rest of the program, and it's `Send` but not `Sync`, then we'll need to wrap " +"it in something like a `Mutex` and put it in a static." +msgstr "" + +#: src/bare-metal/aps/other-projects.md:3 +msgid "[oreboot](https://github.com/oreboot/oreboot)" +msgstr "" + +#: src/bare-metal/aps/other-projects.md:4 +msgid "\"coreboot without the C\"" +msgstr "" + +#: src/bare-metal/aps/other-projects.md:5 +msgid "Supports x86, aarch64 and RISC-V." +msgstr "" + +#: src/bare-metal/aps/other-projects.md:6 +msgid "Relies on LinuxBoot rather than having many drivers itself." +msgstr "" + +#: src/bare-metal/aps/other-projects.md:7 +msgid "" +"[Rust RaspberryPi OS tutorial](https://github.com/rust-embedded/rust-" +"raspberrypi-OS-tutorials)" +msgstr "" + +#: src/bare-metal/aps/other-projects.md:8 msgid "" -"* EL is exception level; all our examples this afternoon run in EL1.\n" -"* For simplicity we aren't distinguishing between SP0 and SPx for the current EL exceptions, or\n" -" between AArch32 and AArch64 for the lower EL exceptions.\n" -"* For this example we just log the exception and power down, as we don't expect any of them to\n" -" actually happen.\n" -"* We can think of exception handlers and our main execution context more or less like different\n" -" threads. [`Send` and `Sync`][1] will control what we can share between them, just like with " -"threads.\n" -" For example, if we want to share some value between exception handlers and the rest of the\n" -" program, and it's `Send` but not `Sync`, then we'll need to wrap it in something like a `Mutex`\n" -" and put it in a static." +"Initialisation, UART driver, simple bootloader, JTAG, exception levels, " +"exception handling, page tables" msgstr "" -#: src/bare-metal/aps/other-projects.md:3 +#: src/bare-metal/aps/other-projects.md:10 msgid "" -" * [oreboot](https://github.com/oreboot/oreboot)\n" -" * \"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,\n" -" page tables\n" -" * Some dodginess around cache maintenance and initialisation in Rust, not necessarily a good\n" -" example to copy for production code.\n" -" * [`cargo-call-stack`](https://crates.io/crates/cargo-call-stack)\n" -" * Static analysis to determine maximum stack usage." +"Some dodginess around cache maintenance and initialisation in Rust, not " +"necessarily a good example to copy for production code." +msgstr "" + +#: src/bare-metal/aps/other-projects.md:12 +msgid "[`cargo-call-stack`](https://crates.io/crates/cargo-call-stack)" +msgstr "" + +#: src/bare-metal/aps/other-projects.md:13 +msgid "Static analysis to determine maximum stack usage." msgstr "" #: src/bare-metal/aps/other-projects.md:17 msgid "" -"* The RaspberryPi OS tutorial runs Rust code before the MMU and caches are enabled. This will read\n" -" and write memory (e.g. the stack). However:\n" -" * Without the MMU and cache, unaligned accesses will fault. It builds with `aarch64-unknown-none`\n" -" which sets `+strict-align` to prevent the compiler generating unaligned accesses so it should be\n" -" alright, but this is not necessarily the case in general.\n" -" * If it were running in a VM, this can lead to cache coherency issues. The problem is that the VM\n" -" is accessing memory directly with the cache disabled, while the host has cachable aliases to the\n" -" same memory. Even if the host doesn't explicitly access the memory, speculative accesses can\n" -" lead to cache fills, and then changes from one or the other will get lost. Again this is alright\n" -" in this particular case (running directly on the hardware with no hypervisor), but isn't a good\n" -" pattern in general." +"The RaspberryPi OS tutorial runs Rust code before the MMU and caches are " +"enabled. This will read and write memory (e.g. the stack). However:" +msgstr "" + +#: src/bare-metal/aps/other-projects.md:19 +msgid "" +"Without the MMU and cache, unaligned accesses will fault. It builds with " +"`aarch64-unknown-none` which sets `+strict-align` to prevent the compiler " +"generating unaligned accesses so it should be alright, but this is not " +"necessarily the case in general." msgstr "" -#: src/bare-metal/useful-crates.md:1 -msgid "# Useful crates" +#: src/bare-metal/aps/other-projects.md:22 +msgid "" +"If it were running in a VM, this can lead to cache coherency issues. The " +"problem is that the VM is accessing memory directly with the cache disabled, " +"while the host has cachable aliases to the same memory. Even if the host " +"doesn't explicitly access the memory, speculative accesses can lead to cache " +"fills, and then changes from one or the other will get lost. Again this is " +"alright in this particular case (running directly on the hardware with no " +"hypervisor), but isn't a good pattern in general." 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 -msgid "# `zerocopy`" +msgid "`zerocopy`" 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" -"byte sequences and other types." +"The [`zerocopy`](https://docs.rs/zerocopy/) crate (from Fuchsia) provides " +"traits and macros for safely converting between byte sequences and other " +"types." msgstr "" #: src/bare-metal/useful-crates/zerocopy.md:6 @@ -12370,29 +14565,45 @@ 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 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" -" converted from an untrusted sequence of bytes.\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 in the Playground because of the crate dependency.)" +"`FromBytes` can be implemented for types for which any byte pattern is " +"valid, and so can safely be converted from an untrusted sequence of bytes." +msgstr "" + +#: src/bare-metal/useful-crates/zerocopy.md:47 +msgid "" +"Attempting to derive `FromBytes` for these types would fail, because " +"`RequestType` doesn't use all possible u32 values as discriminants, so not " +"all byte patterns are valid." +msgstr "" + +#: src/bare-metal/useful-crates/zerocopy.md:49 +msgid "" +"`zerocopy::byteorder` has types for byte-order aware numeric primitives." +msgstr "" + +#: src/bare-metal/useful-crates/zerocopy.md:50 +msgid "" +"Run the example with `cargo run` under `src/bare-metal/useful-crates/" +"zerocopy-example/`. (It won't run in the Playground because of the crate " +"dependency.)" msgstr "" #: src/bare-metal/useful-crates/aarch64-paging.md:1 -msgid "# `aarch64-paging`" +msgid "`aarch64-paging`" 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" -"System Architecture." +"The [`aarch64-paging`](https://crates.io/crates/aarch64-paging) crate lets " +"you create page tables according to the AArch64 Virtual Memory System " +"Architecture." msgstr "" #: src/bare-metal/useful-crates/aarch64-paging.md:6 @@ -12420,22 +14631,37 @@ 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" -" 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." +"For now it only supports EL1, but support for other exception levels should " +"be straightforward to add." +msgstr "" + +#: src/bare-metal/useful-crates/aarch64-paging.md:30 +msgid "" +"This is used in Android for the [Protected VM Firmware](https://cs.android." +"com/android/platform/superproject/+/master:packages/modules/Virtualization/" +"pvmfw/)." +msgstr "" + +#: src/bare-metal/useful-crates/aarch64-paging.md:31 +msgid "" +"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 -msgid "# `buddy_system_allocator`" +msgid "`buddy_system_allocator`" 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" -"we might want to allocate MMIO space for PCI BARs:" +"[`buddy_system_allocator`](https://crates.io/crates/buddy_system_allocator) " +"is a third-party crate implementing a basic buddy system allocator. It can " +"be used both for [`LockedHeap`](https://docs.rs/buddy_system_allocator/0.9.0/" +"buddy_system_allocator/struct.LockedHeap.html) implementing [`GlobalAlloc`]" +"(https://doc.rust-lang.org/core/alloc/trait.GlobalAlloc.html) so you can use " +"the standard `alloc` crate (as we saw [before](../alloc.md)), or for " +"allocating other address space. For example, we might want to allocate MMIO " +"space for PCI BARs:" msgstr "" #: src/bare-metal/useful-crates/buddy_system_allocator.md:8 @@ -12458,23 +14684,27 @@ msgid "" msgstr "" #: src/bare-metal/useful-crates/buddy_system_allocator.md:26 +msgid "PCI BARs always have alignment equal to their size." +msgstr "" + +#: src/bare-metal/useful-crates/buddy_system_allocator.md:27 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 in the Playground because of the crate dependency.)" +"Run the example with `cargo run` under `src/bare-metal/useful-crates/" +"allocator-example/`. (It won't run in the Playground because of the crate " +"dependency.)" msgstr "" #: src/bare-metal/useful-crates/tinyvec.md:1 -msgid "# `tinyvec`" +msgid "`tinyvec`" 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" -"use more than are allocated." +"Sometimes you want something which can be resized like a `Vec`, but without " +"heap allocation. [`tinyvec`](https://crates.io/crates/tinyvec) provides " +"this: a vector backed by an array or slice, which could be statically " +"allocated or on the stack, which keeps track of how many elements are used " +"and panics if you try to use more than are allocated." msgstr "" #: src/bare-metal/useful-crates/tinyvec.md:8 @@ -12495,23 +14725,30 @@ 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." +msgstr "" + +#: src/bare-metal/useful-crates/tinyvec.md:24 +msgid "" +"The Rust Playground includes `tinyvec`, so this example will run fine inline." msgstr "" #: src/bare-metal/useful-crates/spin.md:1 -msgid "# `spin`" +msgid "`spin`" 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" -"state between different CPUs?" +"`std::sync::Mutex` and the other synchronisation primitives from `std::sync` " +"are not available in `core` or `alloc`. How can we manage synchronisation or " +"interior mutability, such as for sharing 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`](https://crates.io/crates/spin) crate provides spinlock-based " +"equivalents of many of these primitives." msgstr "" #: src/bare-metal/useful-crates/spin.md:9 @@ -12530,24 +14767,33 @@ msgid "" msgstr "" #: src/bare-metal/useful-crates/spin.md:23 +msgid "Be careful to avoid deadlock if you take locks in interrupt handlers." +msgstr "" + +#: src/bare-metal/useful-crates/spin.md:24 +msgid "" +"`spin` also has a ticket lock mutex implementation; equivalents of `RwLock`, " +"`Barrier` and `Once` from `std::sync`; and `Lazy` for lazy initialisation." +msgstr "" + +#: src/bare-metal/useful-crates/spin.md:26 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" -" 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" -" different approach to `spin::once::Once`.\n" -"* The Rust Playground includes `spin`, so this example will run fine inline." +"The [`once_cell`](https://crates.io/crates/once_cell) crate also has some " +"useful types for late initialisation with a slightly different approach to " +"`spin::once::Once`." msgstr "" -#: src/bare-metal/android.md:1 -msgid "# Android" +#: src/bare-metal/useful-crates/spin.md:28 +msgid "" +"The Rust Playground includes `spin`, so this example will run fine inline." 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" -"`raw_binary` to convert the ELF to a raw binary ready to be run." +"To build a bare-metal Rust binary in AOSP, you need to use a " +"`rust_ffi_static` Soong rule to build your Rust code, then a `cc_binary` " +"with a linker script to produce the binary itself, and then a `raw_binary` " +"to convert the ELF to a raw binary ready to be run." msgstr "" #: src/bare-metal/android.md:7 @@ -12592,14 +14838,12 @@ msgid "" "```" msgstr "" -#: src/bare-metal/android/vmbase.md:1 -msgid "# vmbase" -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](https://android." +"googlesource.com/platform/packages/modules/Virtualization/+/refs/heads/" +"master/vmbase/) library provides a linker script and useful defaults for the " +"build rules, along with an entry point, UART console logging and more." msgstr "" #: src/bare-metal/android/vmbase.md:6 @@ -12620,9 +14864,14 @@ 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 VM if your main function returns." +"The `main!` macro marks your main function, to be called from the `vmbase` " +"entry point." +msgstr "" + +#: src/bare-metal/android/vmbase.md:22 +msgid "" +"The `vmbase` entry point handles console initialisation, and issues a " +"PSCI_SYSTEM_OFF to shutdown the VM if your main function returns." msgstr "" #: src/exercises/bare-metal/afternoon.md:3 @@ -12630,34 +14879,51 @@ msgid "We will write a driver for the PL031 real-time clock device." msgstr "" #: src/exercises/bare-metal/rtc.md:1 -msgid "# RTC driver" +#: src/exercises/bare-metal/solutions-afternoon.md:3 +msgid "RTC driver" 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" -"should write a driver for it." +"The QEMU aarch64 virt machine has a [PL031](https://developer.arm.com/" +"documentation/ddi0224/c) real-time clock at 0x9010000. For this exercise, " +"you 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" -" 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" -" 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" -" - 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" -" " +"Use it to print the current time to the serial console. You can use the " +"[`chrono`](https://crates.io/crates/chrono) crate for date/time formatting." +msgstr "" + +#: src/exercises/bare-metal/rtc.md:8 +msgid "" +"Use the match register and raw interrupt status to busy-wait until a given " +"time, e.g. 3 seconds in the future. (Call [`core::hint::spin_loop`](https://" +"doc.rust-lang.org/core/hint/fn.spin_loop.html) inside the loop.)" +msgstr "" + +#: src/exercises/bare-metal/rtc.md:10 +msgid "" +"_Extension if you have time:_ Enable and handle the interrupt generated by " +"the RTC match. You can use the driver provided in the [`arm-gic`](https://" +"docs.rs/arm-gic/) crate to configure the Arm Generic Interrupt Controller." +msgstr "" + +#: src/exercises/bare-metal/rtc.md:12 +msgid "Use the RTC interrupt, which is wired to the GIC as `IntId::spi(2)`." +msgstr "" + +#: src/exercises/bare-metal/rtc.md:13 +msgid "" +"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." msgstr "" #: src/exercises/bare-metal/rtc.md:16 msgid "" -"Download the [exercise template](../../comprehensive-rust-exercises.zip) and look in the `rtc`\n" -"directory for the following files." +"Download the [exercise template](../../comprehensive-rust-exercises.zip) and " +"look in the `rtc` directory for the following files." msgstr "" #: src/exercises/bare-metal/rtc.md:23 @@ -12686,17 +14952,20 @@ 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" @@ -12716,11 +14985,9 @@ 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):" -msgstr "" - -#: src/exercises/bare-metal/rtc.md:77 -msgid "" +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:79 @@ -12754,7 +15021,8 @@ 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" @@ -12800,10 +15068,6 @@ msgstr "" msgid "`src/logger.rs` (you shouldn't need to change this):" msgstr "" -#: src/exercises/bare-metal/rtc.md:151 -msgid "" -msgstr "" - #: src/exercises/bare-metal/rtc.md:153 msgid "" "```rust,compile_fail\n" @@ -12854,7 +15118,8 @@ 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" @@ -12868,10 +15133,6 @@ msgstr "" msgid "`src/pl011.rs` (you shouldn't need to change this):" msgstr "" -#: src/exercises/bare-metal/rtc.md:212 -msgid "" -msgstr "" - #: src/exercises/bare-metal/rtc.md:214 msgid "" "```rust,compile_fail\n" @@ -12982,13 +15243,16 @@ 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" @@ -13012,12 +15276,14 @@ 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" @@ -13074,10 +15340,6 @@ msgstr "" msgid "`build.rs` (you shouldn't need to change this):" msgstr "" -#: src/exercises/bare-metal/rtc.md:412 -msgid "" -msgstr "" - #: src/exercises/bare-metal/rtc.md:414 msgid "" "```rust,compile_fail\n" @@ -13117,10 +15379,6 @@ msgstr "" msgid "`entry.S` (you shouldn't need to change this):" msgstr "" -#: src/exercises/bare-metal/rtc.md:448 -msgid "" -msgstr "" - #: src/exercises/bare-metal/rtc.md:450 msgid "" "```armasm\n" @@ -13160,24 +15418,29 @@ 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" @@ -13193,21 +15456,27 @@ 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" @@ -13224,7 +15493,8 @@ 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" @@ -13234,7 +15504,8 @@ 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" @@ -13274,10 +15545,6 @@ msgstr "" msgid "`exceptions.S` (you shouldn't need to change this):" msgstr "" -#: src/exercises/bare-metal/rtc.md:597 -msgid "" -msgstr "" - #: src/exercises/bare-metal/rtc.md:599 msgid "" "```armasm\n" @@ -13299,11 +15566,14 @@ 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" @@ -13330,7 +15600,8 @@ 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" @@ -13357,12 +15628,15 @@ 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" @@ -13375,15 +15649,18 @@ 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" @@ -13466,10 +15743,6 @@ msgstr "" msgid "`idmap.S` (you shouldn't need to change this):" msgstr "" -#: src/exercises/bare-metal/rtc.md:782 -msgid "" -msgstr "" - #: src/exercises/bare-metal/rtc.md:784 msgid "" "```armasm\n" @@ -13500,7 +15773,8 @@ 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" @@ -13522,10 +15796,6 @@ msgstr "" msgid "`image.ld` (you shouldn't need to change this):" msgstr "" -#: src/exercises/bare-metal/rtc.md:831 -msgid "" -msgstr "" - #: src/exercises/bare-metal/rtc.md:833 msgid "" "```ld\n" @@ -13546,7 +15816,8 @@ 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" @@ -13640,10 +15911,6 @@ msgstr "" msgid "`Makefile` (you shouldn't need to change this):" msgstr "" -#: src/exercises/bare-metal/rtc.md:942 -msgid "" -msgstr "" - #: src/exercises/bare-metal/rtc.md:944 msgid "" "```makefile\n" @@ -13680,8 +15947,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" @@ -13703,24 +15970,20 @@ msgid "Run the code in QEMU with `make qemu`." msgstr "" #: src/concurrency.md:1 -msgid "# Welcome to Concurrency in Rust" +msgid "Welcome to Concurrency in Rust" msgstr "" #: src/concurrency.md:3 msgid "" -"Rust has full support for concurrency using OS threads with mutexes and\n" +"Rust has full support for concurrency using OS threads with mutexes and " "channels." 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" -"can rely on the compiler to ensure correctness at runtime." -msgstr "" - -#: src/concurrency/threads.md:1 -msgid "# Threads" +"The Rust type system plays an important role in making many concurrency bugs " +"compile time bugs. This is often referred to as _fearless concurrency_ since " +"you can rely on the compiler to ensure correctness at runtime." msgstr "" #: src/concurrency/threads.md:3 @@ -13750,28 +16013,38 @@ msgid "" msgstr "" #: src/concurrency/threads.md:24 -msgid "" -"* Threads are all daemon threads, the main thread does not wait for them.\n" -"* Thread panics are independent of each other.\n" -" * Panics can carry a payload, which can be unpacked with `downcast_ref`." +msgid "Threads are all daemon threads, the main thread does not wait for them." +msgstr "" + +#: src/concurrency/threads.md:25 +msgid "Thread panics are independent of each other." +msgstr "" + +#: src/concurrency/threads.md:26 +msgid "Panics can carry a payload, which can be unpacked with `downcast_ref`." msgstr "" #: src/concurrency/threads.md:32 msgid "" -"* 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" -" 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" -" payload. This is a good time to talk about [`Any`]." +"Notice that the thread is stopped before it reaches 10 — the main thread is " +"not waiting." +msgstr "" + +#: src/concurrency/threads.md:35 +msgid "" +"Use `let handle = thread::spawn(...)` and later `handle.join()` to wait for " +"the thread to finish." +msgstr "" + +#: src/concurrency/threads.md:38 +msgid "Trigger a panic in the thread, notice how this doesn't affect `main`." msgstr "" -#: src/concurrency/scoped-threads.md:1 -msgid "# Scoped Threads" +#: src/concurrency/threads.md:40 +msgid "" +"Use the `Result` return value from `handle.join()` to get access to the " +"panic payload. This is a good time to talk about [`Any`](https://doc.rust-" +"lang.org/std/any/index.html)." msgstr "" #: src/concurrency/scoped-threads.md:3 @@ -13797,7 +16070,9 @@ msgid "" msgstr "" #: src/concurrency/scoped-threads.md:20 -msgid "However, you can use a [scoped thread][1] for this:" +msgid "" +"However, you can use a [scoped thread](https://doc.rust-lang.org/std/thread/" +"fn.scope.html) for this:" msgstr "" #: src/concurrency/scoped-threads.md:22 @@ -13819,21 +16094,20 @@ msgstr "" #: src/concurrency/scoped-threads.md:40 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." msgstr "" -#: src/concurrency/channels.md:1 -msgid "# Channels" +#: src/concurrency/scoped-threads.md:41 +msgid "" +"Normal Rust borrowing rules apply: you can either borrow mutably by one " +"thread, or immutably by any number of threads." msgstr "" #: src/concurrency/channels.md:3 msgid "" -"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." +"Rust channels have two parts: a `Sender` and a `Receiver`. The two " +"parts are connected via the channel, but you only see the end-points." msgstr "" #: src/concurrency/channels.md:6 @@ -13860,14 +16134,15 @@ msgstr "" #: src/concurrency/channels.md:27 msgid "" -"* `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" -" `Receiver` is dropped and the channel is closed." +"`mpsc` stands for Multi-Producer, Single-Consumer. `Sender` and `SyncSender` " +"implement `Clone` (so you can make multiple producers) but `Receiver` does " +"not." msgstr "" -#: src/concurrency/channels/unbounded.md:1 -msgid "# Unbounded Channels" +#: src/concurrency/channels.md:29 +msgid "" +"`send()` and `recv()` return `Result`. If they return `Err`, it means the " +"counterpart `Sender` or `Receiver` is dropped and the channel is closed." msgstr "" #: src/concurrency/channels/unbounded.md:3 @@ -13901,12 +16176,9 @@ msgid "" "```" msgstr "" -#: src/concurrency/channels/bounded.md:1 -msgid "# Bounded Channels" -msgstr "" - #: src/concurrency/channels/bounded.md:3 -msgid "With bounded (synchronous) channels, `send` can block the current thread:" +msgid "" +"With bounded (synchronous) channels, `send` can block the current thread:" msgstr "" #: src/concurrency/channels/bounded.md:5 @@ -13938,74 +16210,94 @@ msgstr "" #: src/concurrency/channels/bounded.md:31 msgid "" -"* Calling `send` will block the current thread until there is space in the channel for the new " -"message. The thread can be blocked indefinitely if there is nobody who reads from the channel.\n" -"* A call to `send` will abort with an error (that is why it returns `Result`) if the channel is " -"closed. A channel is closed when the receiver is dropped.\n" -"* A bounded channel with a size of zero is called a \"rendezvous channel\". Every send will block the " -"current thread until another thread calls `read`.\n" -" " +"Calling `send` will block the current thread until there is space in the " +"channel for the new message. The thread can be blocked indefinitely if there " +"is nobody who reads from the channel." +msgstr "" + +#: src/concurrency/channels/bounded.md:32 +msgid "" +"A call to `send` will abort with an error (that is why it returns `Result`) " +"if the channel is closed. A channel is closed when the receiver is dropped." +msgstr "" + +#: src/concurrency/channels/bounded.md:33 +msgid "" +"A bounded channel with a size of zero is called a \"rendezvous channel\". " +"Every send will block the current thread until another thread calls `read`." msgstr "" #: src/concurrency/send-sync.md:1 -msgid "# `Send` and `Sync`" +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" -" boundary.\n" -"* [`Sync`][2]: a type `T` is `Sync` if it is safe to move a `&T` across a thread\n" -" boundary." +"[`Send`](https://doc.rust-lang.org/std/marker/trait.Send.html): a type `T` " +"is `Send` if it is safe to move a `T` across a thread boundary." +msgstr "" + +#: src/concurrency/send-sync.md:7 +msgid "" +"[`Sync`](https://doc.rust-lang.org/std/marker/trait.Sync.html): a type `T` " +"is `Sync` if it is safe to move a `&T` across a thread 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" -"know it is valid." +"`Send` and `Sync` are [unsafe traits](../unsafe/unsafe-traits.md). The " +"compiler will automatically derive them for your types as long as they only " +"contain `Send` and `Sync` types. You can also implement them manually when " +"you 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" -"* They can be used in the generic constraints as normal traits.\n" -" " +"One can think of these traits as markers that the type has certain thread-" +"safety properties." +msgstr "" + +#: src/concurrency/send-sync.md:21 +msgid "They can be used in the generic constraints as normal traits." msgstr "" #: src/concurrency/send-sync/send.md:1 -msgid "# `Send`" +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`](https://doc.rust-lang.org/std/marker/trait.Send.html) " +"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" -"and deallocate it in another." +"The effect of moving ownership to another thread is that _destructors_ will " +"run in that thread. So the question is when you can allocate a value in one " +"thread 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" -"single thread." +"As an example, a connection to the SQLite library must only be accessed from " +"a single thread." msgstr "" #: src/concurrency/send-sync/sync.md:1 -msgid "# `Sync`" +msgid "`Sync`" 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" -"> threads at the same time." +"A type `T` is [`Sync`](https://doc.rust-lang.org/std/marker/trait.Sync.html) " +"if it is safe to access a `T` value from multiple threads at the same time." msgstr "" #: src/concurrency/send-sync/sync.md:6 @@ -14013,29 +16305,27 @@ msgid "More precisely, the definition is:" msgstr "" #: src/concurrency/send-sync/sync.md:8 -msgid "> `T` is `Sync` if and only if `&T` is `Send`" +msgid "`T` is `Sync` if and only if `&T` is `Send`" 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." -msgstr "" - -#: src/concurrency/send-sync/examples.md:1 -msgid "# Examples" +"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:3 -msgid "## `Send + Sync`" +msgid "`Send + Sync`" msgstr "" #: src/concurrency/send-sync/examples.md:5 @@ -14043,55 +16333,78 @@ msgid "Most types you come across are `Send + Sync`:" msgstr "" #: src/concurrency/send-sync/examples.md:7 -msgid "" -"* `i8`, `f32`, `bool`, `char`, `&str`, ...\n" -"* `(T1, T2)`, `[T; N]`, `&[T]`, `struct { x: T }`, ...\n" -"* `String`, `Option`, `Vec`, `Box`, ...\n" -"* `Arc`: Explicitly thread-safe via atomic reference count.\n" -"* `Mutex`: Explicitly thread-safe via internal locking.\n" -"* `AtomicBool`, `AtomicU8`, ...: Uses special atomic instructions." +msgid "`i8`, `f32`, `bool`, `char`, `&str`, ..." +msgstr "" + +#: src/concurrency/send-sync/examples.md:8 +msgid "`(T1, T2)`, `[T; N]`, `&[T]`, `struct { x: T }`, ..." +msgstr "" + +#: src/concurrency/send-sync/examples.md:9 +msgid "`String`, `Option`, `Vec`, `Box`, ..." +msgstr "" + +#: src/concurrency/send-sync/examples.md:10 +msgid "`Arc`: Explicitly thread-safe via atomic reference count." +msgstr "" + +#: src/concurrency/send-sync/examples.md:11 +msgid "`Mutex`: Explicitly thread-safe via internal locking." +msgstr "" + +#: src/concurrency/send-sync/examples.md:12 +msgid "`AtomicBool`, `AtomicU8`, ...: Uses special atomic instructions." msgstr "" #: src/concurrency/send-sync/examples.md:14 msgid "" -"The generic types are typically `Send + Sync` when the type parameters are\n" +"The generic types are typically `Send + Sync` when the type parameters are " "`Send + Sync`." msgstr "" #: src/concurrency/send-sync/examples.md:17 -msgid "## `Send + !Sync`" +msgid "`Send + !Sync`" msgstr "" #: src/concurrency/send-sync/examples.md:19 msgid "" -"These types can be moved to other threads, but they're not thread-safe.\n" +"These types can be moved to other threads, but they're not thread-safe. " "Typically because of interior mutability:" msgstr "" #: src/concurrency/send-sync/examples.md:22 -msgid "" -"* `mpsc::Sender`\n" -"* `mpsc::Receiver`\n" -"* `Cell`\n" -"* `RefCell`" +msgid "`mpsc::Sender`" +msgstr "" + +#: src/concurrency/send-sync/examples.md:23 +msgid "`mpsc::Receiver`" +msgstr "" + +#: src/concurrency/send-sync/examples.md:24 +msgid "`Cell`" +msgstr "" + +#: src/concurrency/send-sync/examples.md:25 +msgid "`RefCell`" msgstr "" #: src/concurrency/send-sync/examples.md:27 -msgid "## `!Send + Sync`" +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" -" thread which created them." +"`MutexGuard`: Uses OS level primitives which must be deallocated on the " +"thread which created them." msgstr "" #: src/concurrency/send-sync/examples.md:34 -msgid "## `!Send + !Sync`" +msgid "`!Send + !Sync`" msgstr "" #: src/concurrency/send-sync/examples.md:36 @@ -14100,35 +16413,43 @@ msgstr "" #: src/concurrency/send-sync/examples.md:38 msgid "" -"* `Rc`: each `Rc` has a reference to an `RcBox`, which contains a\n" -" non-atomic reference count.\n" -"* `*const T`, `*mut T`: Rust assumes raw pointers may have special\n" -" concurrency considerations." +"`Rc`: each `Rc` has a reference to an `RcBox`, which contains a non-" +"atomic reference count." msgstr "" -#: src/concurrency/shared_state.md:1 -msgid "# Shared State" +#: src/concurrency/send-sync/examples.md:40 +msgid "" +"`*const T`, `*mut T`: Rust assumes raw pointers may have special concurrency " +"considerations." 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 " "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" -" takes care to deallocate `T` when the last reference is dropped,\n" -"* [`Mutex`][2]: ensures mutually exclusive access to the `T` value." +"[`Arc`](https://doc.rust-lang.org/std/sync/struct.Arc.html), atomic " +"reference counted `T`: handles sharing between threads and takes care to " +"deallocate `T` when the last reference is dropped," +msgstr "" + +#: src/concurrency/shared_state.md:8 +msgid "" +"[`Mutex`](https://doc.rust-lang.org/std/sync/struct.Mutex.html): ensures " +"mutually exclusive access to the `T` value." msgstr "" #: src/concurrency/shared_state/arc.md:1 -msgid "# `Arc`" +msgid "`Arc`" msgstr "" #: src/concurrency/shared_state/arc.md:3 -msgid "[`Arc`][1] allows shared read-only access via `Arc::clone`:" +msgid "" +"[`Arc`](https://doc.rust-lang.org/std/sync/struct.Arc.html) allows shared " +"read-only access via `Arc::clone`:" msgstr "" #: src/concurrency/shared_state/arc.md:5 @@ -14156,24 +16477,41 @@ 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" -" operations.\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" -" `T` is free.\n" -"* Beware of reference cycles, `Arc` does not use a garbage collector to detect them.\n" -" * `std::sync::Weak` can help." +"`Arc` stands for \"Atomic Reference Counted\", a thread safe version of `Rc` " +"that uses atomic operations." +msgstr "" + +#: src/concurrency/shared_state/arc.md:31 +msgid "" +"`Arc` implements `Clone` whether or not `T` does. It implements `Send` " +"and `Sync` iff `T` implements them both." +msgstr "" + +#: src/concurrency/shared_state/arc.md:33 +msgid "" +"`Arc::clone()` has the cost of atomic operations that get executed, but " +"after that the use of the `T` is free." +msgstr "" + +#: src/concurrency/shared_state/arc.md:35 +msgid "" +"Beware of reference cycles, `Arc` does not use a garbage collector to detect " +"them." +msgstr "" + +#: src/concurrency/shared_state/arc.md:36 +msgid "`std::sync::Weak` can help." msgstr "" #: src/concurrency/shared_state/mutex.md:1 -msgid "# `Mutex`" +msgid "`Mutex`" msgstr "" #: src/concurrency/shared_state/mutex.md:3 msgid "" -"[`Mutex`][1] ensures mutual exclusion _and_ allows mutable access to `T`\n" -"behind a read-only interface:" +"[`Mutex`](https://doc.rust-lang.org/std/sync/struct.Mutex.html) ensures " +"mutual exclusion _and_ allows mutable access to `T` behind a read-only " +"interface:" msgstr "" #: src/concurrency/shared_state/mutex.md:6 @@ -14197,23 +16535,50 @@ msgstr "" #: src/concurrency/shared_state/mutex.md:22 msgid "" -"Notice how we have a [`impl Sync for Mutex`][2] blanket\n" +"Notice how we have a [`impl Sync for Mutex`](https://doc.rust-" +"lang.org/std/sync/struct.Mutex.html#impl-Sync-for-Mutex%3CT%3E) blanket " "implementation." 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" -" `&mut T` doesn't outlive the lock being held.\n" -"* `Mutex` implements both `Send` and `Sync` iff (if and only if) `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" -" regardless." +"`Mutex` in Rust looks like a collection with just one element - the " +"protected data." +msgstr "" + +#: src/concurrency/shared_state/mutex.md:32 +msgid "" +"It is not possible to forget to acquire the mutex before accessing the " +"protected data." +msgstr "" + +#: src/concurrency/shared_state/mutex.md:33 +msgid "" +"You can get an `&mut T` from an `&Mutex` by taking the lock. The " +"`MutexGuard` ensures that the `&mut T` doesn't outlive the lock being held." +msgstr "" + +#: src/concurrency/shared_state/mutex.md:35 +msgid "" +"`Mutex` implements both `Send` and `Sync` iff (if and only if) `T` " +"implements `Send`." +msgstr "" + +#: src/concurrency/shared_state/mutex.md:36 +msgid "A read-write lock counterpart - `RwLock`." +msgstr "" + +#: src/concurrency/shared_state/mutex.md:37 +msgid "Why does `lock()` return a `Result`? " +msgstr "" + +#: src/concurrency/shared_state/mutex.md:38 +msgid "" +"If the thread that held the `Mutex` panicked, the `Mutex` becomes " +"\"poisoned\" to signal that the data it protected might be in an " +"inconsistent state. Calling `lock()` on a poisoned mutex fails with a " +"[`PoisonError`](https://doc.rust-lang.org/std/sync/struct.PoisonError.html). " +"You can call `into_inner()` on the error to recover the data regardless." msgstr "" #: src/concurrency/shared_state/example.md:3 @@ -14276,11 +16641,26 @@ 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." +msgstr "" + +#: src/concurrency/shared_state/example.md:52 +msgid "" +"Wrapping a `Mutex` in an `Arc` is a common pattern to share mutable state " +"between threads." +msgstr "" + +#: src/concurrency/shared_state/example.md:53 +msgid "" +"`v: Arc<_>` needs to be cloned as `v2` before it can be moved into another " +"thread. Note `move` was added to the lambda signature." +msgstr "" + +#: src/concurrency/shared_state/example.md:54 +msgid "" +"Blocks are introduced to narrow the scope of the `LockGuard` as much as " +"possible." msgstr "" #: src/exercises/concurrency/morning.md:3 @@ -14288,15 +16668,13 @@ msgid "Let us practice our new concurrency skills with" msgstr "" #: src/exercises/concurrency/morning.md:5 -msgid "" -"* Dining philosophers: a classic problem in concurrency.\n" -"\n" -"* Multi-threaded link checker: a larger project where you'll use Cargo to\n" -" download dependencies and then check links in parallel." +msgid "Dining philosophers: a classic problem in concurrency." msgstr "" -#: src/exercises/concurrency/dining-philosophers.md:1 -msgid "# Dining Philosophers" +#: src/exercises/concurrency/morning.md:7 +msgid "" +"Multi-threaded link checker: a larger project where you'll use Cargo to " +"download dependencies and then check links in parallel." msgstr "" #: src/exercises/concurrency/dining-philosophers.md:3 @@ -14305,20 +16683,21 @@ 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" -"> an individual philosopher finishes eating, they will put down both forks." +"Five philosophers dine together at the same table. Each philosopher has " +"their own place at the table. There is a fork between each plate. The dish " +"served is a kind of spaghetti which has to be eaten with two forks. Each " +"philosopher can only alternately think and eat. Moreover, a philosopher can " +"only eat their spaghetti when they have both a left and right fork. Thus two " +"forks will only be available when their two nearest neighbors are thinking, " +"not eating. After 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" -"blanks, and test that `cargo run` does not deadlock:" +"You will need a local [Cargo installation](../../cargo/running-locally.md) " +"for this exercise. Copy the code below to a file called `src/main.rs`, fill " +"out the blanks, and test that `cargo run` does not deadlock:" msgstr "" #: src/exercises/concurrency/dining-philosophers.md:19 @@ -14380,22 +16759,18 @@ msgid "" "```" msgstr "" -#: src/exercises/concurrency/link-checker.md:1 -msgid "# Multi-threaded Link Checker" -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" -"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" -"pages have been validated." +"Let us use our new knowledge to create a multi-threaded link checker. It " +"should start at a webpage and check that links on the page are valid. It " +"should recursively check other pages on the same domain and keep doing this " +"until all pages have been validated." msgstr "" #: src/exercises/concurrency/link-checker.md:8 msgid "" -"For this, you will need an HTTP client such as [`reqwest`][1]. Create a new\n" -"Cargo project and `reqwest` it as a dependency with:" +"For this, you will need an HTTP client such as [`reqwest`](https://docs.rs/" +"reqwest/). Create a new Cargo project and `reqwest` it as a dependency with:" msgstr "" #: src/exercises/concurrency/link-checker.md:11 @@ -14409,12 +16784,14 @@ msgstr "" #: src/exercises/concurrency/link-checker.md:17 msgid "" -"> If `cargo add` fails with `error: no such subcommand`, then please edit the\n" -"> `Cargo.toml` file by hand. Add the dependencies listed below." +"If `cargo add` fails with `error: no such subcommand`, then please edit the " +"`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`](https://docs." +"rs/scraper/) for that:" msgstr "" #: src/exercises/concurrency/link-checker.md:22 @@ -14426,8 +16803,8 @@ msgstr "" #: src/exercises/concurrency/link-checker.md:26 msgid "" -"Finally, we'll need some way of handling errors. We use [`thiserror`][3] for\n" -"that:" +"Finally, we'll need some way of handling errors. We use [`thiserror`]" +"(https://docs.rs/thiserror/) for that:" msgstr "" #: src/exercises/concurrency/link-checker.md:29 @@ -14438,7 +16815,8 @@ 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 @@ -14451,7 +16829,8 @@ 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" "```" @@ -14459,8 +16838,8 @@ msgstr "" #: src/exercises/concurrency/link-checker.md:50 msgid "" -"You can now download the start page. Try with a small site such as\n" -"`https://www.google.org/`." +"You can now download the start page. Try with a small site such as `https://" +"www.google.org/`." msgstr "" #: src/exercises/concurrency/link-checker.md:53 @@ -14488,7 +16867,8 @@ msgid "" " extract_links: bool,\n" "}\n" "\n" -"fn visit_page(client: &Client, command: &CrawlCommand) -> Result, Error> {\n" +"fn visit_page(client: &Client, command: &CrawlCommand) -> Result, " +"Error> {\n" " println!(\"Checking {:#}\", command.url);\n" " let response = client.get(command.url.clone()).send()?;\n" " if !response.status().is_success() {\n" @@ -14514,7 +16894,8 @@ msgid "" " link_urls.push(link_url);\n" " }\n" " Err(err) => {\n" -" println!(\"On {base_url:#}: ignored unparsable {href:?}: {err}\");\n" +" println!(\"On {base_url:#}: ignored unparsable {href:?}: " +"{err}\");\n" " }\n" " }\n" " }\n" @@ -14524,7 +16905,8 @@ msgid "" "fn main() {\n" " let client = Client::new();\n" " let start_url = Url::parse(\"https://www.google.org\").unwrap();\n" -" let crawl_command = CrawlCommand{ url: start_url, extract_links: true };\n" +" let crawl_command = CrawlCommand{ url: start_url, extract_links: " +"true };\n" " match visit_page(&client, &crawl_command) {\n" " Ok(links) => println!(\"Links: {links:#?}\"),\n" " Err(err) => println!(\"Could not extract links: {err:#}\"),\n" @@ -14544,67 +16926,72 @@ msgid "" "```" msgstr "" -#: src/exercises/concurrency/link-checker.md:126 src/exercises/concurrency/chat-app.md:140 -msgid "## Tasks" +#: src/exercises/concurrency/link-checker.md:128 +msgid "" +"Use threads to check the links in parallel: send the URLs to be checked to a " +"channel and let a few threads check the URLs in parallel." msgstr "" -#: src/exercises/concurrency/link-checker.md:128 +#: src/exercises/concurrency/link-checker.md:130 msgid "" -"* 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" -" don't end up being blocked by the site." +"Extend this to recursively extract links from all pages on the `www.google." +"org` domain. Put an upper limit of 100 pages or so so that you don't end up " +"being blocked by the site." msgstr "" #: src/async.md:1 -msgid "# Async Rust" +msgid "Async Rust" 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" -"I/O that is able to proceed." +"\"Async\" is a concurrency model where multiple tasks are executed " +"concurrently by executing each task until it would block, then switching to " +"another task that is ready to make progress. The model allows running a " +"larger number of tasks on a limited number of threads. This is because the " +"per-task overhead is typically very low and operating systems provide " +"primitives for efficiently identifying 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" -"they are complete." +"Rust's asynchronous operation is based on \"futures\", which represent work " +"that may be completed in the future. Futures are \"polled\" until they " +"signal that they are complete." msgstr "" #: src/async.md:14 msgid "" -"Futures are polled by an async runtime, and several different runtimes are\n" +"Futures are polled by an async runtime, and several different runtimes are " "available." msgstr "" #: src/async.md:17 -msgid "## Comparisons" +msgid "Comparisons" 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" -" similar to a runtime in Rust.\n" -"\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." +"Python has a similar model in its `asyncio`. However, its `Future` type is " +"callback-based, and not polled. Async Python programs require a \"loop\", " +"similar to a runtime in Rust." +msgstr "" + +#: src/async.md:23 +msgid "" +"JavaScript's `Promise` is similar, but again callback-based. The language " +"runtime implements the event loop, so many of the details of Promise " +"resolution are hidden." msgstr "" #: src/async/async-await.md:1 -msgid "# `async`/`await`" +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 @@ -14630,38 +17017,54 @@ msgstr "" #: src/async/async-await.md:27 msgid "" -"* 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" -" with a future. \n" -"\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" -" until the provided future has run to completion. \n" -"\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" -" introduced later). " +"Note that this is a simplified example to show the syntax. There is no long " +"running operation or any real concurrency in it!" +msgstr "" + +#: src/async/async-await.md:30 +msgid "What is the return type of an async call?" +msgstr "" + +#: src/async/async-await.md:31 +msgid "Use `let future: () = async_main(10);` in `main` to see the type." +msgstr "" + +#: src/async/async-await.md:33 +msgid "" +"The \"async\" keyword is syntactic sugar. The compiler replaces the return " +"type with a future. " +msgstr "" + +#: src/async/async-await.md:36 +msgid "" +"You cannot make `main` async, without additional instructions to the " +"compiler on how to use the returned future." +msgstr "" + +#: src/async/async-await.md:39 +msgid "" +"You need an executor to run async code. `block_on` blocks the current thread " +"until the provided future has run to completion. " +msgstr "" + +#: src/async/async-await.md:42 +msgid "" +"`.await` asynchronously waits for the completion of another operation. " +"Unlike `block_on`, `.await` doesn't block the current thread." msgstr "" -#: src/async/futures.md:1 -msgid "# Futures" +#: src/async/async-await.md:45 +msgid "" +"`.await` can only be used inside an `async` function (or block; these are " +"introduced later). " 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" -"complete yet. A future can be polled, and `poll` returns a\n" -"[`Poll`](https://doc.rust-lang.org/std/task/enum.Poll.html)." +"[`Future`](https://doc.rust-lang.org/std/future/trait.Future.html) is a " +"trait, implemented by objects that represent an operation that may not be " +"complete yet. A future can be polled, and `poll` returns a [`Poll`](https://" +"doc.rust-lang.org/std/task/enum.Poll.html)." msgstr "" #: src/async/futures.md:8 @@ -14672,7 +17075,8 @@ 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" @@ -14684,76 +17088,87 @@ 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" -"from `tokio::spawn` implements `Future` to allow joining to it." +"An async function returns an `impl Future`. It's also possible (but " +"uncommon) to implement `Future` for your own types. For example, the " +"`JoinHandle` returned 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" -"pause until that Future is ready, and then evaluates to its output." +"The `.await` keyword, applied to a Future, causes the current async function " +"to pause until that Future is ready, and then evaluates to its output." msgstr "" #: src/async/futures.md:32 msgid "" -"* The `Future` and `Poll` types are implemented exactly as shown; click the\n" -" links to show the implementations in the docs.\n" -"\n" -"* We will not get to `Pin` and `Context`, as we will focus on writing async\n" -" code, rather than building new async primitives. Briefly:\n" -"\n" -" * `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" -" valid after an `.await`." +"The `Future` and `Poll` types are implemented exactly as shown; click the " +"links to show the implementations in the docs." +msgstr "" + +#: src/async/futures.md:35 +msgid "" +"We will not get to `Pin` and `Context`, as we will focus on writing async " +"code, rather than building new async primitives. Briefly:" msgstr "" -#: src/async/runtimes.md:1 -msgid "# Runtimes" +#: src/async/futures.md:38 +msgid "" +"`Context` allows a Future to schedule itself to be polled again when an " +"event occurs." +msgstr "" + +#: src/async/futures.md:41 +msgid "" +"`Pin` ensures that the Future isn't moved in memory, so that pointers into " +"that future remain valid. This is required to allow references to remain " +"valid after an `.await`." 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" -"\"built-in\" runtime, but several options are available:" +"A _runtime_ provides support for performing operations asynchronously (a " +"_reactor_) and is responsible for executing futures (an _executor_). Rust " +"does not have a \"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" -" 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" -" basic runtime in `async::task`.\n" -" * [smol](https://docs.rs/smol/latest/smol/): simple and lightweight" +"[Tokio](https://tokio.rs/): performant, with a well-developed ecosystem of " +"functionality like [Hyper](https://hyper.rs/) for HTTP or [Tonic](https://" +"github.com/hyperium/tonic) for gRPC." +msgstr "" + +#: src/async/runtimes.md:10 +msgid "" +"[async-std](https://async.rs/): aims to be a \"std for async\", and includes " +"a basic runtime in `async::task`." +msgstr "" + +#: src/async/runtimes.md:12 +msgid "[smol](https://docs.rs/smol/latest/smol/): simple and lightweight" 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" -"already has one." +"Several larger applications have their own runtimes. For example, [Fuchsia]" +"(https://fuchsia.googlesource.com/fuchsia/+/refs/heads/main/src/lib/fuchsia-" +"async/src/lib.rs) 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" -" 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" -" 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" -" used." +"Note that of the listed runtimes, only Tokio is supported in the Rust " +"playground. The playground also does not permit any I/O, so most interesting " +"async things can't run in the playground." msgstr "" -#: src/async/runtimes/tokio.md:1 -msgid "# Tokio" +#: src/async/runtimes.md:24 +msgid "" +"Futures are \"inert\" in that they do not do anything (not even start an I/O " +"operation) unless there is an executor polling them. This differs from JS " +"Promises, for example, which will run to completion even if they are never " +"used." msgstr "" #: src/async/runtimes/tokio.md:4 @@ -14761,10 +17176,15 @@ msgid "Tokio provides: " msgstr "" #: src/async/runtimes/tokio.md:6 -msgid "" -"* A multi-threaded runtime for executing asynchronous code.\n" -"* An asynchronous version of the standard library.\n" -"* A large ecosystem of libraries." +msgid "A multi-threaded runtime for executing asynchronous code." +msgstr "" + +#: src/async/runtimes/tokio.md:7 +msgid "An asynchronous version of the standard library." +msgstr "" + +#: src/async/runtimes/tokio.md:8 +msgid "A large ecosystem of libraries." msgstr "" #: src/async/runtimes/tokio.md:10 @@ -14792,12 +17212,15 @@ msgid "" msgstr "" #: src/async/runtimes/tokio.md:33 -msgid "" -"* With the `tokio::main` macro we can now make `main` async.\n" -"\n" -"* The `spawn` function creates a new, concurrent \"task\".\n" -"\n" -"* Note: `spawn` takes a `Future`, you don't call `.await` on `count_to`." +msgid "With the `tokio::main` macro we can now make `main` async." +msgstr "" + +#: src/async/runtimes/tokio.md:35 +msgid "The `spawn` function creates a new, concurrent \"task\"." +msgstr "" + +#: src/async/runtimes/tokio.md:37 +msgid "Note: `spawn` takes a `Future`, you don't call `.await` on `count_to`." msgstr "" #: src/async/runtimes/tokio.md:39 @@ -14806,17 +17229,17 @@ 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" -" until it finishes.\n" -"\n" -"* Try `count_to(10).await` instead of spawning.\n" -"\n" -"* Try awaiting the task returned from `tokio::spawn`." +"Why does `count_to` not (usually) get to 10? This is an example of async " +"cancellation. `tokio::spawn` returns a handle which can be awaited to wait " +"until it finishes." +msgstr "" + +#: src/async/runtimes/tokio.md:45 +msgid "Try `count_to(10).await` instead of spawning." msgstr "" -#: src/async/tasks.md:1 -msgid "# Tasks" +#: src/async/runtimes/tokio.md:47 +msgid "Try awaiting the task returned from `tokio::spawn`." msgstr "" #: src/async/tasks.md:3 @@ -14825,10 +17248,11 @@ msgstr "" #: src/async/tasks.md:5 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" -"polling multiple child futures, such as racing a timer and an I/O operation." +"A task has a single top-level future which the executor polls to make " +"progress. That future may have one or more nested futures that its `poll` " +"method polls, corresponding loosely to a call stack. Concurrency within a " +"task is possible by polling multiple child futures, such as racing a timer " +"and an I/O operation." msgstr "" #: src/async/tasks.md:10 @@ -14856,7 +17280,8 @@ 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" @@ -14875,27 +17300,32 @@ msgid "" msgstr "" #: src/async/tasks.md:52 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:54 msgid "" -"* 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 `?`." +"Ask students to visualize what the state of the example server would be with " +"a few connected clients. What tasks exist? What are their Futures?" +msgstr "" + +#: src/async/tasks.md:57 +msgid "" +"This is the first time we've seen an `async` block. This is similar to a " +"closure, but does not take any arguments. Its return value is a Future, " +"similar to an `async fn`. " msgstr "" -#: src/async/channels.md:1 -msgid "# Async Channels" +#: src/async/tasks.md:61 +msgid "" +"Refactor the async block into a function, and improve the error handling " +"using `?`." msgstr "" #: src/async/channels.md:3 -msgid "Several crates have support for asynchronous channels. For instance `tokio`:" +msgid "" +"Several crates have support for asynchronous channels. For instance `tokio`:" msgstr "" #: src/async/channels.md:5 @@ -14924,52 +17354,63 @@ msgid "" " }\n" "\n" " 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 "" -#: src/async/channels.md:35 +#: src/async/channels.md:35 +msgid "Change the channel size to `3` and see how it affects the execution." +msgstr "" + +#: src/async/channels.md:37 +msgid "" +"Overall, the interface is similar to the `sync` channels as seen in the " +"[morning class](concurrency/channels.md)." +msgstr "" + +#: src/async/channels.md:40 +msgid "Try removing the `std::mem::drop` call. What happens? Why?" +msgstr "" + +#: src/async/channels.md:42 msgid "" -"* Change the channel size to `3` and see how it affects the execution.\n" -"\n" -"* Overall, the interface is similar to the `sync` channels as seen in the\n" -" [morning class](concurrency/channels.md).\n" -"\n" -"* 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" -" 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" -" them with other `future`s to combine them and create complex control flow." +"The [Flume](https://docs.rs/flume/latest/flume/) crate has channels that " +"implement both `sync` and `async` `send` and `recv`. This can be convenient " +"for complex applications with both IO and heavy CPU processing tasks." +msgstr "" + +#: src/async/channels.md:46 +msgid "" +"What makes working with `async` channels preferable is the ability to " +"combine them with other `future`s to combine them and create complex control " +"flow." msgstr "" #: src/async/control-flow.md:1 -msgid "# Futures Control Flow" +msgid "Futures Control Flow" msgstr "" #: src/async/control-flow.md:3 msgid "" -"Futures can be combined together to produce concurrent compute flow graphs. We\n" -"have already seen tasks, that function as independent threads of execution." +"Futures can be combined together to produce concurrent compute flow graphs. " +"We have already seen tasks, that function as independent threads of " +"execution." msgstr "" #: src/async/control-flow.md:6 -msgid "" -"- [Join](control-flow/join.md)\n" -"- [Select](control-flow/select.md)" +msgid "[Join](control-flow/join.md)" msgstr "" -#: src/async/control-flow/join.md:1 -msgid "# Join" +#: src/async/control-flow.md:7 +msgid "[Select](control-flow/select.md)" msgstr "" #: src/async/control-flow/join.md:3 msgid "" -"A join operation waits until all of a set of futures are ready, and\n" -"returns a collection of their results. This is similar to `Promise.all` in\n" +"A join operation waits until all of a set of futures are ready, and returns " +"a collection of their results. This is similar to `Promise.all` in " "JavaScript or `asyncio.gather` in Python." msgstr "" @@ -15005,37 +17446,40 @@ msgstr "" #: src/async/control-flow/join.md:38 msgid "" -"* 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" -" cause your program to stall. \n" -"\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!`." +"For multiple futures of disjoint types, you can use `std::future::join!` but " +"you must know how many futures you will have at compile time. This is " +"currently in the `futures` crate, soon to be stabilised in `std::future`." +msgstr "" + +#: src/async/control-flow/join.md:42 +msgid "" +"The risk of `join` is that one of the futures may never resolve, this would " +"cause your program to stall. " msgstr "" -#: src/async/control-flow/select.md:1 -msgid "# Select" +#: src/async/control-flow/join.md:45 +msgid "" +"You can also combine `join_all` with `join!` for instance to join all " +"requests to an http service as well as a database query. Try adding a " +"`tokio::time::sleep` to the future, using `futures::join!`. This is not a " +"timeout (that requires `select!`, explained in the next chapter), but " +"demonstrates `join!`." 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" -"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)`." +"A select operation waits until any of a set of futures is ready, and " +"responds to that future's result. In JavaScript, this is similar to `Promise." +"race`. In Python, it compares to `asyncio.wait(task_set, return_when=asyncio." +"FIRST_COMPLETED)`." msgstr "" #: src/async/control-flow/select.md:8 msgid "" -"Similar to a match statement, the body of `select!` has a number of arms, each\n" -"of the form `pattern = future => statement`. When the `future` is ready, the\n" -"`statement` is executed with the variables in `pattern` bound to the `future`'s\n" -"result." +"Similar to a match statement, the body of `select!` has a number of arms, " +"each of the form `pattern = future => statement`. When the `future` is " +"ready, the `statement` is executed with the variables in `pattern` bound to " +"the `future`'s result." msgstr "" #: src/async/control-flow/select.md:13 @@ -15090,53 +17534,74 @@ msgstr "" #: src/async/control-flow/select.md:62 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" -" 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" -" receive only one `send`.\n" -"\n" -"* Try adding a deadline to the race, demonstrating selecting different sorts of\n" -" futures.\n" -"\n" -"* Note that `select!` drops unmatched branches, which cancels their futures.\n" -" It is easiest to use when every execution of `select!` creates new futures.\n" -"\n" -" * An alternative is to pass `&mut future` instead of the future itself, but\n" -" this can lead to issues, further discussed in the pinning slide." +"In this example, we have a race between a cat and a dog. " +"`first_animal_to_finish_race` listens to both channels and will pick " +"whichever arrives first. Since the dog takes 50ms, it wins against the cat " +"that take 500ms seconds." +msgstr "" + +#: src/async/control-flow/select.md:67 +msgid "" +"You can use `oneshot` channels in this example as the channels are supposed " +"to receive only one `send`." +msgstr "" + +#: src/async/control-flow/select.md:70 +msgid "" +"Try adding a deadline to the race, demonstrating selecting different sorts " +"of futures." +msgstr "" + +#: src/async/control-flow/select.md:73 +msgid "" +"Note that `select!` drops unmatched branches, which cancels their futures. " +"It is easiest to use when every execution of `select!` creates new futures." +msgstr "" + +#: src/async/control-flow/select.md:76 +msgid "" +"An alternative is to pass `&mut future` instead of the future itself, but " +"this can lead to issues, further discussed in the pinning slide." msgstr "" #: src/async/pitfalls.md:1 -msgid "# Pitfalls of async/await" +msgid "Pitfalls of async/await" 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 -msgid "" -"- [Blocking the Executor](pitfalls/blocking-executor.md)\n" -"- [Pin](pitfalls/pin.md)\n" -"- [Async Traits](pitfalls/async-traits.md)\n" -"- [Cancellation](pitfalls/cancellation.md)" +msgid "[Blocking the Executor](pitfalls/blocking-executor.md)" +msgstr "" + +#: src/async/pitfalls.md:6 +msgid "[Pin](pitfalls/pin.md)" +msgstr "" + +#: src/async/pitfalls.md:7 +msgid "[Async Traits](pitfalls/async-traits.md)" +msgstr "" + +#: src/async/pitfalls.md:8 +msgid "[Cancellation](pitfalls/cancellation.md)" msgstr "" #: src/async/pitfalls/blocking-executor.md:1 -msgid "# Blocking the executor" +msgid "Blocking the executor" 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" -"An easy workaround is to use async equivalent methods where possible." +"Most async runtimes only allow IO tasks to run concurrently. This means that " +"CPU blocking tasks will block the executor and prevent other tasks from " +"being executed. An easy workaround is to use async equivalent methods where " +"possible." msgstr "" #: src/async/pitfalls/blocking-executor.md:7 @@ -15164,45 +17629,57 @@ msgstr "" #: src/async/pitfalls/blocking-executor.md:29 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" -" 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" -"\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" -" 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" -" 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" -"\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." +"Run the code and see that the sleeps happen consecutively rather than " +"concurrently." +msgstr "" + +#: src/async/pitfalls/blocking-executor.md:32 +msgid "" +"The `\"current_thread\"` flavor puts all tasks on a single thread. This " +"makes the effect more obvious, but the bug is still present in the multi-" +"threaded flavor." +msgstr "" + +#: src/async/pitfalls/blocking-executor.md:36 +msgid "" +"Switch the `std::thread::sleep` to `tokio::time::sleep` and await its result." +msgstr "" + +#: src/async/pitfalls/blocking-executor.md:38 +msgid "" +"Another fix would be to `tokio::task::spawn_blocking` which spawns an actual " +"thread and transforms its handle into a future without blocking the executor." +msgstr "" + +#: src/async/pitfalls/blocking-executor.md:41 +msgid "" +"You should not think of tasks as OS threads. They do not map 1 to 1 and most " +"executors will allow many tasks to run on a single OS thread. This is " +"particularly problematic when interacting with other libraries via FFI, " +"where that library might depend on thread-local storage or map to specific " +"OS threads (e.g., CUDA). Prefer `tokio::task::spawn_blocking` in such " +"situations." msgstr "" -#: src/async/pitfalls/pin.md:1 -msgid "# Pin" +#: src/async/pitfalls/blocking-executor.md:47 +msgid "" +"Use sync mutexes with care. Holding a mutex over an `.await` may cause " +"another task to block, and that task may be running on the same thread." 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" -"This is unsafe." +"When you await a future, all local variables (that would ordinarily be " +"stored on a stack frame) are instead stored in the Future for the current " +"async block. If your future has pointers to data on the stack, those " +"pointers might get invalidated. 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" -"in a `select!` often leads to issues with pinned values." +"Therefore, you must guarantee that the addresses your future points to don't " +"change. That is why we need to `pin` futures. Using the same future " +"repeatedly in a `select!` often leads to issues with pinned values." msgstr "" #: src/async/pitfalls/pin.md:12 @@ -15264,67 +17741,92 @@ msgstr "" #: src/async/pitfalls/pin.md:68 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" -" with it.\n" -"\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" -"\n" -" ```rust,compile_fail\n" -" let mut timeout_fut = sleep(Duration::from_millis(100));\n" -" loop {\n" -" select! {\n" -" ..,\n" -" _ = timeout_fut => { println!(..); },\n" -" }\n" -" }\n" -" ```\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" -" ```rust,compile_fail\n" -" let mut timeout_fut = Box::pin(sleep(Duration::from_millis(100)));\n" -" loop {\n" -" select! {\n" -" ..,\n" -" _ = &mut timeout_fut => { println!(..); },\n" -" }\n" -" }\n" -" ```\n" -"\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" -" 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." +"You may recognize this as an example of the actor pattern. Actors typically " +"call `select!` in a loop." +msgstr "" + +#: src/async/pitfalls/pin.md:71 +msgid "" +"This serves as a summation of a few of the previous lessons, so take your " +"time with it." +msgstr "" + +#: src/async/pitfalls/pin.md:74 +msgid "" +"Naively add a `_ = sleep(Duration::from_millis(100)) => { println!(..) }` to " +"the `select!`. This will never execute. Why?" +msgstr "" + +#: src/async/pitfalls/pin.md:77 +msgid "" +"Instead, add a `timeout_fut` containing that future outside of the `loop`:" +msgstr "" + +#: src/async/pitfalls/pin.md:79 +msgid "" +"```rust,compile_fail\n" +"let mut timeout_fut = sleep(Duration::from_millis(100));\n" +"loop {\n" +" select! {\n" +" ..,\n" +" _ = timeout_fut => { println!(..); },\n" +" }\n" +"}\n" +"```" +msgstr "" + +#: src/async/pitfalls/pin.md:88 +msgid "" +"This still doesn't work. Follow the compiler errors, adding `&mut` to the " +"`timeout_fut` in the `select!` to work around the move, then using `Box::" +"pin`:" +msgstr "" + +#: src/async/pitfalls/pin.md:92 +msgid "" +"```rust,compile_fail\n" +"let mut timeout_fut = Box::pin(sleep(Duration::from_millis(100)));\n" +"loop {\n" +" select! {\n" +" ..,\n" +" _ = &mut timeout_fut => { println!(..); },\n" +" }\n" +"}\n" +"```" msgstr "" -#: src/async/pitfalls/async-traits.md:1 -msgid "# Async Traits" +#: src/async/pitfalls/pin.md:102 +msgid "" +"This compiles, but once the timeout expires it is `Poll::Ready` on every " +"iteration (a fused future would help with this). Update to reset " +"`timeout_fut` every time it expires." +msgstr "" + +#: src/async/pitfalls/pin.md:106 +msgid "" +"Box allocates on the heap. In some cases, `std::pin::pin!` (only recently " +"stabilized, with older code often using `tokio::pin!`) is also an option, " +"but that is difficult to use for a future that is reassigned." +msgstr "" + +#: src/async/pitfalls/pin.md:110 +msgid "" +"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: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 @@ -15350,7 +17852,8 @@ 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" @@ -15372,35 +17875,33 @@ msgid "" "```" msgstr "" -#: src/async/pitfalls/async-traits.md:49 -msgid "
" +#: src/async/pitfalls/async-traits.md:51 +msgid "" +"`async_trait` is easy to use, but note that it's using heap allocations to " +"achieve this. This heap allocation has performance overhead." msgstr "" -#: src/async/pitfalls/async-traits.md:51 +#: src/async/pitfalls/async-traits.md:54 msgid "" -"* `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" -" 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" -" and adding it to the Vec." +"The challenges in language support for `async trait` are deep Rust and " +"probably not worth describing in-depth. Niko Matsakis did a good job of " +"explaining them in [this post](https://smallcultfollowing.com/babysteps/" +"blog/2019/10/26/async-fn-in-traits-are-hard/) if you are interested in " +"digging deeper." msgstr "" -#: src/async/pitfalls/cancellation.md:1 -msgid "# Cancellation" +#: src/async/pitfalls/async-traits.md:60 +msgid "" +"Try creating a new sleeper struct that will sleep for a random amount of " +"time and adding it to the Vec." msgstr "" #: src/async/pitfalls/cancellation.md:3 msgid "" -"Dropping a future implies it can never be polled again. This is called *cancellation*\n" -"and it can occur at any `await` point. Care is needed to ensure the system works\n" -"correctly even when futures are cancelled. For example, it shouldn't deadlock or\n" -"lose data." +"Dropping a future implies it can never be polled again. This is called " +"_cancellation_ and it can occur at any `await` point. Care is needed to " +"ensure the system works correctly even when futures are cancelled. For " +"example, it shouldn't deadlock or lose data." msgstr "" #: src/async/pitfalls/cancellation.md:8 @@ -15432,12 +17933,14 @@ msgid "" " return Ok(None)\n" " }\n" " let s = String::from_utf8(bytes)\n" -" .map_err(|_| io::Error::new(ErrorKind::InvalidData, \"not UTF-8\"))?;\n" +" .map_err(|_| io::Error::new(ErrorKind::InvalidData, \"not " +"UTF-8\"))?;\n" " Ok(Some(s))\n" " }\n" "}\n" "\n" -"async fn slow_copy(source: String, mut dest: DuplexStream) -> std::io::Result<()> {\n" +"async fn slow_copy(source: String, mut dest: DuplexStream) -> std::io::" +"Result<()> {\n" " for b in source.bytes() {\n" " dest.write_u8(b).await?;\n" " tokio::time::sleep(Duration::from_millis(10)).await\n" @@ -15448,7 +17951,8 @@ msgid "" "#[tokio::main]\n" "async fn main() -> std::io::Result<()> {\n" " let (client, server) = tokio::io::duplex(5);\n" -" let handle = tokio::spawn(slow_copy(\"hi\\nthere\\n\".to_owned(), client));\n" +" let handle = tokio::spawn(slow_copy(\"hi\\nthere\\n\".to_owned(), " +"client));\n" "\n" " let mut lines = LinesReader::new(server);\n" " let mut interval = tokio::time::interval(Duration::from_millis(60));\n" @@ -15470,79 +17974,110 @@ msgstr "" #: src/async/pitfalls/cancellation.md:72 msgid "" -"* The compiler doesn't help with cancellation-safety. You need to read API\n" -" documentation and consider what state your `async fn` holds.\n" -"\n" -"* Unlike `panic` and `?`, cancellation is part of normal control flow\n" -" (vs error-handling).\n" -"\n" -"* The example loses parts of the string.\n" -"\n" -" * Whenever the `tick()` branch finishes first, `next()` and its `buf` are dropped.\n" -"\n" -" * `LinesReader` can be made cancellation-safe by makeing `buf` part of the struct:\n" -" ```rust,compile_fail\n" -" struct LinesReader {\n" -" stream: DuplexStream,\n" -" bytes: Vec,\n" -" buf: [u8; 1],\n" -" }\n" -"\n" -" impl LinesReader {\n" -" fn new(stream: DuplexStream) -> Self {\n" -" Self { stream, bytes: Vec::new(), buf: [0] }\n" -" }\n" -" async fn next(&mut self) -> io::Result> {\n" -" // prefix buf and bytes with self.\n" -" // ...\n" -" let raw = std::mem::take(&mut self.bytes);\n" -" let s = String::from_utf8(raw)\n" -" // ...\n" -" }\n" -" }\n" -" ```\n" -"\n" -"* [`Interval::tick`](https://docs.rs/tokio/latest/tokio/time/struct.Interval.html#method.tick)\n" -" is cancellation-safe because it keeps track of whether a tick has been 'delivered'.\n" -"\n" -"* [`AsyncReadExt::read`](https://docs.rs/tokio/latest/tokio/io/trait.AsyncReadExt.html#method.read)\n" -" is cancellation-safe because it either returns or doesn't read data.\n" +"The compiler doesn't help with cancellation-safety. You need to read API " +"documentation and consider what state your `async fn` holds." +msgstr "" + +#: src/async/pitfalls/cancellation.md:75 +msgid "" +"Unlike `panic` and `?`, cancellation is part of normal control flow (vs " +"error-handling)." +msgstr "" + +#: src/async/pitfalls/cancellation.md:78 +msgid "The example loses parts of the string." +msgstr "" + +#: src/async/pitfalls/cancellation.md:80 +msgid "" +"Whenever the `tick()` branch finishes first, `next()` and its `buf` are " +"dropped." +msgstr "" + +#: src/async/pitfalls/cancellation.md:82 +msgid "" +"`LinesReader` can be made cancellation-safe by makeing `buf` part of the " +"struct:" +msgstr "" + +#: src/async/pitfalls/cancellation.md:83 +msgid "" +"```rust,compile_fail\n" +"struct LinesReader {\n" +" stream: DuplexStream,\n" +" bytes: Vec,\n" +" buf: [u8; 1],\n" +"}\n" "\n" -"* [`AsyncBufReadExt::read_line`](https://docs.rs/tokio/latest/tokio/io/trait.AsyncBufReadExt." -"html#method.read_line)\n" -" is similar to the example and *isn't* cancellation-safe. See its documentation\n" -" for details and alternatives." +"impl LinesReader {\n" +" fn new(stream: DuplexStream) -> Self {\n" +" Self { stream, bytes: Vec::new(), buf: [0] }\n" +" }\n" +" async fn next(&mut self) -> io::Result> {\n" +" // prefix buf and bytes with self.\n" +" // ...\n" +" let raw = std::mem::take(&mut self.bytes);\n" +" let s = String::from_utf8(raw)\n" +" // ...\n" +" }\n" +"}\n" +"```" +msgstr "" + +#: src/async/pitfalls/cancellation.md:104 +msgid "" +"[`Interval::tick`](https://docs.rs/tokio/latest/tokio/time/struct.Interval." +"html#method.tick) is cancellation-safe because it keeps track of whether a " +"tick has been 'delivered'." +msgstr "" + +#: src/async/pitfalls/cancellation.md:107 +msgid "" +"[`AsyncReadExt::read`](https://docs.rs/tokio/latest/tokio/io/trait." +"AsyncReadExt.html#method.read) is cancellation-safe because it either " +"returns or doesn't read data." +msgstr "" + +#: src/async/pitfalls/cancellation.md:110 +msgid "" +"[`AsyncBufReadExt::read_line`](https://docs.rs/tokio/latest/tokio/io/trait." +"AsyncBufReadExt.html#method.read_line) is similar to the example and _isn't_ " +"cancellation-safe. See its documentation for details and alternatives." 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" -" you are going to implement it with Async Rust.\n" -"\n" -"* A Broadcast Chat Application: this is a larger project that allows you\n" -" experiment with more advanced Async Rust features." +"Dining philosophers: we already saw this problem in the morning. This time " +"you are going to implement it with Async Rust." +msgstr "" + +#: src/exercises/concurrency/afternoon.md:8 +msgid "" +"A Broadcast Chat Application: this is a larger project that allows you " +"experiment with more advanced Async Rust features." msgstr "" #: src/exercises/concurrency/dining-philosophers-async.md:1 -msgid "# Dining Philosophers - Async" +#: src/exercises/concurrency/solutions-afternoon.md:3 +msgid "Dining Philosophers - Async" msgstr "" #: src/exercises/concurrency/dining-philosophers-async.md:3 msgid "" -"See [dining philosophers](dining-philosophers.md) for a description of the\n" +"See [dining philosophers](dining-philosophers.md) for a description of the " "problem." 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" -"that `cargo run` does not deadlock:" +"As before, you will need a local [Cargo installation](../../cargo/running-" +"locally.md) for this exercise. Copy the code below to a file called `src/" +"main.rs`, fill out the blanks, and test that `cargo run` does not deadlock:" msgstr "" #: src/exercises/concurrency/dining-philosophers-async.md:13 @@ -15565,7 +18100,8 @@ 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" @@ -15594,7 +18130,7 @@ msgstr "" #: src/exercises/concurrency/dining-philosophers-async.md:57 msgid "" -"Since this time you are using Async Rust, you'll need a `tokio` dependency.\n" +"Since this time you are using Async Rust, you'll need a `tokio` dependency. " "You can use the following `Cargo.toml`:" msgstr "" @@ -15607,38 +18143,36 @@ 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 "" #: src/exercises/concurrency/dining-philosophers-async.md:72 msgid "" -"Also note that this time you have to use the `Mutex` and the `mpsc` module\n" +"Also note that this time you have to use the `Mutex` and the `mpsc` module " "from the `tokio` crate." msgstr "" #: src/exercises/concurrency/dining-philosophers-async.md:77 -msgid "* Can you make your implementation single-threaded? " -msgstr "" - -#: src/exercises/concurrency/chat-app.md:1 -msgid "# Broadcast Chat Application" +msgid "Can you make your implementation single-threaded? " 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" -"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." +"In this exercise, we want to use our new knowledge to implement a broadcast " +"chat application. We have a chat server that the clients connect to and " +"publish their messages. The client reads user messages from the standard " +"input, and sends them to the server. The chat server broadcasts each message " +"that it receives to all the clients." msgstr "" #: src/exercises/concurrency/chat-app.md:9 msgid "" -"For this, we use [a broadcast channel][1] on the server, and\n" -"[`tokio_websockets`][2] for the communication between the client and the\n" -"server." +"For this, we use [a broadcast channel](https://docs.rs/tokio/latest/tokio/" +"sync/broadcast/fn.channel.html) on the server, and [`tokio_websockets`]" +"(https://docs.rs/tokio-websockets/0.3.2/tokio_websockets/) for the " +"communication between the client and the server." msgstr "" #: src/exercises/concurrency/chat-app.md:13 @@ -15666,56 +18200,71 @@ msgid "" msgstr "" #: src/exercises/concurrency/chat-app.md:32 -msgid "## The required APIs" +msgid "The required APIs" 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" +"You are going to need the following functions from `tokio` and " +"[`tokio_websockets`](https://docs.rs/tokio-websockets/0.3.2/" +"tokio_websockets/). Spend a few minutes to familiarize yourself with the " "API. " msgstr "" #: src/exercises/concurrency/chat-app.md:37 msgid "" -"- [WebsocketStream::next()][3]: for asynchronously reading messages from a\n" -" Websocket Stream.\n" -"- [SinkExt::send()][4] implemented by `WebsocketStream`: for asynchronously\n" -" sending messages on a Websocket Stream.\n" -"- [Lines::next_line()][5]: for asynchronously reading user messages\n" -" from the standard input.\n" -"- [Sender::subscribe()][6]: for subscribing to a broadcast channel." +"[WebsocketStream::next()](https://docs.rs/tokio-websockets/0.3.2/" +"tokio_websockets/proto/struct.WebsocketStream.html#method.next): for " +"asynchronously reading messages from a Websocket Stream." +msgstr "" + +#: src/exercises/concurrency/chat-app.md:39 +msgid "" +"[SinkExt::send()](https://docs.rs/futures-util/0.3.28/futures_util/sink/" +"trait.SinkExt.html#method.send) implemented by `WebsocketStream`: for " +"asynchronously sending messages on a Websocket Stream." +msgstr "" + +#: src/exercises/concurrency/chat-app.md:41 +msgid "" +"[Lines::next_line()](https://docs.rs/tokio/latest/tokio/io/struct.Lines." +"html#method.next_line): for asynchronously reading user messages from the " +"standard input." +msgstr "" + +#: src/exercises/concurrency/chat-app.md:43 +msgid "" +"[Sender::subscribe()](https://docs.rs/tokio/latest/tokio/sync/broadcast/" +"struct.Sender.html#method.subscribe): for subscribing to a broadcast channel." msgstr "" #: src/exercises/concurrency/chat-app.md:46 -msgid "## Two binaries" +msgid "Two binaries" 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" -"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" -"`src/bin` (see the [documentation][7]). " +"Normally in a Cargo project, you can have only one binary, and one `src/main." +"rs` file. In this project, we need two binaries. One for the client, and one " +"for the server. You could potentially make them two separate Cargo projects, " +"but we are going to put them in a single Cargo project with two binaries. " +"For this to work, the client and the server code should go under `src/bin` " +"(see the [documentation](https://doc.rust-lang.org/cargo/reference/cargo-" +"targets.html#binaries)). " msgstr "" #: src/exercises/concurrency/chat-app.md:55 msgid "" -"Copy the following server and client code into `src/bin/server.rs` and\n" -"`src/bin/client.rs`, respectively. Your task is to complete these files as\n" +"Copy the following server and client code into `src/bin/server.rs` and `src/" +"bin/client.rs`, respectively. Your task is to complete these files as " "described below. " msgstr "" -#: src/exercises/concurrency/chat-app.md:59 src/exercises/concurrency/solutions-afternoon.md:123 +#: src/exercises/concurrency/chat-app.md:59 +#: src/exercises/concurrency/solutions-afternoon.md:123 msgid "`src/bin/server.rs`:" msgstr "" -#: src/exercises/concurrency/chat-app.md:61 -msgid "" -msgstr "" - #: src/exercises/concurrency/chat-app.md:63 msgid "" "```rust,compile_fail\n" @@ -15758,14 +18307,11 @@ msgid "" "```" msgstr "" -#: src/exercises/concurrency/chat-app.md:102 src/exercises/concurrency/solutions-afternoon.md:208 +#: src/exercises/concurrency/chat-app.md:102 +#: src/exercises/concurrency/solutions-afternoon.md:208 msgid "`src/bin/client.rs`:" msgstr "" -#: src/exercises/concurrency/chat-app.md:104 -msgid "" -msgstr "" - #: src/exercises/concurrency/chat-app.md:106 msgid "" "```rust,compile_fail\n" @@ -15776,7 +18322,8 @@ 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" @@ -15791,7 +18338,7 @@ msgid "" msgstr "" #: src/exercises/concurrency/chat-app.md:127 -msgid "## Running the binaries" +msgid "Running the binaries" msgstr "" #: src/exercises/concurrency/chat-app.md:128 @@ -15817,51 +18364,60 @@ msgid "" msgstr "" #: src/exercises/concurrency/chat-app.md:142 +msgid "Implement the `handle_connection` function in `src/bin/server.rs`." +msgstr "" + +#: src/exercises/concurrency/chat-app.md:143 +msgid "" +"Hint: Use `tokio::select!` for concurrently performing two tasks in a " +"continuous loop. One task receives messages from the client and broadcasts " +"them. The other sends messages received by the server to the client." +msgstr "" + +#: src/exercises/concurrency/chat-app.md:146 +msgid "Complete the main function in `src/bin/client.rs`." +msgstr "" + +#: src/exercises/concurrency/chat-app.md:147 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" -" 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" -" 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" -" 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." +"Hint: As before, use `tokio::select!` in a continuous loop for concurrently " +"performing two tasks: (1) reading user messages from standard input and " +"sending them to the server, and (2) receiving messages from the server, and " +"displaying them for the user." msgstr "" -#: src/thanks.md:1 -msgid "# Thanks!" +#: src/exercises/concurrency/chat-app.md:151 +msgid "" +"Optional: Once you are done, change the code to broadcast messages to all " +"clients, but the sender of the message." msgstr "" #: src/thanks.md:3 msgid "" -"_Thank you for taking Comprehensive Rust 🦀!_ We hope you enjoyed it and that it\n" -"was useful." +"_Thank you for taking Comprehensive Rust 🦀!_ We hope you enjoyed it and " +"that it 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" -"[contact with us on\n" -"GitHub](https://github.com/google/comprehensive-rust/discussions). We would love\n" -"to hear from you." +"We've had a lot of fun putting the course together. The course is not " +"perfect, so if you spotted any mistakes or have ideas for improvements, " +"please get in [contact with us on GitHub](https://github.com/google/" +"comprehensive-rust/discussions). We would love to hear from you." msgstr "" #: src/other-resources.md:1 -msgid "# Other Rust Resources" +msgid "Other Rust Resources" msgstr "" #: src/other-resources.md:3 msgid "" -"The Rust community has created a wealth of high-quality and free resources\n" +"The Rust community has created a wealth of high-quality and free resources " "online." msgstr "" #: src/other-resources.md:6 -msgid "## Official Documentation" +msgid "Official Documentation" msgstr "" #: src/other-resources.md:8 @@ -15870,17 +18426,29 @@ 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" -" 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" -" 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" -" the standard library for Rust.\n" -"* [The Rust Reference](https://doc.rust-lang.org/reference/): an incomplete book\n" -" which describes the Rust grammar and memory model." +"[The Rust Programming Language](https://doc.rust-lang.org/book/): the " +"canonical free book about Rust. Covers the language in detail and includes a " +"few projects for people to build." +msgstr "" + +#: src/other-resources.md:13 +msgid "" +"[Rust By Example](https://doc.rust-lang.org/rust-by-example/): covers the " +"Rust syntax via a series of examples which showcase different constructs. " +"Sometimes includes small exercises where you are asked to expand on the code " +"in the examples." +msgstr "" + +#: src/other-resources.md:17 +msgid "" +"[Rust Standard Library](https://doc.rust-lang.org/std/): full documentation " +"of the standard library for Rust." +msgstr "" + +#: src/other-resources.md:19 +msgid "" +"[The Rust Reference](https://doc.rust-lang.org/reference/): an incomplete " +"book which describes the Rust grammar and memory model." msgstr "" #: src/other-resources.md:22 @@ -15889,18 +18457,27 @@ msgstr "" #: src/other-resources.md:24 msgid "" -"* [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" -" Rust Book was written.\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." +"[The Rustonomicon](https://doc.rust-lang.org/nomicon/): covers unsafe Rust, " +"including working with raw pointers and interfacing with other languages " +"(FFI)." +msgstr "" + +#: src/other-resources.md:27 +msgid "" +"[Asynchronous Programming in Rust](https://rust-lang.github.io/async-book/): " +"covers the new asynchronous programming model which was introduced after the " +"Rust Book was written." +msgstr "" + +#: src/other-resources.md:30 +msgid "" +"[The Embedded Rust Book](https://doc.rust-lang.org/stable/embedded-book/): " +"an introduction to using Rust on embedded devices without an operating " +"system." msgstr "" #: src/other-resources.md:33 -msgid "## Unofficial Learning Material" +msgid "Unofficial Learning Material" msgstr "" #: src/other-resources.md:35 @@ -15909,95 +18486,106 @@ msgstr "" #: src/other-resources.md:37 msgid "" -"* [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" -" 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" -" such as C, C++, Java, JavaScript, and Python.\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" -" 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" -" [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" -"* [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" -" different types of list structures." +"[Learn Rust the Dangerous Way](http://cliffle.com/p/dangerust/): covers Rust " +"from the perspective of low-level C programmers." msgstr "" -#: src/other-resources.md:63 +#: src/other-resources.md:39 +msgid "" +"[Rust for Embedded C Programmers](https://docs.opentitan.org/doc/ug/" +"rust_for_c/): covers Rust from the perspective of developers who write " +"firmware in C." +msgstr "" + +#: src/other-resources.md:42 +msgid "" +"[Rust for professionals](https://overexact.com/rust-for-professionals/): " +"covers the syntax of Rust using side-by-side comparisons with other " +"languages such as C, C++, Java, JavaScript, and Python." +msgstr "" + +#: src/other-resources.md:45 +msgid "" +"[Rust on Exercism](https://exercism.org/tracks/rust): 100+ exercises to help " +"you learn Rust." +msgstr "" + +#: src/other-resources.md:47 +msgid "" +"[Ferrous Teaching Material](https://ferrous-systems.github.io/teaching-" +"material/index.html): a series of small presentations covering both basic " +"and advanced part of the Rust language. Other topics such as WebAssembly, " +"and async/await are also covered." +msgstr "" + +#: src/other-resources.md:52 +msgid "" +"[Beginner's Series to Rust](https://docs.microsoft.com/en-us/shows/beginners-" +"series-to-rust/) and [Take your first steps with Rust](https://docs." +"microsoft.com/en-us/learn/paths/rust-first-steps/): two Rust guides aimed at " +"new developers. The first is a set of 35 videos and the second is a set of " +"11 modules which covers Rust syntax and basic constructs." +msgstr "" + +#: src/other-resources.md:58 msgid "" -"Please see the [Little Book of Rust Books](https://lborb.github.io/book/) for\n" -"even more Rust books." +"[Learn Rust With Entirely Too Many Linked Lists](https://rust-unofficial." +"github.io/too-many-lists/): in-depth exploration of Rust's memory management " +"rules, through implementing a few different types of list structures." msgstr "" -#: src/credits.md:1 -msgid "# Credits" +#: src/other-resources.md:63 +msgid "" +"Please see the [Little Book of Rust Books](https://lborb.github.io/book/) " +"for even more Rust books." 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" -"resources." +"The material here builds on top of the many great sources of Rust " +"documentation. See the page on [other resources](other-resources.md) for a " +"full list of useful resources." msgstr "" #: src/credits.md:7 msgid "" -"The material of Comprehensive Rust is licensed under the terms of the Apache 2.0\n" -"license, please see\n" -"[`LICENSE`](https://github.com/google/comprehensive-rust/blob/main/LICENSE) for\n" -"details." +"The material of Comprehensive Rust is licensed under the terms of the Apache " +"2.0 license, please see [`LICENSE`](https://github.com/google/comprehensive-" +"rust/blob/main/LICENSE) for details." msgstr "" #: src/credits.md:12 -msgid "## Rust by Example" +msgid "Rust by Example" msgstr "" #: src/credits.md:14 msgid "" -"Some examples and exercises have been copied and adapted from [Rust by\n" -"Example](https://doc.rust-lang.org/rust-by-example/). Please see the\n" -"`third_party/rust-by-example/` directory for details, including the license\n" +"Some examples and exercises have been copied and adapted from [Rust by " +"Example](https://doc.rust-lang.org/rust-by-example/). Please see the " +"`third_party/rust-by-example/` directory for details, including the license " "terms." msgstr "" #: src/credits.md:19 -msgid "## Rust on Exercism" +msgid "Rust on Exercism" msgstr "" #: src/credits.md:21 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" -"terms." +"Some exercises have been copied and adapted from [Rust on Exercism](https://" +"exercism.org/tracks/rust). Please see the `third_party/rust-on-exercism/` " +"directory for details, including the license terms." msgstr "" #: src/credits.md:26 -msgid "## CXX" +msgid "CXX" msgstr "" #: src/credits.md:28 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" -"for details, including the license terms." -msgstr "" - -#: src/exercises/solutions.md:1 -msgid "# Solutions" +"The [Interoperability with C++](android/interoperability/cpp.md) section " +"uses an image from [CXX](https://cxx.rs/). Please see the `third_party/cxx/` " +"directory for details, including the license terms." msgstr "" #: src/exercises/solutions.md:3 @@ -16006,24 +18594,20 @@ 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" -"if you have a different or better solution than what is presented here." +"Feel free to ask questions about the solutions [on GitHub](https://github." +"com/google/comprehensive-rust/discussions). Let us know if you have a " +"different or better solution than what is presented here." msgstr "" #: src/exercises/solutions.md:10 msgid "" -"> **Note:** Please ignore the `// ANCHOR: label` and `// ANCHOR_END: label`\n" -"> comments you see in the solutions. They are there to make it possible to\n" -"> re-use parts of the solutions as the exercises." +"**Note:** Please ignore the `// ANCHOR: label` and `// ANCHOR_END: label` " +"comments you see in the solutions. They are there to make it possible to re-" +"use parts of the solutions as the exercises." msgstr "" #: src/exercises/day-1/solutions-morning.md:1 -msgid "# Day 1 Morning Exercises" -msgstr "" - -#: src/exercises/day-1/solutions-morning.md:3 -msgid "## Arrays and `for` Loops" +msgid "Day 1 Morning Exercises" msgstr "" #: src/exercises/day-1/solutions-morning.md:5 @@ -16106,26 +18690,28 @@ msgid "" msgstr "" #: src/exercises/day-1/solutions-morning.md:78 -msgid "### Bonus question" +msgid "Bonus question" 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 " +"Once we get to traits and generics, we'll be able to use the [`std::convert::" +"AsRef`](https://doc.rust-lang.org/std/convert/trait.AsRef.html) trait to " "abstract over anything that can be referenced as a slice." msgstr "" @@ -16161,16 +18747,16 @@ 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 -msgid "# Day 1 Afternoon Exercises" +msgid "Day 1 Afternoon Exercises" msgstr "" #: src/exercises/day-1/solutions-afternoon.md:3 -msgid "## Designing a Library" +msgid "Designing a Library" msgstr "" #: src/exercises/day-1/solutions-afternoon.md:5 @@ -16258,7 +18844,8 @@ 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" @@ -16296,12 +18883,15 @@ msgid "" "fn main() {\n" " let library = Library::new();\n" "\n" -" //println!(\"The library is empty: library.is_empty() -> {}\", library.is_empty());\n" +" //println!(\"The library is empty: 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() -> {}\", library.is_empty());\n" +" //println!(\"The library is no longer empty: library.is_empty() -> {}\", " +"library.is_empty());\n" " //\n" " //\n" " //library.print_books();\n" @@ -16323,7 +18913,8 @@ 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" @@ -16341,7 +18932,8 @@ 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" @@ -16358,7 +18950,8 @@ 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" @@ -16368,11 +18961,7 @@ msgid "" msgstr "" #: src/exercises/day-2/solutions-morning.md:1 -msgid "# Day 2 Morning Exercises" -msgstr "" - -#: src/exercises/day-2/solutions-morning.md:3 -msgid "## Points and Polygons" +msgid "Day 2 Morning Exercises" msgstr "" #: src/exercises/day-2/solutions-morning.md:5 @@ -16480,11 +19069,16 @@ msgid "" " }\n" " result += last_point.dist(self.points[0]);\n" " result\n" -" // Alternatively, Iterator::zip() lets us iterate over the points as pairs\n" -" // but we need to pair each point with the next one, and the last point\n" -" // with the first point. The zip() iterator is finished as soon as one of \n" -" // the source iterators is finished, a neat trick is to combine Iterator::cycle\n" -" // with Iterator::skip to create the second iterator for the zip and using map \n" +" // Alternatively, Iterator::zip() lets us iterate over the points as " +"pairs\n" +" // but we need to pair each point with the next one, and the last " +"point\n" +" // with the first point. The zip() iterator is finished as soon as " +"one of \n" +" // the source iterators is finished, a neat trick is to combine " +"Iterator::cycle\n" +" // with Iterator::skip to create the second iterator for the zip and " +"using map \n" " // and sum to calculate the total length.\n" " }\n" "}\n" @@ -16618,11 +19212,7 @@ msgid "" msgstr "" #: src/exercises/day-2/solutions-afternoon.md:1 -msgid "# Day 2 Afternoon Exercises" -msgstr "" - -#: src/exercises/day-2/solutions-afternoon.md:3 -msgid "## Luhn Algorithm" +msgid "Day 2 Afternoon Exercises" msgstr "" #: src/exercises/day-2/solutions-afternoon.md:5 @@ -16651,7 +19241,8 @@ 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" @@ -16722,10 +19313,6 @@ msgid "" "```" msgstr "" -#: src/exercises/day-2/solutions-afternoon.md:97 -msgid "## Strings and Iterators" -msgstr "" - #: src/exercises/day-2/solutions-afternoon.md:99 msgid "([back to exercise](strings-iterators.md))" msgstr "" @@ -16763,11 +19350,16 @@ msgid "" " }\n" " true\n" "\n" -" // Alternatively, Iterator::zip() lets us iterate simultaneously over prefix\n" -" // and request segments. The zip() iterator is finished as soon as one of\n" -" // the source iterators is finished, but we need to iterate over all request\n" -" // segments. A neat trick that makes zip() work is to use map() and chain()\n" -" // to produce an iterator that returns Some(str) for each pattern segments,\n" +" // Alternatively, Iterator::zip() lets us iterate simultaneously over " +"prefix\n" +" // and request segments. The zip() iterator is finished as soon as one " +"of\n" +" // the source iterators is finished, but we need to iterate over all " +"request\n" +" // segments. A neat trick that makes zip() work is to use map() and " +"chain()\n" +" // to produce an iterator that returns Some(str) for each pattern " +"segments,\n" " // and then returns None indefinitely.\n" "}\n" "\n" @@ -16775,12 +19367,15 @@ 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" @@ -16798,7 +19393,8 @@ 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" @@ -16811,11 +19407,7 @@ msgid "" msgstr "" #: src/exercises/day-3/solutions-morning.md:1 -msgid "# Day 3 Morning Exercise" -msgstr "" - -#: src/exercises/day-3/solutions-morning.md:3 -msgid "## A Simple GUI Library" +msgid "Day 3 Morning Exercise" msgstr "" #: src/exercises/day-3/solutions-morning.md:5 @@ -16982,7 +19574,8 @@ 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" @@ -16994,11 +19587,7 @@ msgid "" msgstr "" #: src/exercises/day-3/solutions-afternoon.md:1 -msgid "# Day 3 Afternoon Exercises" -msgstr "" - -#: src/exercises/day-3/solutions-afternoon.md:3 -msgid "## Safe FFI Wrapper" +msgid "Day 3 Afternoon Exercises" msgstr "" #: src/exercises/day-3/solutions-afternoon.md:5 @@ -17032,10 +19621,12 @@ 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 according to the Linux man page for readdir(3), where ino_t and\n" +" // Layout according to the Linux man page for readdir(3), where ino_t " +"and\n" " // off_t are resolved according to the definitions in\n" " // /usr/include/x86_64-linux-gnu/{sys/types.h, bits/typesizes.h}.\n" " #[cfg(not(target_os = \"macos\"))]\n" @@ -17066,11 +19657,14 @@ msgid "" " #[cfg(not(all(target_os = \"macos\", target_arch = \"x86_64\")))]\n" " pub fn readdir(s: *mut DIR) -> *const dirent;\n" "\n" -" // See https://github.com/rust-lang/libc/issues/414 and the section on\n" +" // See https://github.com/rust-lang/libc/issues/414 and the section " +"on\n" " // _DARWIN_FEATURE_64_BIT_INODE in the macOS man page for stat(2).\n" " //\n" -" // \"Platforms that existed before these updates were available\" refers\n" -" // to macOS (as opposed to iOS / wearOS / etc.) on Intel and PowerPC.\n" +" // \"Platforms that existed before these updates were available\" " +"refers\n" +" // to macOS (as opposed to iOS / wearOS / etc.) on Intel and " +"PowerPC.\n" " #[cfg(all(target_os = \"macos\", target_arch = \"x86_64\"))]\n" " #[link_name = \"readdir$INODE64\"]\n" " pub fn readdir(s: *mut DIR) -> *const dirent;\n" @@ -17095,7 +19689,8 @@ 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" @@ -17174,7 +19769,8 @@ 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" @@ -17182,7 +19778,8 @@ 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" @@ -17190,11 +19787,7 @@ msgid "" msgstr "" #: src/exercises/bare-metal/solutions-morning.md:1 -msgid "# Bare Metal Rust Morning Exercise" -msgstr "" - -#: src/exercises/bare-metal/solutions-morning.md:3 -msgid "## Compass" +msgid "Bare Metal Rust Morning Exercise" msgstr "" #: src/exercises/bare-metal/solutions-morning.md:5 @@ -17256,7 +19849,8 @@ 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" @@ -17296,8 +19890,10 @@ 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" @@ -17319,7 +19915,8 @@ 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" @@ -17347,7 +19944,8 @@ 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" @@ -17363,14 +19961,6 @@ msgid "" "```" msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md:1 -msgid "# Bare Metal Rust Afternoon" -msgstr "" - -#: src/exercises/bare-metal/solutions-afternoon.md:3 -msgid "## RTC driver" -msgstr "" - #: src/exercises/bare-metal/solutions-afternoon.md:5 msgid "([back to exercise](rtc.md))" msgstr "" @@ -17435,21 +20025,25 @@ 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" @@ -17577,13 +20171,16 @@ 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" @@ -17598,7 +20195,8 @@ 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" @@ -17606,12 +20204,14 @@ 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" @@ -17622,19 +20222,22 @@ 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" @@ -17652,11 +20255,7 @@ msgid "" msgstr "" #: src/exercises/concurrency/solutions-morning.md:1 -msgid "# Concurrency Morning Exercise" -msgstr "" - -#: src/exercises/concurrency/solutions-morning.md:3 -msgid "## Dining Philosophers" +msgid "Concurrency Morning Exercise" msgstr "" #: src/exercises/concurrency/solutions-morning.md:5 @@ -17764,7 +20363,7 @@ msgid "" msgstr "" #: src/exercises/concurrency/solutions-morning.md:104 -msgid "## Link Checker" +msgid "Link Checker" msgstr "" #: src/exercises/concurrency/solutions-morning.md:106 @@ -17811,7 +20410,8 @@ msgid "" " extract_links: bool,\n" "}\n" "\n" -"fn visit_page(client: &Client, command: &CrawlCommand) -> Result, Error> {\n" +"fn visit_page(client: &Client, command: &CrawlCommand) -> Result, " +"Error> {\n" " println!(\"Checking {:#}\", command.url);\n" " let response = client.get(command.url.clone()).send()?;\n" " if !response.status().is_success() {\n" @@ -17837,7 +20437,8 @@ msgid "" " link_urls.push(link_url);\n" " }\n" " Err(err) => {\n" -" println!(\"On {base_url:#}: ignored unparsable {href:?}: {err}\");\n" +" println!(\"On {base_url:#}: ignored unparsable {href:?}: " +"{err}\");\n" " }\n" " }\n" " }\n" @@ -17897,7 +20498,8 @@ msgid "" " // The sender got dropped. No more commands coming in.\n" " break;\n" " };\n" -" let crawl_result = match visit_page(&client, &crawl_command) {\n" +" let crawl_result = match visit_page(&client, &crawl_command) " +"{\n" " Ok(link_urls) => Ok(link_urls),\n" " Err(error) => Err((crawl_command.url, error)),\n" " };\n" @@ -17913,7 +20515,8 @@ msgid "" " result_receiver: mpsc::Receiver,\n" ") -> Vec {\n" " let mut crawl_state = CrawlState::new(&start_url);\n" -" let start_command = CrawlCommand { url: start_url, extract_links: true };\n" +" let start_command = CrawlCommand { url: start_url, extract_links: " +"true };\n" " command_sender.send(start_command).unwrap();\n" " let mut pending_urls = 1;\n" "\n" @@ -17926,8 +20529,10 @@ msgid "" " Ok(link_urls) => {\n" " for url in link_urls {\n" " if crawl_state.mark_visited(&url) {\n" -" let extract_links = crawl_state.should_extract_links(&url);\n" -" let crawl_command = CrawlCommand { url, extract_links };\n" +" let extract_links = crawl_state." +"should_extract_links(&url);\n" +" let crawl_command = CrawlCommand { url, " +"extract_links };\n" " command_sender.send(crawl_command).unwrap();\n" " pending_urls += 1;\n" " }\n" @@ -17945,13 +20550,15 @@ msgid "" "\n" "fn check_links(start_url: Url) -> Vec {\n" " let (result_sender, result_receiver) = mpsc::channel::();\n" -" let (command_sender, command_receiver) = mpsc::channel::();\n" +" let (command_sender, command_receiver) = mpsc::channel::" +"();\n" " spawn_crawler_threads(command_receiver, result_sender, 16);\n" " control_crawl(start_url, command_sender, result_receiver)\n" "}\n" "\n" "fn main() {\n" -" let start_url = reqwest::Url::parse(\"https://www.google.org\").unwrap();\n" +" let start_url = reqwest::Url::parse(\"https://www.google.org\")." +"unwrap();\n" " let bad_urls = check_links(start_url);\n" " println!(\"Bad URLs: {:#?}\", bad_urls);\n" "}\n" @@ -17959,11 +20566,7 @@ msgid "" msgstr "" #: src/exercises/concurrency/solutions-afternoon.md:1 -msgid "# Concurrency Afternoon Exercise" -msgstr "" - -#: src/exercises/concurrency/solutions-afternoon.md:3 -msgid "## Dining Philosophers - Async" +msgid "Concurrency Afternoon Exercise" msgstr "" #: src/exercises/concurrency/solutions-afternoon.md:5 @@ -18007,7 +20610,8 @@ 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" @@ -18017,7 +20621,8 @@ 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" @@ -18040,7 +20645,8 @@ 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" @@ -18048,7 +20654,8 @@ msgid "" " let (tx, rx) = mpsc::channel(10);\n" " for (i, name) in PHILOSOPHERS.iter().enumerate() {\n" " let left_fork = Arc::clone(&forks[i]);\n" -" let right_fork = Arc::clone(&forks[(i + 1) % PHILOSOPHERS.len()]);\n" +" let right_fork = Arc::clone(&forks[(i + 1) % PHILOSOPHERS." +"len()]);\n" " // To avoid a deadlock, we have to break the symmetry\n" " // somewhere. This will swap the forks without deinitializing\n" " // either of them.\n" @@ -18085,10 +20692,6 @@ msgid "" "```" msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md:119 -msgid "## Broadcast Chat Application" -msgstr "" - #: src/exercises/concurrency/solutions-afternoon.md:121 msgid "([back to exercise](chat-app.md))" msgstr "" @@ -18132,7 +20735,8 @@ 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" @@ -18204,7 +20808,8 @@ 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" @@ -18217,7 +20822,8 @@ 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" @@ -18225,7 +20831,8 @@ msgid "" " res = stdin.next_line() => {\n" " match res {\n" " Ok(None) => return Ok(()),\n" -" Ok(Some(line)) => ws_stream.send(Message::text(line.to_string())).await?,\n" +" Ok(Some(line)) => ws_stream.send(Message::text(line." +"to_string())).await?,\n" " Err(err) => return Err(err.into()),\n" " }\n" " }\n"