From bb8bf82f845e5afd8bf54418f0f07436699584b4 Mon Sep 17 00:00:00 2001 From: Martin Geisler Date: Thu, 4 Sep 2025 22:12:29 +0200 Subject: [PATCH] da: refresh translation translate first 500 entries Inspired by #2809, I asked Gemini to translate the first 500 entries. I think it did a pretty good job, though I had to fix a few things. --- po/da.po | 21032 ++++++++++++++++++++++++++++++----------------------- 1 file changed, 11753 insertions(+), 9279 deletions(-) diff --git a/po/da.po b/po/da.po index b48f6ae3c7bb..de8ba5f1e282 100644 --- a/po/da.po +++ b/po/da.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Comprehensive Rust 🦀\n" -"POT-Creation-Date: 2024-01-24T13:24:49+01:00\n" +"POT-Creation-Date: 2025-09-06T21:23:01+02:00\n" "PO-Revision-Date: \n" "Last-Translator: \n" "Language-Team: \n" @@ -45,280 +45,383 @@ msgstr "Kodeeksempler" #: src/SUMMARY.md msgid "Running Cargo Locally" -msgstr "" +msgstr "Kør Cargo lokalt" #: src/SUMMARY.md msgid "Day 1: Morning" msgstr "Dag 1: Formiddag" -#: src/SUMMARY.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-1.md src/welcome-day-2.md src/welcome-day-3.md +#: src/welcome-day-4.md src/concurrency/welcome-async.md msgid "Welcome" msgstr "Velkommen" -#: src/SUMMARY.md src/hello-world.md src/hello-world/hello-world.md -#, fuzzy +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-1.md src/hello-world.md src/types-and-values.md +#: src/types-and-values/hello-world.md msgid "Hello, World" -msgstr "Hej verden!" +msgstr "Hej verden" -#: src/SUMMARY.md src/hello-world/what-is-rust.md +#: src/SUMMARY.md src/hello-world.md src/hello-world/what-is-rust.md msgid "What is Rust?" msgstr "Hvad er Rust?" -#: src/SUMMARY.md src/hello-world/benefits.md +#: src/SUMMARY.md src/hello-world.md src/hello-world/benefits.md msgid "Benefits of Rust" -msgstr "" +msgstr "Fordele ved Rust" -#: src/SUMMARY.md src/hello-world/playground.md +#: src/SUMMARY.md src/hello-world.md src/hello-world/playground.md msgid "Playground" -msgstr "" +msgstr "Legeplads" -#: src/SUMMARY.md src/types-and-values.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-1.md src/types-and-values.md msgid "Types and Values" -msgstr "" +msgstr "Typer og værdier" -#: src/SUMMARY.md src/types-and-values/variables.md +#: src/SUMMARY.md src/types-and-values.md src/types-and-values/variables.md msgid "Variables" msgstr "Variabler" -#: src/SUMMARY.md src/types-and-values/values.md +#: src/SUMMARY.md src/types-and-values.md src/types-and-values/values.md msgid "Values" -msgstr "" +msgstr "Værdier" -#: src/SUMMARY.md src/types-and-values/arithmetic.md +#: src/SUMMARY.md src/types-and-values.md src/types-and-values/arithmetic.md msgid "Arithmetic" -msgstr "" +msgstr "Aritmetik" -#: src/SUMMARY.md src/types-and-values/strings.md -msgid "Strings" -msgstr "" - -#: src/SUMMARY.md src/types-and-values/inference.md +#: src/SUMMARY.md src/types-and-values.md src/types-and-values/inference.md msgid "Type Inference" msgstr "Typeudledning" -#: src/SUMMARY.md src/types-and-values/exercise.md +#: src/SUMMARY.md src/types-and-values.md src/types-and-values/exercise.md msgid "Exercise: Fibonacci" -msgstr "" +msgstr "Øvelse: Fibonacci" #: src/SUMMARY.md src/types-and-values/solution.md #: src/control-flow-basics/solution.md src/tuples-and-arrays/solution.md #: src/references/solution.md src/user-defined-types/solution.md #: src/pattern-matching/solution.md src/methods-and-traits/solution.md -#: src/generics/solution.md src/std-types/solution.md +#: src/generics/solution.md src/closures/solution.md src/std-types/solution.md #: src/std-traits/solution.md src/memory-management/solution.md #: src/smart-pointers/solution.md src/borrowing/solution.md -#: src/slices-and-lifetimes/solution.md src/iterators/solution.md -#: src/modules/solution.md src/testing/solution.md -#: src/error-handling/solution.md src/unsafe-rust/solution.md -#, fuzzy +#: src/lifetimes/solution.md src/iterators/solution.md src/modules/solution.md +#: src/testing/solution.md src/error-handling/solution.md +#: src/unsafe-rust/solution.md msgid "Solution" -msgstr "Løsninger" +msgstr "Løsning" -#: src/SUMMARY.md src/control-flow-basics.md -#, fuzzy +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-1.md src/control-flow-basics.md msgid "Control Flow Basics" -msgstr "Forgreninger" +msgstr "Kontrolflow" -#: src/SUMMARY.md src/control-flow-basics/conditionals.md -msgid "Conditionals" -msgstr "" +#: src/SUMMARY.md src/control-flow-basics.md +#: src/control-flow-basics/blocks-and-scopes.md +msgid "Blocks and Scopes" +msgstr "Blokke og virkefelter" -#: src/SUMMARY.md src/control-flow-basics/loops.md -#, fuzzy +#: src/SUMMARY.md +msgid "`if` Expressions" +msgstr "`if`-udtryk" + +#: src/SUMMARY.md src/control-flow-basics/match.md +msgid "`match` Expressions" +msgstr "`match`-udtryk" + +#: src/SUMMARY.md src/control-flow-basics.md src/control-flow-basics/loops.md msgid "Loops" -msgstr "`for`\\-løkker" +msgstr "Løkker" + +#: src/SUMMARY.md src/control-flow-basics/loops/for.md +msgid "`for`" +msgstr "`for`" + +#: src/SUMMARY.md src/control-flow-basics/loops/loop.md +msgid "`loop`" +msgstr "`loop`" #: src/SUMMARY.md src/control-flow-basics/break-continue.md msgid "`break` and `continue`" -msgstr "" +msgstr "`break` og `continue`" -#: src/SUMMARY.md src/control-flow-basics/blocks-and-scopes.md -msgid "Blocks and Scopes" -msgstr "" +#: src/SUMMARY.md src/control-flow-basics/break-continue/labels.md +msgid "Labels" +msgstr "Etiketter" -#: src/SUMMARY.md src/control-flow-basics/functions.md +#: src/SUMMARY.md src/control-flow-basics.md +#: src/control-flow-basics/functions.md msgid "Functions" msgstr "Funktioner" -#: src/SUMMARY.md src/control-flow-basics/macros.md +#: src/SUMMARY.md src/control-flow-basics.md src/control-flow-basics/macros.md msgid "Macros" -msgstr "" +msgstr "Makroer" -#: src/SUMMARY.md src/control-flow-basics/exercise.md +#: src/SUMMARY.md src/control-flow-basics.md +#: src/control-flow-basics/exercise.md msgid "Exercise: Collatz Sequence" -msgstr "" +msgstr "Øvelse: Collatz-sekvens" #: src/SUMMARY.md msgid "Day 1: Afternoon" msgstr "Dag 1: Eftermiddag" -#: src/SUMMARY.md src/tuples-and-arrays.md -#: src/tuples-and-arrays/tuples-and-arrays.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-1-afternoon.md src/tuples-and-arrays.md msgid "Tuples and Arrays" -msgstr "" +msgstr "Tupler og arrays" -#: src/SUMMARY.md src/tuples-and-arrays/iteration.md -msgid "Array Iteration" -msgstr "" +#: src/SUMMARY.md src/tuples-and-arrays.md src/tuples-and-arrays/arrays.md +msgid "Arrays" +msgstr "Arrays" -#: src/SUMMARY.md src/tuples-and-arrays/match.md src/pattern-matching.md -msgid "Pattern Matching" -msgstr "Mønstergenkendelse" +#: src/SUMMARY.md src/tuples-and-arrays.md src/tuples-and-arrays/tuples.md +msgid "Tuples" +msgstr "Tupler" -#: src/SUMMARY.md src/tuples-and-arrays/destructuring.md -#: src/pattern-matching/destructuring.md -#, fuzzy -msgid "Destructuring" -msgstr "Dekonstruktion af enumerationer" +#: src/SUMMARY.md src/tuples-and-arrays.md src/tuples-and-arrays/iteration.md +msgid "Array Iteration" +msgstr "Array-iteration" + +#: src/SUMMARY.md src/tuples-and-arrays.md +#: src/tuples-and-arrays/destructuring.md +msgid "Patterns and Destructuring" +msgstr "Mønstre og dekonstruktion" -#: src/SUMMARY.md src/tuples-and-arrays/exercise.md +#: src/SUMMARY.md src/tuples-and-arrays.md src/tuples-and-arrays/exercise.md msgid "Exercise: Nested Arrays" -msgstr "" +msgstr "Øvelse: Indlejrede arrays" -#: src/SUMMARY.md src/references.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-1-afternoon.md src/references.md msgid "References" msgstr "Referencer" -#: src/SUMMARY.md src/references/shared.md -#, fuzzy +#: src/SUMMARY.md src/references.md src/references/shared.md msgid "Shared References" -msgstr "Referencer" +msgstr "Delte referencer" -#: src/SUMMARY.md src/references/exclusive.md -#, fuzzy +#: src/SUMMARY.md src/references.md src/references/exclusive.md msgid "Exclusive References" -msgstr "Hængende referencer" +msgstr "Eksklusive referencer" + +#: src/SUMMARY.md src/references.md src/references/slices.md +msgid "Slices" +msgstr "Slices" + +#: src/SUMMARY.md src/references.md src/references/strings.md +msgid "Strings" +msgstr "Strenge" + +#: src/SUMMARY.md src/references.md src/references/dangling.md +msgid "Reference Validity" +msgstr "Referencegyldighed" -#: src/SUMMARY.md src/references/exercise.md +#: src/SUMMARY.md src/references.md src/references/exercise.md msgid "Exercise: Geometry" -msgstr "" +msgstr "Øvelse: Geometri" -#: src/SUMMARY.md src/user-defined-types.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-1-afternoon.md src/user-defined-types.md msgid "User-Defined Types" -msgstr "" +msgstr "Brugerdefinerede typer" -#: src/SUMMARY.md src/user-defined-types/named-structs.md -#, fuzzy +#: src/SUMMARY.md src/user-defined-types.md +#: src/user-defined-types/named-structs.md msgid "Named Structs" -msgstr "Strukturer" +msgstr "Navngivne structs" -#: src/SUMMARY.md src/user-defined-types/tuple-structs.md +#: src/SUMMARY.md src/user-defined-types.md +#: src/user-defined-types/tuple-structs.md msgid "Tuple Structs" -msgstr "Tuple-strukturer" +msgstr "Tuple-structs" -#: src/SUMMARY.md src/user-defined-types/enums.md -#: src/pattern-matching/destructuring.md +#: src/SUMMARY.md src/user-defined-types.md src/user-defined-types/enums.md +#: src/pattern-matching/destructuring-enums.md msgid "Enums" -msgstr "Enumerationer" - -#: src/SUMMARY.md src/user-defined-types/static-and-const.md -#, fuzzy -msgid "Static and Const" -msgstr "static & const" +msgstr "Enums" -#: src/SUMMARY.md src/user-defined-types/aliases.md +#: src/SUMMARY.md src/user-defined-types.md src/user-defined-types/aliases.md msgid "Type Aliases" -msgstr "" +msgstr "Typealiasser" + +#: src/SUMMARY.md src/user-defined-types.md +msgid "Const" +msgstr "Konstant" + +#: src/SUMMARY.md src/user-defined-types.md +msgid "Static" +msgstr "Statisk" -#: src/SUMMARY.md src/user-defined-types/exercise.md +#: src/SUMMARY.md src/user-defined-types.md src/user-defined-types/exercise.md msgid "Exercise: Elevator Events" -msgstr "" +msgstr "Øvelse: Elevator-hændelser" #: src/SUMMARY.md msgid "Day 2: Morning" msgstr "Dag 2: Formiddag" -#: src/SUMMARY.md src/pattern-matching/let-control-flow.md -#, fuzzy +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-2.md src/pattern-matching.md +msgid "Pattern Matching" +msgstr "Mønstergenkendelse" + +#: src/SUMMARY.md src/pattern-matching.md src/pattern-matching/infallible.md +msgid "Irrefutable Patterns" +msgstr "Uigendrivelige mønstre" + +#: src/SUMMARY.md src/pattern-matching.md src/pattern-matching/match.md +msgid "Matching Values" +msgstr "Matching af værdier" + +#: src/SUMMARY.md src/pattern-matching.md +msgid "Destructuring Structs" +msgstr "Dekonstruktion af structs" + +#: src/SUMMARY.md src/pattern-matching.md +msgid "Destructuring Enums" +msgstr "Dekonstruktion af enums" + +#: src/SUMMARY.md src/pattern-matching.md +#: src/pattern-matching/let-control-flow.md msgid "Let Control Flow" -msgstr "Forgreninger" +msgstr "Let-kontrolflow" + +#: src/SUMMARY.md src/pattern-matching/let-control-flow/if-let.md +msgid "`if let` Expressions" +msgstr "`if let`-udtryk" + +#: src/SUMMARY.md src/pattern-matching/let-control-flow/while-let.md +msgid "`while let` Statements" +msgstr "`while let`-sætninger" + +#: src/SUMMARY.md +msgid "`let else`" +msgstr "`let else`" -#: src/SUMMARY.md src/pattern-matching/exercise.md +#: src/SUMMARY.md src/pattern-matching.md src/pattern-matching/exercise.md msgid "Exercise: Expression Evaluation" -msgstr "" +msgstr "Øvelse: Udtryksevaluering" -#: src/SUMMARY.md src/methods-and-traits.md -#, fuzzy +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-2.md src/methods-and-traits.md msgid "Methods and Traits" -msgstr "Asynkrone egenskaber (eng. Traits)" +msgstr "Metoder og traits" -#: src/SUMMARY.md src/methods-and-traits/methods.md +#: src/SUMMARY.md src/methods-and-traits.md src/methods-and-traits/methods.md msgid "Methods" msgstr "Metoder" -#: src/SUMMARY.md src/methods-and-traits/traits.md +#: src/SUMMARY.md src/methods-and-traits.md src/methods-and-traits/traits.md msgid "Traits" -msgstr "" +msgstr "Traits" -#: src/SUMMARY.md src/methods-and-traits/deriving.md -msgid "Deriving" -msgstr "" +#: src/SUMMARY.md src/methods-and-traits/traits/implementing.md +msgid "Implementing Traits" +msgstr "Implementering af traits" -#: src/SUMMARY.md src/methods-and-traits/trait-objects.md -msgid "Trait Objects" -msgstr "" +#: src/SUMMARY.md src/methods-and-traits/traits/supertraits.md +msgid "Supertraits" +msgstr "Supertraits" -#: src/SUMMARY.md src/methods-and-traits/exercise.md -#, fuzzy +#: src/SUMMARY.md src/methods-and-traits/traits/associated-types.md +msgid "Associated Types" +msgstr "Associerede typer" + +#: src/SUMMARY.md src/methods-and-traits.md src/methods-and-traits/deriving.md +msgid "Deriving" +msgstr "Afledning" + +#: src/SUMMARY.md src/methods-and-traits.md msgid "Exercise: Generic Logger" -msgstr "Øvelser" +msgstr "Øvelse: Generisk logger" -#: src/SUMMARY.md src/generics.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-2.md src/generics.md msgid "Generics" -msgstr "" +msgstr "Generics" -#: src/SUMMARY.md src/generics/generic-functions.md -#, fuzzy +#: src/SUMMARY.md src/generics.md src/generics/generic-functions.md msgid "Generic Functions" -msgstr "Funktioner" +msgstr "Generiske funktioner" + +#: src/SUMMARY.md src/generics.md src/generics/trait-bounds.md +msgid "Trait Bounds" +msgstr "Trait-grænser" -#: src/SUMMARY.md src/generics/generic-data.md +#: src/SUMMARY.md src/generics.md src/generics/generic-data.md msgid "Generic Data Types" -msgstr "" +msgstr "Generiske datatyper" -#: src/SUMMARY.md src/generics/trait-bounds.md -msgid "Trait Bounds" -msgstr "" +#: src/SUMMARY.md src/generics/generic-traits.md +msgid "Generic Traits" +msgstr "Generiske traits" #: src/SUMMARY.md src/generics/impl-trait.md msgid "`impl Trait`" msgstr "`impl Trait`" +#: src/SUMMARY.md src/generics/dyn-trait.md +msgid "`dyn Trait`" +msgstr "`dyn Trait`" + #: src/SUMMARY.md src/generics/exercise.md msgid "Exercise: Generic `min`" -msgstr "" +msgstr "Øvelse: Generisk `min`" #: src/SUMMARY.md msgid "Day 2: Afternoon" msgstr "Dag 2: Eftermiddag" -#: src/SUMMARY.md src/std-types.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-2-afternoon.md src/closures.md +msgid "Closures" +msgstr "Closures" + +#: src/SUMMARY.md src/closures.md src/closures/syntax.md +msgid "Closure Syntax" +msgstr "Closure-syntaks" + +#: src/SUMMARY.md src/closures.md src/closures/capturing.md +msgid "Capturing" +msgstr "Indfangning" + +#: src/SUMMARY.md src/closures.md +msgid "Closure Traits" +msgstr "Closure-traits" + +#: src/SUMMARY.md src/closures.md src/closures/exercise.md +msgid "Exercise: Log Filter" +msgstr "Øvelse: Logfilter" + +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-2-afternoon.md src/std-types.md msgid "Standard Library Types" -msgstr "" +msgstr "Standardbibliotekstyper" -#: src/SUMMARY.md src/std-types/std.md +#: src/SUMMARY.md src/std-types.md src/std-types/std.md msgid "Standard Library" -msgstr "" +msgstr "Standardbibliotek" -#: src/SUMMARY.md src/std-types/docs.md -#, fuzzy +#: src/SUMMARY.md src/std-types.md src/std-types/docs.md msgid "Documentation" -msgstr "Officiel dokumentation" +msgstr "Dokumentation" #: src/SUMMARY.md -#, fuzzy msgid "`Option`" -msgstr "Undtagelser" +msgstr "`Option`" -#: src/SUMMARY.md -#, fuzzy +#: src/SUMMARY.md src/error-handling/result.md msgid "`Result`" -msgstr "`Option`, `Result`" +msgstr "`Result`" -#: src/SUMMARY.md src/android/interoperability/cpp/type-mapping.md -#, fuzzy +#: src/SUMMARY.md src/android/aidl/types/primitives.md +#: src/android/interoperability/cpp/type-mapping.md msgid "`String`" -msgstr "`Path`, `OsString`" +msgstr "`String`" #: src/SUMMARY.md src/std-types/vec.md msgid "`Vec`" @@ -328,31 +431,31 @@ msgstr "`Vec`" msgid "`HashMap`" msgstr "`HashMap`" -#: src/SUMMARY.md src/std-types/exercise.md -#, fuzzy +#: src/SUMMARY.md src/std-types.md src/std-types/exercise.md msgid "Exercise: Counter" -msgstr "Øvelser" +msgstr "Øvelse: Tæller" -#: src/SUMMARY.md src/std-traits.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-2-afternoon.md src/std-traits.md msgid "Standard Library Traits" -msgstr "" +msgstr "Standardbiblioteks-traits" -#: src/SUMMARY.md src/std-traits/comparisons.md src/async.md +#: src/SUMMARY.md src/std-traits.md src/std-traits/comparisons.md +#: src/concurrency/welcome-async.md msgid "Comparisons" msgstr "Sammenligninger" -#: src/SUMMARY.md src/std-traits/operators.md -#, fuzzy +#: src/SUMMARY.md src/std-traits.md src/std-traits/operators.md msgid "Operators" -msgstr "Iteratorer" +msgstr "Operatorer" #: src/SUMMARY.md src/std-traits/from-and-into.md msgid "`From` and `Into`" msgstr "`From` og `Into`" -#: src/SUMMARY.md src/std-traits/casting.md +#: src/SUMMARY.md src/std-traits.md src/std-traits/casting.md msgid "Casting" -msgstr "" +msgstr "Casting" #: src/SUMMARY.md src/std-traits/read-and-write.md msgid "`Read` and `Write`" @@ -360,556 +463,611 @@ msgstr "`Read` og `Write`" #: src/SUMMARY.md msgid "`Default`, struct update syntax" -msgstr "" - -#: src/SUMMARY.md src/std-traits/closures.md -msgid "Closures" -msgstr "" +msgstr "`Default`, struct-opdateringssyntaks" -#: src/SUMMARY.md src/std-traits/exercise.md -#, fuzzy +#: src/SUMMARY.md src/std-traits.md src/std-traits/exercise.md msgid "Exercise: ROT13" -msgstr "Øvelser" +msgstr "Øvelse: ROT13" #: src/SUMMARY.md msgid "Day 3: Morning" -msgstr "" +msgstr "Dag 3: Formiddag" -#: src/SUMMARY.md src/memory-management.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-3.md src/memory-management.md msgid "Memory Management" -msgstr "Håndtering af hukommelse" +msgstr "Hukommelseshåndtering" -#: src/SUMMARY.md src/memory-management/review.md +#: src/SUMMARY.md src/memory-management.md src/memory-management/review.md msgid "Review of Program Memory" -msgstr "" +msgstr "Gennemgang af programhukommelse" -#: src/SUMMARY.md src/memory-management/approaches.md -#, fuzzy +#: src/SUMMARY.md src/memory-management.md src/memory-management/approaches.md msgid "Approaches to Memory Management" -msgstr "Hukommelseshåndtering i Rust" +msgstr "Tilgange til hukommelseshåndtering" -#: src/SUMMARY.md src/memory-management/ownership.md +#: src/SUMMARY.md src/memory-management.md src/memory-management/ownership.md msgid "Ownership" msgstr "Ejerskab" -#: src/SUMMARY.md src/memory-management/move.md +#: src/SUMMARY.md src/memory-management.md src/memory-management/move.md msgid "Move Semantics" -msgstr "Overførselssemantik" +msgstr "Flyttesemantik" #: src/SUMMARY.md msgid "`Clone`" -msgstr "" +msgstr "`Clone`" -#: src/SUMMARY.md src/memory-management/copy-types.md -#, fuzzy +#: src/SUMMARY.md src/memory-management.md src/memory-management/copy-types.md msgid "Copy Types" -msgstr "Sammensatte typer" +msgstr "Kopityper" #: src/SUMMARY.md msgid "`Drop`" -msgstr "" +msgstr "`Drop`" -#: src/SUMMARY.md src/memory-management/exercise.md +#: src/SUMMARY.md src/memory-management.md src/memory-management/exercise.md msgid "Exercise: Builder Type" -msgstr "" +msgstr "Øvelse: Builder-type" -#: src/SUMMARY.md src/smart-pointers.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-3.md src/smart-pointers.md msgid "Smart Pointers" -msgstr "" +msgstr "Smarte Pointers" #: src/SUMMARY.md src/smart-pointers/box.md #: src/android/interoperability/cpp/type-mapping.md -#, fuzzy msgid "`Box`" -msgstr "`Box`" +msgstr "`Box`" #: src/SUMMARY.md src/smart-pointers/rc.md msgid "`Rc`" msgstr "`Rc`" -#: src/SUMMARY.md src/smart-pointers/exercise.md +#: src/SUMMARY.md src/smart-pointers.md src/smart-pointers/trait-objects.md +msgid "Owned Trait Objects" +msgstr "Ejede Trait-objekter" + +#: src/SUMMARY.md src/smart-pointers.md src/smart-pointers/exercise.md msgid "Exercise: Binary Tree" -msgstr "" +msgstr "Øvelse: Binært træ" #: src/SUMMARY.md msgid "Day 3: Afternoon" -msgstr "" +msgstr "Dag 3: Eftermiddag" -#: src/SUMMARY.md src/borrowing.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-3-afternoon.md src/borrowing.md msgid "Borrowing" -msgstr "Lån af variabler" +msgstr "Lån" -#: src/SUMMARY.md src/borrowing/shared.md -#, fuzzy +#: src/SUMMARY.md src/borrowing.md src/borrowing/shared.md msgid "Borrowing a Value" -msgstr "Lån af variabler" +msgstr "Lån af en værdi" -#: src/SUMMARY.md src/borrowing/borrowck.md -#, fuzzy +#: src/SUMMARY.md src/borrowing.md src/borrowing/borrowck.md msgid "Borrow Checking" -msgstr "Lån af variabler" +msgstr "Lånekontrol" + +#: src/SUMMARY.md src/borrowing.md src/borrowing/examples.md +msgid "Borrow Errors" +msgstr "Lånefejl" -#: src/SUMMARY.md src/borrowing/interior-mutability.md +#: src/SUMMARY.md src/borrowing.md src/borrowing/interior-mutability.md msgid "Interior Mutability" -msgstr "" +msgstr "Indre mutabilitet" -#: src/SUMMARY.md src/borrowing/exercise.md -#, fuzzy -msgid "Exercise: Health Statistics" -msgstr "([tilbage til øvelsen](health-statistics.md))" +#: src/SUMMARY.md src/borrowing/interior-mutability/cell.md +msgid "`Cell`" +msgstr "`Cell`" -#: src/SUMMARY.md src/slices-and-lifetimes.md -#, fuzzy -msgid "Slices and Lifetimes" -msgstr "Livstider" +#: src/SUMMARY.md src/borrowing/interior-mutability/refcell.md +msgid "`RefCell`" +msgstr "`RefCell`" -#: src/SUMMARY.md -#, fuzzy -msgid "Slices: `&[T]`" -msgstr "Arraysegmenter" +#: src/SUMMARY.md src/borrowing.md src/borrowing/exercise.md +msgid "Exercise: Health Statistics" +msgstr "Øvelse: Sundhedsstatistik" -#: src/SUMMARY.md src/slices-and-lifetimes/str.md -#, fuzzy -msgid "String References" -msgstr "Hængende referencer" +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-3-afternoon.md src/lifetimes.md +msgid "Lifetimes" +msgstr "Livstider" -#: src/SUMMARY.md src/slices-and-lifetimes/lifetime-annotations.md -#, fuzzy +#: src/SUMMARY.md src/lifetimes.md src/lifetimes/lifetime-annotations.md msgid "Lifetime Annotations" -msgstr "Livstider i funktionskald" +msgstr "Livstidsannotationer" -#: src/SUMMARY.md -#, fuzzy +#: src/SUMMARY.md src/lifetimes.md msgid "Lifetime Elision" -msgstr "Livstider" +msgstr "Livstidsudeladelse" -#: src/SUMMARY.md -#, fuzzy -msgid "Struct Lifetimes" -msgstr "Livstider" +#: src/SUMMARY.md src/lifetimes.md src/lifetimes/struct-lifetimes.md +msgid "Lifetimes in Data Structures" +msgstr "Livstider i datastrukturer" -#: src/SUMMARY.md src/slices-and-lifetimes/exercise.md +#: src/SUMMARY.md src/lifetimes.md src/lifetimes/exercise.md msgid "Exercise: Protobuf Parsing" -msgstr "" +msgstr "Øvelse: Protobuf-parsing" #: src/SUMMARY.md -#, fuzzy msgid "Day 4: Morning" -msgstr "Dag 1: Formiddag" +msgstr "Dag 4: Formiddag" -#: src/SUMMARY.md src/iterators.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-4.md src/iterators.md msgid "Iterators" msgstr "Iteratorer" -#: src/SUMMARY.md src/iterators/iterator.md src/bare-metal/no_std.md -msgid "`Iterator`" -msgstr "`Iterator`" +#: src/SUMMARY.md src/iterators.md +msgid "Motivation" +msgstr "Motivation" + +#: src/SUMMARY.md src/iterators/iterator.md +msgid "`Iterator` Trait" +msgstr "`Iterator`-trait" + +#: src/SUMMARY.md src/iterators/helpers.md +msgid "`Iterator` Helper Methods" +msgstr "`Iterator`-hjælpemetoder" + +#: src/SUMMARY.md src/iterators/collect.md +msgid "`collect`" +msgstr "`collect`" #: src/SUMMARY.md src/iterators/intoiterator.md msgid "`IntoIterator`" msgstr "`IntoIterator`" -#: src/SUMMARY.md -#, fuzzy -msgid "`FromIterator`" -msgstr "`Iterator`" - -#: src/SUMMARY.md src/iterators/exercise.md +#: src/SUMMARY.md src/iterators.md src/iterators/exercise.md msgid "Exercise: Iterator Method Chaining" -msgstr "" +msgstr "Øvelse: Iterator-metodekædning" -#: src/SUMMARY.md src/modules.md src/modules/modules.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-4.md src/modules.md src/modules/modules.md msgid "Modules" -msgstr "" +msgstr "Moduler" -#: src/SUMMARY.md src/modules/filesystem.md +#: src/SUMMARY.md src/modules.md src/modules/filesystem.md msgid "Filesystem Hierarchy" -msgstr "" +msgstr "Filsystemhierarki" -#: src/SUMMARY.md src/modules/visibility.md +#: src/SUMMARY.md src/modules.md src/modules/visibility.md msgid "Visibility" -msgstr "" +msgstr "Synlighed" + +#: src/SUMMARY.md src/modules.md +msgid "Encapsulation" +msgstr "Indkapsling" #: src/SUMMARY.md msgid "`use`, `super`, `self`" -msgstr "" +msgstr "`use`, `super`, `self`" -#: src/SUMMARY.md src/modules/exercise.md +#: src/SUMMARY.md src/modules.md src/modules/exercise.md msgid "Exercise: Modules for a GUI Library" -msgstr "" +msgstr "Øvelse: Moduler til et GUI-bibliotek" -#: src/SUMMARY.md src/testing.md src/chromium/testing.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-4.md src/testing.md src/chromium/testing.md msgid "Testing" -msgstr "" +msgstr "Test" -#: src/SUMMARY.md -msgid "Test Modules" -msgstr "" +#: src/SUMMARY.md src/testing.md src/testing/unit-tests.md +msgid "Unit Tests" +msgstr "Unittests" -#: src/SUMMARY.md src/testing/other.md -#, fuzzy +#: src/SUMMARY.md src/testing.md src/testing/other.md msgid "Other Types of Tests" -msgstr "Andre projekter" - -#: src/SUMMARY.md src/testing/useful-crates.md -msgid "Useful Crates" -msgstr "" - -#: src/SUMMARY.md src/testing/googletest.md -msgid "GoogleTest" -msgstr "" +msgstr "Andre typer tests" -#: src/SUMMARY.md src/testing/mocking.md -msgid "Mocking" -msgstr "" - -#: src/SUMMARY.md src/testing/lints.md +#: src/SUMMARY.md src/testing.md src/testing/lints.md msgid "Compiler Lints and Clippy" -msgstr "" +msgstr "Compiler-lints og Clippy" -#: src/SUMMARY.md src/testing/exercise.md -#, fuzzy +#: src/SUMMARY.md src/testing.md src/testing/exercise.md msgid "Exercise: Luhn Algorithm" -msgstr "Luhn-algorithmen" +msgstr "Øvelse: Luhn-algoritmen" #: src/SUMMARY.md -#, fuzzy msgid "Day 4: Afternoon" -msgstr "Dag 1: Eftermiddag" +msgstr "Dag 4: Eftermiddag" -#: src/SUMMARY.md src/error-handling.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-4-afternoon.md src/error-handling.md +#: src/idiomatic/welcome.md msgid "Error Handling" -msgstr "" +msgstr "Fejlhåndtering" -#: src/SUMMARY.md src/error-handling/panics.md +#: src/SUMMARY.md src/error-handling.md src/error-handling/panics.md msgid "Panics" -msgstr "" +msgstr "Panics" -#: src/SUMMARY.md src/error-handling/try.md +#: src/SUMMARY.md src/error-handling.md src/error-handling/try.md msgid "Try Operator" -msgstr "" +msgstr "Try-operator" -#: src/SUMMARY.md src/error-handling/try-conversions.md -#, fuzzy +#: src/SUMMARY.md src/error-handling.md src/error-handling/try-conversions.md msgid "Try Conversions" -msgstr "Implicitte konverteringer" +msgstr "Try-konverteringer" #: src/SUMMARY.md -#, fuzzy msgid "`Error` Trait" -msgstr "`Error`" +msgstr "`Error`-trait" -#: src/SUMMARY.md src/error-handling/thiserror-and-anyhow.md -#, fuzzy -msgid "`thiserror` and `anyhow`" -msgstr "`From` og `Into`" +#: src/SUMMARY.md src/error-handling/thiserror.md +msgid "`thiserror`" +msgstr "`thiserror`" + +#: src/SUMMARY.md src/error-handling/anyhow.md src/idiomatic/welcome.md +msgid "`anyhow`" +msgstr "`anyhow`" #: src/SUMMARY.md msgid "Exercise: Rewriting with `Result`" -msgstr "" +msgstr "Øvelse: Omskrivning med `Result`" -#: src/SUMMARY.md src/unsafe-rust.md src/unsafe-rust/unsafe.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/welcome-day-4-afternoon.md src/unsafe-rust.md src/unsafe-rust/unsafe.md msgid "Unsafe Rust" -msgstr "" +msgstr "Unsafe Rust" -#: src/SUMMARY.md +#: src/SUMMARY.md src/unsafe-rust.md msgid "Unsafe" -msgstr "" +msgstr "Unsafe" -#: src/SUMMARY.md src/unsafe-rust/dereferencing.md +#: src/SUMMARY.md src/unsafe-rust.md src/unsafe-rust/dereferencing.md msgid "Dereferencing Raw Pointers" -msgstr "" +msgstr "Dereferencing af rå pointers" -#: src/SUMMARY.md src/unsafe-rust/mutable-static.md +#: src/SUMMARY.md src/unsafe-rust.md src/unsafe-rust/mutable-static.md msgid "Mutable Static Variables" -msgstr "" +msgstr "Mutable statiske variabler" -#: src/SUMMARY.md src/unsafe-rust/unions.md +#: src/SUMMARY.md src/unsafe-rust.md src/unsafe-rust/unions.md msgid "Unions" -msgstr "" +msgstr "Unions" -#: src/SUMMARY.md src/unsafe-rust/unsafe-functions.md -#, fuzzy +#: src/SUMMARY.md src/unsafe-rust.md src/unsafe-rust/unsafe-functions.md msgid "Unsafe Functions" -msgstr "Funktioner" +msgstr "Unsafe funktioner" -#: src/SUMMARY.md -#, fuzzy +#: src/SUMMARY.md src/unsafe-rust/unsafe-functions/rust.md +msgid "Unsafe Rust Functions" +msgstr "Unsafe Rust-funktioner" + +#: src/SUMMARY.md src/unsafe-rust/unsafe-functions/extern-c.md +msgid "Unsafe External Functions" +msgstr "Unsafe eksterne funktioner" + +#: src/SUMMARY.md src/unsafe-rust/unsafe-functions/calling.md +msgid "Calling Unsafe Functions" +msgstr "Kald af unsafe funktioner" + +#: src/SUMMARY.md src/unsafe-rust.md msgid "Unsafe Traits" -msgstr "Asynkrone egenskaber (eng. Traits)" +msgstr "Unsafe traits" -#: src/SUMMARY.md +#: src/SUMMARY.md src/unsafe-rust.md msgid "Exercise: FFI Wrapper" -msgstr "" +msgstr "Øvelse: FFI-wrapper" -#: src/SUMMARY.md src/bare-metal/android.md +#: src/SUMMARY.md msgid "Android" msgstr "Android" -#: src/SUMMARY.md src/android/setup.md src/chromium/setup.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/android/setup.md src/chromium/setup.md msgid "Setup" -msgstr "" +msgstr "Opsætning" #: src/SUMMARY.md src/android/build-rules.md msgid "Build Rules" -msgstr "" +msgstr "Byggeregler" #: src/SUMMARY.md msgid "Binary" -msgstr "" +msgstr "Binær" #: src/SUMMARY.md msgid "Library" -msgstr "" +msgstr "Bibliotek" #: src/SUMMARY.md src/android/aidl.md msgid "AIDL" -msgstr "" +msgstr "AIDL" + +#: src/SUMMARY.md src/android/aidl/birthday-service.md +msgid "Birthday Service Tutorial" +msgstr "Fødselsdagsservice-tutorial" #: src/SUMMARY.md msgid "Interface" -msgstr "" +msgstr "Interface" #: src/SUMMARY.md -msgid "Implementation" -msgstr "" +msgid "Service API" +msgstr "Service-API" + +#: src/SUMMARY.md +msgid "Service" +msgstr "Service" #: src/SUMMARY.md msgid "Server" -msgstr "" +msgstr "Server" -#: src/SUMMARY.md src/android/aidl/deploy.md +#: src/SUMMARY.md src/android/aidl/example-service/deploy.md msgid "Deploy" -msgstr "" +msgstr "Deploy" #: src/SUMMARY.md msgid "Client" -msgstr "" +msgstr "Klient" -#: src/SUMMARY.md src/android/aidl/changing.md +#: src/SUMMARY.md src/android/aidl/example-service/changing-definition.md msgid "Changing API" -msgstr "" +msgstr "Ændring af API" + +#: src/SUMMARY.md +msgid "Updating Implementations" +msgstr "Opdatering af implementeringer" + +#: src/SUMMARY.md +msgid "AIDL Types" +msgstr "AIDL-typer" + +#: src/SUMMARY.md src/android/aidl/types/primitives.md +msgid "Primitive Types" +msgstr "Primitive typer" + +#: src/SUMMARY.md src/android/aidl/types/arrays.md +msgid "Array Types" +msgstr "Array-typer" + +#: src/SUMMARY.md src/android/aidl/types/objects.md +msgid "Sending Objects" +msgstr "Afsendelse af objekter" + +#: src/SUMMARY.md src/android/aidl/types/parcelables.md +msgid "Parcelables" +msgstr "Parcelables" + +#: src/SUMMARY.md src/android/aidl/types/file-descriptor.md +msgid "Sending Files" +msgstr "Afsendelse af filer" + +#: src/SUMMARY.md src/android/testing/googletest.md +msgid "GoogleTest" +msgstr "GoogleTest" + +#: src/SUMMARY.md src/android/testing/mocking.md +msgid "Mocking" +msgstr "Mocking" #: src/SUMMARY.md src/android/logging.md src/bare-metal/aps/logging.md msgid "Logging" -msgstr "" +msgstr "Logging" #: src/SUMMARY.md src/android/interoperability.md +#: src/unsafe-deep-dive/motivations.md +#: src/unsafe-deep-dive/motivations/interop.md msgid "Interoperability" -msgstr "" +msgstr "Interoperabilitet" #: src/SUMMARY.md msgid "With C" -msgstr "" +msgstr "Med C" + +#: src/SUMMARY.md src/android/interoperability/with-c/c-library.md +msgid "A Simple C Library" +msgstr "Et simpelt C-bibliotek" #: src/SUMMARY.md -msgid "Calling C with Bindgen" -msgstr "" +msgid "Bindgen" +msgstr "Bindgen" + +#: src/SUMMARY.md src/android/interoperability/with-c/run-our-binary.md +msgid "Running Our Binary" +msgstr "Kørsel af vores binære fil" + +#: src/SUMMARY.md src/android/interoperability/with-c/rust-library.md +msgid "A Simple Rust Library" +msgstr "Et simpelt Rust-bibliotek" #: src/SUMMARY.md msgid "Calling Rust from C" -msgstr "" +msgstr "Kald af Rust fra C" #: src/SUMMARY.md src/android/interoperability/cpp.md msgid "With C++" -msgstr "" +msgstr "Med C++" #: src/SUMMARY.md src/android/interoperability/cpp/bridge.md msgid "The Bridge Module" -msgstr "" +msgstr "Bro-modulet" #: src/SUMMARY.md -#, fuzzy msgid "Rust Bridge" -msgstr "Rust i Android" +msgstr "Rust-bro" #: src/SUMMARY.md src/android/interoperability/cpp/generated-cpp.md msgid "Generated C++" -msgstr "" +msgstr "Genereret C++" #: src/SUMMARY.md msgid "C++ Bridge" -msgstr "" +msgstr "C++-bro" #: src/SUMMARY.md src/android/interoperability/cpp/shared-types.md -#, fuzzy msgid "Shared Types" -msgstr "Skalartyper" +msgstr "Delte typer" #: src/SUMMARY.md src/android/interoperability/cpp/shared-enums.md msgid "Shared Enums" -msgstr "" +msgstr "Delte enums" #: src/SUMMARY.md src/android/interoperability/cpp/rust-result.md msgid "Rust Error Handling" -msgstr "" +msgstr "Rust-fejlhåndtering" #: src/SUMMARY.md src/android/interoperability/cpp/cpp-exception.md msgid "C++ Error Handling" -msgstr "" +msgstr "C++-fejlhåndtering" #: src/SUMMARY.md src/android/interoperability/cpp/type-mapping.md msgid "Additional Types" -msgstr "" +msgstr "Yderligere typer" #: src/SUMMARY.md -msgid "Building for Android: C++" -msgstr "" +msgid "Building for Android: Genrules" +msgstr "Bygning til Android: Genrules" #: src/SUMMARY.md -msgid "Building for Android: Genrules" -msgstr "" +msgid "Building for Android: C++" +msgstr "Bygning til Android: C++" #: src/SUMMARY.md msgid "Building for Android: Rust" -msgstr "" +msgstr "Bygning til Android: Rust" #: src/SUMMARY.md msgid "With Java" -msgstr "" - -#: src/SUMMARY.md src/exercises/android/morning.md -#: src/exercises/bare-metal/morning.md src/exercises/bare-metal/afternoon.md -#: src/exercises/concurrency/morning.md src/exercises/concurrency/afternoon.md -msgid "Exercises" -msgstr "Øvelser" +msgstr "Med Java" #: src/SUMMARY.md msgid "Chromium" -msgstr "" +msgstr "Chromium" #: src/SUMMARY.md src/chromium/cargo.md msgid "Comparing Chromium and Cargo Ecosystems" -msgstr "" +msgstr "Sammenligning af Chromium- og Cargo-økosystemer" #: src/SUMMARY.md msgid "Policy" -msgstr "" +msgstr "Politik" #: src/SUMMARY.md msgid "Unsafe Code" -msgstr "" +msgstr "Unsafe kode" #: src/SUMMARY.md src/chromium/build-rules/depending.md msgid "Depending on Rust Code from Chromium C++" -msgstr "" +msgstr "Afhængighed af Rust-kode fra Chromium C++" #: src/SUMMARY.md src/chromium/build-rules/vscode.md msgid "Visual Studio Code" -msgstr "" +msgstr "Visual Studio Code" -#: src/SUMMARY.md src/exercises/chromium/third-party.md -#, fuzzy +#: src/SUMMARY.md src/lifetimes/exercise.md +#: src/exercises/chromium/third-party.md msgid "Exercise" -msgstr "Øvelser" +msgstr "Øvelse" #: src/SUMMARY.md src/chromium/testing/rust-gtest-interop.md msgid "`rust_gtest_interop` Library" -msgstr "" +msgstr "`rust_gtest_interop`-bibliotek" #: src/SUMMARY.md src/chromium/testing/build-gn.md msgid "GN Rules for Rust Tests" -msgstr "" +msgstr "GN-regler for Rust-tests" #: src/SUMMARY.md src/chromium/testing/chromium-import-macro.md msgid "`chromium::import!` Macro" -msgstr "" +msgstr "`chromium::import!`-makro" #: src/SUMMARY.md src/chromium/interoperability-with-cpp.md msgid "Interoperability with C++" -msgstr "" +msgstr "Interoperabilitet med C++" #: src/SUMMARY.md src/chromium/interoperability-with-cpp/example-bindings.md -#, fuzzy msgid "Example Bindings" -msgstr "Eksempler" +msgstr "Eksempel-bindinger" #: src/SUMMARY.md src/chromium/interoperability-with-cpp/limitations-of-cxx.md msgid "Limitations of CXX" -msgstr "" +msgstr "Begrænsninger i CXX" #: src/SUMMARY.md src/chromium/interoperability-with-cpp/error-handling.md msgid "CXX Error Handling" -msgstr "" +msgstr "CXX-fejlhåndtering" #: src/SUMMARY.md msgid "Error Handling: QR Example" -msgstr "" +msgstr "Fejlhåndtering: QR-eksempel" #: src/SUMMARY.md msgid "Error Handling: PNG Example" -msgstr "" +msgstr "Fejlhåndtering: PNG-eksempel" #: src/SUMMARY.md -#, fuzzy msgid "Using CXX in Chromium" -msgstr "Rust i Android" +msgstr "Brug af CXX i Chromium" #: src/SUMMARY.md src/chromium/adding-third-party-crates.md msgid "Adding Third Party Crates" -msgstr "" +msgstr "Tilføjelse af tredjeparts-crates" #: src/SUMMARY.md msgid "Configuring Cargo.toml" -msgstr "" +msgstr "Konfiguration af Cargo.toml" #: src/SUMMARY.md #: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md msgid "Configuring `gnrt_config.toml`" -msgstr "" +msgstr "Konfiguration af `gnrt_config.toml`" #: src/SUMMARY.md src/chromium/adding-third-party-crates/downloading-crates.md msgid "Downloading Crates" -msgstr "" +msgstr "Download af crates" #: src/SUMMARY.md #: src/chromium/adding-third-party-crates/generating-gn-build-rules.md msgid "Generating `gn` Build Rules" -msgstr "" +msgstr "Generering af `gn`-byggeregler" #: src/SUMMARY.md src/chromium/adding-third-party-crates/resolving-problems.md msgid "Resolving Problems" -msgstr "" +msgstr "Løsning af problemer" #: src/SUMMARY.md #: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md msgid "Build Scripts Which Generate Code" -msgstr "" +msgstr "Byggescripts, der genererer kode" #: src/SUMMARY.md #: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md msgid "Build Scripts Which Build C++ or Take Arbitrary Actions" -msgstr "" +msgstr "Byggescripts, der bygger C++ eller udfører vilkårlige handlinger" #: src/SUMMARY.md #: src/chromium/adding-third-party-crates/depending-on-a-crate.md msgid "Depending on a Crate" -msgstr "" +msgstr "Afhængighed af et crate" #: src/SUMMARY.md msgid "Reviews and Audits" -msgstr "" +msgstr "Gennemgange og revisioner" #: src/SUMMARY.md msgid "Checking into Chromium Source Code" -msgstr "" +msgstr "Check-in til Chromium-kildekode" #: src/SUMMARY.md src/chromium/adding-third-party-crates/keeping-up-to-date.md msgid "Keeping Crates Up to Date" -msgstr "" +msgstr "Hold crates opdaterede" #: src/SUMMARY.md msgid "Bringing It Together - Exercise" -msgstr "" +msgstr "Samling af det hele - Øvelse" #: src/SUMMARY.md src/exercises/chromium/solutions.md -#, fuzzy msgid "Exercise Solutions" -msgstr "Øvelser" +msgstr "Øvelsesløsninger" #: src/SUMMARY.md msgid "Bare Metal: Morning" -msgstr "Rå jern: Formiddag" +msgstr "Bare Metal: Formiddag" #: src/SUMMARY.md src/bare-metal/no_std.md msgid "`no_std`" @@ -925,7 +1083,7 @@ msgstr "`alloc`" #: src/SUMMARY.md src/bare-metal/microcontrollers.md msgid "Microcontrollers" -msgstr "" +msgstr "Mikrocontrollere" #: src/SUMMARY.md src/bare-metal/microcontrollers/mmio.md msgid "Raw MMIO" @@ -937,24 +1095,23 @@ msgstr "PAC'er" #: src/SUMMARY.md msgid "HAL Crates" -msgstr "" +msgstr "HAL-crates" #: src/SUMMARY.md msgid "Board Support Crates" -msgstr "" +msgstr "Board-support-crates" #: src/SUMMARY.md msgid "The Type State Pattern" -msgstr "" +msgstr "Typestatusmønsteret" #: src/SUMMARY.md src/bare-metal/microcontrollers/embedded-hal.md msgid "`embedded-hal`" -msgstr "" +msgstr "`embedded-hal`" #: src/SUMMARY.md src/bare-metal/microcontrollers/probe-rs.md -#, fuzzy msgid "`probe-rs` and `cargo-embed`" -msgstr "probe-rs, cargo-embed" +msgstr "`probe-rs` og `cargo-embed`" #: src/SUMMARY.md src/bare-metal/microcontrollers/debugging.md msgid "Debugging" @@ -964,30 +1121,40 @@ msgstr "Fejlfinding" msgid "Other Projects" msgstr "Andre projekter" +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/exercises/bare-metal/morning.md src/exercises/bare-metal/afternoon.md +#: src/concurrency/welcome.md src/concurrency/sync-exercises.md +#: src/concurrency/welcome-async.md src/concurrency/async-exercises.md +msgid "Exercises" +msgstr "Øvelser" + #: src/SUMMARY.md src/exercises/bare-metal/compass.md #: src/exercises/bare-metal/solutions-morning.md msgid "Compass" msgstr "Kompas" -#: src/SUMMARY.md +#: src/SUMMARY.md src/concurrency/sync-exercises.md +#: src/concurrency/sync-exercises/solutions.md +#: src/concurrency/async-exercises.md +#: src/concurrency/async-exercises/solutions.md msgid "Solutions" msgstr "Løsninger" #: src/SUMMARY.md msgid "Bare Metal: Afternoon" -msgstr "Rå jern: Eftermiddag" +msgstr "Bare Metal: Eftermiddag" #: src/SUMMARY.md msgid "Application Processors" -msgstr "" +msgstr "Applikationsprocessorer" #: src/SUMMARY.md src/bare-metal/aps/entry-point.md msgid "Getting Ready to Rust" -msgstr "" +msgstr "Klargøring til Rust" #: src/SUMMARY.md msgid "Inline Assembly" -msgstr "" +msgstr "Inline-assembly" #: src/SUMMARY.md msgid "MMIO" @@ -995,15 +1162,19 @@ msgstr "MMIO" #: src/SUMMARY.md msgid "Let's Write a UART Driver" -msgstr "" +msgstr "Lad os skrive en UART-driver" #: src/SUMMARY.md msgid "More Traits" -msgstr "" +msgstr "Flere traits" + +#: src/SUMMARY.md src/bare-metal/aps/safemmio/using.md +msgid "Using It" +msgstr "Brug af den" #: src/SUMMARY.md msgid "A Better UART Driver" -msgstr "" +msgstr "En bedre UART-driver" #: src/SUMMARY.md src/bare-metal/aps/better-uart/bitflags.md msgid "Bitflags" @@ -1011,70 +1182,95 @@ msgstr "Bitflag" #: src/SUMMARY.md msgid "Multiple Registers" -msgstr "" +msgstr "Flere registre" #: src/SUMMARY.md src/bare-metal/aps/better-uart/driver.md +#: src/bare-metal/aps/safemmio/driver.md msgid "Driver" msgstr "Driver" -#: src/SUMMARY.md -msgid "Using It" -msgstr "Anvendelse" +#: src/SUMMARY.md src/bare-metal/aps/safemmio/registers.md +msgid "safe-mmio" +msgstr "safe-mmio" -#: src/SUMMARY.md src/bare-metal/aps/exceptions.md +#: src/SUMMARY.md src/error-handling/result.md src/bare-metal/aps/exceptions.md msgid "Exceptions" msgstr "Undtagelser" +#: src/SUMMARY.md src/bare-metal/aps/aarch64-rt.md +msgid "aarch64-rt" +msgstr "aarch64-rt" + +#: src/SUMMARY.md +msgid "Useful Crates" +msgstr "Nyttige crates" + #: src/SUMMARY.md src/bare-metal/useful-crates/zerocopy.md msgid "`zerocopy`" -msgstr "" +msgstr "`zerocopy`" #: src/SUMMARY.md src/bare-metal/useful-crates/aarch64-paging.md msgid "`aarch64-paging`" -msgstr "" +msgstr "`aarch64-paging`" #: src/SUMMARY.md src/bare-metal/useful-crates/buddy_system_allocator.md msgid "`buddy_system_allocator`" -msgstr "" +msgstr "`buddy_system_allocator`" #: src/SUMMARY.md src/bare-metal/useful-crates/tinyvec.md msgid "`tinyvec`" -msgstr "" +msgstr "`tinyvec`" #: src/SUMMARY.md src/bare-metal/useful-crates/spin.md msgid "`spin`" -msgstr "" +msgstr "`spin`" + +#: src/SUMMARY.md src/bare-metal/android.md +msgid "Bare-Metal on Android" +msgstr "Bare-metal på Android" #: src/SUMMARY.md -#, fuzzy msgid "`vmbase`" -msgstr "vmbase" +msgstr "`vmbase`" #: src/SUMMARY.md msgid "RTC Driver" -msgstr "" +msgstr "RTC-driver" #: src/SUMMARY.md msgid "Concurrency: Morning" -msgstr "" +msgstr "Samtidighed: Formiddag" -#: src/SUMMARY.md src/concurrency/threads.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/concurrency/welcome.md src/concurrency/threads.md msgid "Threads" msgstr "Tråde" -#: src/SUMMARY.md src/concurrency/scoped-threads.md +#: src/SUMMARY.md src/concurrency/threads.md src/concurrency/threads/plain.md +msgid "Plain Threads" +msgstr "Almindelige tråde" + +#: src/SUMMARY.md src/concurrency/threads.md src/concurrency/threads/scoped.md msgid "Scoped Threads" msgstr "Tråde med virkefelt" -#: src/SUMMARY.md src/concurrency/channels.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/concurrency/welcome.md src/concurrency/channels.md msgid "Channels" msgstr "Kanaler" -#: src/SUMMARY.md src/concurrency/channels/unbounded.md +#: src/SUMMARY.md src/concurrency/channels.md +#: src/concurrency/channels/senders-receivers.md +msgid "Senders and Receivers" +msgstr "Afsendere og modtagere" + +#: src/SUMMARY.md src/concurrency/channels.md +#: src/concurrency/channels/unbounded.md msgid "Unbounded Channels" msgstr "Ubegrænsede kanaler" -#: src/SUMMARY.md src/concurrency/channels/bounded.md +#: src/SUMMARY.md src/concurrency/channels.md +#: src/concurrency/channels/bounded.md msgid "Bounded Channels" msgstr "Begrænsede kanaler" @@ -1082,6 +1278,11 @@ msgstr "Begrænsede kanaler" msgid "`Send` and `Sync`" msgstr "`Send` og `Sync`" +#: src/SUMMARY.md src/concurrency/send-sync.md +#: src/concurrency/send-sync/marker-traits.md +msgid "Marker Traits" +msgstr "Marker-traits" + #: src/SUMMARY.md src/concurrency/send-sync/send.md msgid "`Send`" msgstr "`Send`" @@ -1090,107 +1291,197 @@ msgstr "`Send`" msgid "`Sync`" msgstr "`Sync`" -#: src/SUMMARY.md src/concurrency/send-sync/examples.md +#: src/SUMMARY.md src/concurrency/send-sync.md +#: src/concurrency/send-sync/examples.md msgid "Examples" msgstr "Eksempler" -#: src/SUMMARY.md src/concurrency/shared_state.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/concurrency/welcome.md src/concurrency/shared-state.md msgid "Shared State" msgstr "Delt tilstand" -#: src/SUMMARY.md src/concurrency/shared_state/arc.md +#: src/SUMMARY.md src/concurrency/shared-state/arc.md msgid "`Arc`" msgstr "`Arc`" -#: src/SUMMARY.md src/concurrency/shared_state/mutex.md +#: src/SUMMARY.md src/concurrency/shared-state/mutex.md msgid "`Mutex`" msgstr "`Mutex`" #: src/SUMMARY.md src/memory-management/review.md -#: src/error-handling/try-conversions.md -#: src/concurrency/shared_state/example.md +#: src/error-handling/try-conversions.md src/concurrency/shared-state.md +#: src/concurrency/shared-state/example.md msgid "Example" msgstr "Eksempel" -#: src/SUMMARY.md src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/solutions-morning.md +#: src/SUMMARY.md src/concurrency/sync-exercises.md +#: src/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/sync-exercises/solutions.md +#: src/concurrency/async-exercises.md msgid "Dining Philosophers" -msgstr "Filosoffer omkring spisebordet" +msgstr "Spisende filosoffer" -#: src/SUMMARY.md src/exercises/concurrency/link-checker.md +#: src/SUMMARY.md src/concurrency/sync-exercises.md +#: src/concurrency/sync-exercises/link-checker.md msgid "Multi-threaded Link Checker" -msgstr "Flertrådet linktjekker" +msgstr "Flertrådet link-checker" #: src/SUMMARY.md msgid "Concurrency: Afternoon" -msgstr "Concurrency: Eftermiddag" +msgstr "Samtidighed: Eftermiddag" -#: src/SUMMARY.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/concurrency/welcome-async.md src/concurrency/async.md msgid "Async Basics" -msgstr "Grundlæggende Async" +msgstr "Grundlæggende async" -#: src/SUMMARY.md src/async/async-await.md +#: src/SUMMARY.md src/concurrency/async/async-await.md msgid "`async`/`await`" msgstr "`async`/`await`" -#: src/SUMMARY.md src/async/futures.md +#: src/SUMMARY.md src/concurrency/async.md src/concurrency/async/futures.md msgid "Futures" -msgstr "Fremtidige resultater (eng. Futures)" +msgstr "Futures" + +#: src/SUMMARY.md src/concurrency/async.md +#: src/concurrency/async/state-machine.md +msgid "State Machine" +msgstr "Tilstandsmaskine" -#: src/SUMMARY.md src/async/runtimes.md +#: src/SUMMARY.md src/concurrency/async.md src/concurrency/async/runtimes.md msgid "Runtimes" -msgstr "" +msgstr "Kørselstider" -#: src/SUMMARY.md src/async/runtimes/tokio.md +#: src/SUMMARY.md src/concurrency/async/runtimes/tokio.md msgid "Tokio" msgstr "Tokio" -#: src/SUMMARY.md src/exercises/concurrency/link-checker.md src/async/tasks.md -#: src/exercises/concurrency/chat-app.md +#: src/SUMMARY.md src/concurrency/sync-exercises/link-checker.md +#: src/concurrency/async.md src/concurrency/async/tasks.md +#: src/concurrency/async-exercises/chat-app.md msgid "Tasks" -msgstr "Opgaver (eng. Tasks)" +msgstr "Opgaver" + +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/concurrency/welcome-async.md src/concurrency/async-control-flow.md +msgid "Channels and Control Flow" +msgstr "Kanaler og kontrolflow" -#: src/SUMMARY.md src/async/channels.md +#: src/SUMMARY.md src/concurrency/async-control-flow.md +#: src/concurrency/async-control-flow/channels.md msgid "Async Channels" msgstr "Asynkrone kanaler" -#: src/SUMMARY.md -msgid "Control Flow" -msgstr "Forgreninger" - -#: src/SUMMARY.md src/async/control-flow/join.md +#: src/SUMMARY.md src/concurrency/async-control-flow.md +#: src/concurrency/async-control-flow/join.md msgid "Join" msgstr "Join" -#: src/SUMMARY.md src/async/control-flow/select.md +#: src/SUMMARY.md src/concurrency/async-control-flow.md +#: src/concurrency/async-control-flow/select.md msgid "Select" msgstr "Select" -#: src/SUMMARY.md +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/concurrency/welcome-async.md src/concurrency/async-pitfalls.md msgid "Pitfalls" msgstr "Faldgruber" -#: src/SUMMARY.md +#: src/SUMMARY.md src/concurrency/async-pitfalls.md msgid "Blocking the Executor" msgstr "" -#: src/SUMMARY.md src/async/pitfalls/pin.md +#: src/SUMMARY.md src/concurrency/async-pitfalls/pin.md msgid "`Pin`" msgstr "" -#: src/SUMMARY.md src/async/pitfalls/async-traits.md +#: src/SUMMARY.md src/concurrency/async-pitfalls.md +#: src/concurrency/async-pitfalls/async-traits.md msgid "Async Traits" msgstr "Asynkrone egenskaber (eng. Traits)" -#: src/SUMMARY.md src/async/pitfalls/cancellation.md +#: src/SUMMARY.md src/concurrency/async-pitfalls.md +#: src/concurrency/async-pitfalls/cancellation.md msgid "Cancellation" msgstr "Annulering" -#: src/SUMMARY.md src/exercises/concurrency/chat-app.md -#: src/exercises/concurrency/solutions-afternoon.md +#: src/SUMMARY.md src/concurrency/async-exercises.md +#: src/concurrency/async-exercises/chat-app.md +#: src/concurrency/async-exercises/solutions.md msgid "Broadcast Chat Application" msgstr "Broadcast chat-applikation" +#: src/SUMMARY.md src/running-the-course/course-structure.md +msgid "Idiomatic Rust" +msgstr "" + +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/idiomatic/welcome.md src/idiomatic/leveraging-the-type-system.md +msgid "Leveraging the Type System" +msgstr "" + +#: src/SUMMARY.md src/idiomatic/leveraging-the-type-system.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern.md +msgid "Newtype Pattern" +msgstr "" + +#: src/SUMMARY.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md +msgid "Semantic Confusion" +msgstr "" + +#: src/SUMMARY.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/parse-don-t-validate.md +msgid "Parse, Don't Validate" +msgstr "" + +#: src/SUMMARY.md +msgid "Is It Encapsulated?" +msgstr "" + +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/unsafe-deep-dive/motivations.md +msgid "Motivations" +msgstr "Motivation" + +#: src/SUMMARY.md src/unsafe-deep-dive/motivations.md +#: src/unsafe-deep-dive/motivations/data-structures.md +msgid "Data Structures" +msgstr "Datastrukturer" + +#: src/SUMMARY.md src/unsafe-deep-dive/motivations.md +#: src/unsafe-deep-dive/motivations/performance.md +msgid "Performance" +msgstr "" + +#: src/SUMMARY.md src/running-the-course/course-structure.md +#: src/unsafe-deep-dive/foundations.md +msgid "Foundations" +msgstr "Grundlag" + +#: src/SUMMARY.md src/unsafe-deep-dive/foundations.md +msgid "What is unsafe?" +msgstr "Hvad er unsafe?" + +#: src/SUMMARY.md src/unsafe-deep-dive/foundations.md +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "When is unsafe used?" +msgstr "" + +#: src/SUMMARY.md src/unsafe-deep-dive/foundations.md +msgid "Data structures are safe" +msgstr "" + +#: src/SUMMARY.md src/unsafe-deep-dive/foundations.md +msgid "Actions might not be" +msgstr "" + +#: src/SUMMARY.md src/unsafe-deep-dive/foundations.md +#: src/unsafe-deep-dive/foundations/less-powerful.md +msgid "Less powerful than it seems" +msgstr "" + #: src/SUMMARY.md msgid "Final Words" msgstr "Afsluttende bemærkninger" @@ -1199,6 +1490,7 @@ msgstr "Afsluttende bemærkninger" msgid "Thanks!" msgstr "Tak!" +#. Please keep { #glossary } untranslated. #: src/SUMMARY.md src/glossary.md msgid "Glossary" msgstr "" @@ -1218,17 +1510,17 @@ msgid "" "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) [![GitHub stars](https://img.shields." -"io/github/stars/google/comprehensive-rust?style=flat-square)](https://github." -"com/google/comprehensive-rust/stargazers)" +"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 "" "[![Bygge-arbejdsgang](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-bidragsydere](https://img.shields.io/github/contributors/google/" "comprehensive-rust?style=flat-square)](https://github.com/google/" -"comprehensive-rust/graphs/contributors) [![GitHub-stjerner](https://img." -"shields.io/github/stars/google/comprehensive-rust?style=flat-square)]" +"comprehensive-rust/graphs/contributors) [![GitHub-stjerner](https://" +"img.shields.io/github/stars/google/comprehensive-rust?style=flat-square)]" "(https://github.com/google/comprehensive-rust/stargazers)" #: src/index.md @@ -1248,6 +1540,17 @@ msgid "" "for updates." msgstr "" +#: src/index.md +msgid "" +"The course is available in other languages. Select your preferred language " +"in the top right corner of the page or check the [Translations](running-the-" +"course/translations.md) page for a list of all available translations." +msgstr "" + +#: src/index.md +msgid "The course is also available [as a PDF](comprehensive-rust.pdf)." +msgstr "" + #: src/index.md msgid "" "The goal of the course is to teach you Rust. We assume you don't know " @@ -1271,10 +1574,9 @@ msgid "Show you common Rust idioms." msgstr "Vise dig idiomatisk Rust." #: src/index.md -#, fuzzy msgid "We call the first four course days Rust Fundamentals." msgstr "" -"Vi kalder de første tre kursusdage Grundlæggende Rust (_Rust Fundamentals_)." +"Vi kalder de første fire kursusdage Grundlæggende Rust (_Rust Fundamentals_)." #: src/index.md msgid "" @@ -1293,15 +1595,14 @@ msgstr "" "C, C++ og Java." #: src/index.md -#, fuzzy msgid "" -"[Chromium](chromium.md): a half-day course on using Rust within Chromium " -"based browsers. This includes interoperability with C++ and how to include " -"third-party crates in Chromium." +"[Chromium](chromium.md): a half-day course on using Rust in Chromium-based " +"browsers. This includes interoperability with C++ and how to include third-" +"party crates in Chromium." msgstr "" -"[Android](android.md): en halv kursusdag om at bruge Rust til " -"platformudvikling i Android (AOSP). Dette inkluderer interoperabilitet med " -"C, C++ og Java." +"[Chromium](chromium.md): et halvdagskursus om brugen af Rust i Chromium-" +"baserede browsere. Dette inkluderer interoperabilitet med C++ og hvordan man " +"inkluderer tredjeparts-crates i Chromium." #: src/index.md msgid "" @@ -1315,12 +1616,12 @@ msgstr "" #: src/index.md msgid "" -"[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)." +"[Concurrency](concurrency/welcome.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 "" -"[Samtidighed](concurrency.md): en hel kursusdag om samtidighed " +"[Samtidighed](concurrency/welcome.md): en hel kursusdag om samtidighed " "(_concurrency_) i Rust. Vi dækker både klassisk samtidighed (tidsdelt " "multitasking ved hjælp af tråde og mutexes) og async/await samtidighed " "(kooperativ multitasking ved hjælp af _futures_)." @@ -1339,13 +1640,13 @@ msgstr "" #: src/index.md msgid "" -"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." +"Learning how to develop macros: please see [the Rust Book](https://doc.rust-" +"lang.org/book/) and [Rust by Example](https://doc.rust-lang.org/rust-by-" +"example/macros.html) instead." msgstr "" -"At lære hvordan man udvikler makroer: se venligst [Kapitel 19.5 i Rust-bogen]" -"(https://doc.rust-lang.org/book/ch19-06-macros.html) og [Rust by Example]" -"(https://doc.rust-lang.org/rust-by-example/macros.html) i stedet." +"At lære hvordan man udvikler makroer: se venligst [Rust-bogen](https://" +"doc.rust-lang.org/book/) og [Rust by Example](https://doc.rust-lang.org/rust-" +"by-example/macros.html) i stedet." #: src/index.md msgid "Assumptions" @@ -1473,141 +1774,144 @@ msgstr "" #: src/running-the-course/course-structure.md msgid "" "The first four days make up [Rust Fundamentals](../welcome-day-1.md). The " -"days are fast paced and we cover a lot of ground!" +"days are fast-paced and we cover a lot of ground!" msgstr "" #: src/running-the-course/course-structure.md -#, fuzzy msgid "Course schedule:" -msgstr "Kursets struktur" +msgstr "Kursusplan:" #: src/running-the-course/course-structure.md -msgid "Day 1 Morning (3 hours, including breaks)" +msgid "Day 1 Morning (2 hours and 10 minutes, including breaks)" msgstr "" -#: src/running-the-course/course-structure.md -msgid "[Welcome](../welcome-day-1.md) (5 minutes)" +#: src/running-the-course/course-structure.md src/welcome-day-1.md +#: src/welcome-day-1-afternoon.md src/welcome-day-2.md +#: src/welcome-day-2-afternoon.md src/welcome-day-3.md +#: src/welcome-day-3-afternoon.md src/welcome-day-4.md +#: src/welcome-day-4-afternoon.md src/concurrency/welcome.md +#: src/concurrency/welcome-async.md src/idiomatic/welcome.md +msgid "Segment" msgstr "" -#: src/running-the-course/course-structure.md -msgid "[Hello, World](../hello-world.md) (20 minutes)" +#: src/running-the-course/course-structure.md src/welcome-day-1.md +#: src/hello-world.md src/types-and-values.md src/control-flow-basics.md +#: src/welcome-day-1-afternoon.md src/tuples-and-arrays.md src/references.md +#: src/user-defined-types.md src/welcome-day-2.md src/pattern-matching.md +#: src/methods-and-traits.md src/generics.md src/welcome-day-2-afternoon.md +#: src/closures.md src/std-types.md src/std-traits.md src/welcome-day-3.md +#: src/memory-management.md src/smart-pointers.md +#: src/welcome-day-3-afternoon.md src/borrowing.md src/lifetimes.md +#: src/welcome-day-4.md src/iterators.md src/modules.md src/testing.md +#: src/welcome-day-4-afternoon.md src/error-handling.md src/unsafe-rust.md +#: src/concurrency/welcome.md src/concurrency/threads.md +#: src/concurrency/channels.md src/concurrency/send-sync.md +#: src/concurrency/shared-state.md src/concurrency/sync-exercises.md +#: src/concurrency/welcome-async.md src/concurrency/async.md +#: src/concurrency/async-control-flow.md src/concurrency/async-pitfalls.md +#: src/concurrency/async-exercises.md src/idiomatic/welcome.md +#: src/idiomatic/leveraging-the-type-system.md +#: src/unsafe-deep-dive/motivations.md src/unsafe-deep-dive/foundations.md +msgid "Duration" +msgstr "Varighed" + +#: src/running-the-course/course-structure.md src/welcome-day-1.md +#: src/types-and-values.md src/control-flow-basics.md src/tuples-and-arrays.md +#: src/references.md src/user-defined-types.md src/pattern-matching.md +#: src/generics.md src/closures.md src/std-types.md src/std-traits.md +#: src/memory-management.md src/smart-pointers.md src/lifetimes.md +#: src/iterators.md src/modules.md src/testing.md src/error-handling.md +#: src/unsafe-rust.md src/concurrency/shared-state.md +#: src/concurrency/async-control-flow.md src/concurrency/async-pitfalls.md +#: src/idiomatic/leveraging-the-type-system.md +#: src/unsafe-deep-dive/motivations.md +msgid "5 minutes" msgstr "" -#: src/running-the-course/course-structure.md -msgid "[Types and Values](../types-and-values.md) (1 hour and 5 minutes)" +#: src/running-the-course/course-structure.md src/welcome-day-1.md +#: src/types-and-values.md src/control-flow-basics.md src/tuples-and-arrays.md +#: src/user-defined-types.md src/pattern-matching.md src/methods-and-traits.md +#: src/modules.md src/unsafe-rust.md src/concurrency/welcome.md +#: src/concurrency/threads.md src/concurrency/shared-state.md +msgid "15 minutes" msgstr "" -#: src/running-the-course/course-structure.md -msgid "[Control Flow Basics](../control-flow-basics.md) (1 hour)" +#: src/running-the-course/course-structure.md src/welcome-day-1.md +#: src/concurrency/welcome-async.md +msgid "40 minutes" msgstr "" -#: src/running-the-course/course-structure.md -msgid "Day 1 Afternoon (2 hours and 55 minutes, including breaks)" +#: src/running-the-course/course-structure.md src/welcome-day-1.md +#: src/welcome-day-2.md src/welcome-day-4.md +msgid "45 minutes" msgstr "" #: src/running-the-course/course-structure.md -msgid "[Tuples and Arrays](../tuples-and-arrays.md) (1 hour)" +msgid "Day 1 Afternoon (2 hours and 45 minutes, including breaks)" msgstr "" -#: src/running-the-course/course-structure.md -msgid "[References](../references.md) (50 minutes)" +#: src/running-the-course/course-structure.md src/welcome-day-1-afternoon.md +msgid "35 minutes" msgstr "" -#: src/running-the-course/course-structure.md -msgid "[User-Defined Types](../user-defined-types.md) (50 minutes)" +#: src/running-the-course/course-structure.md src/welcome-day-1-afternoon.md +#: src/welcome-day-3.md src/welcome-day-3-afternoon.md src/welcome-day-4.md +#: src/welcome-day-4-afternoon.md src/concurrency/welcome-async.md +msgid "55 minutes" msgstr "" -#: src/running-the-course/course-structure.md -msgid "Day 2 Morning (3 hours and 5 minutes, including breaks)" +#: src/running-the-course/course-structure.md src/welcome-day-1-afternoon.md +#: src/welcome-day-2-afternoon.md src/welcome-day-3.md +msgid "1 hour" msgstr "" #: src/running-the-course/course-structure.md -msgid "[Welcome](../welcome-day-2.md) (3 minutes)" +msgid "Day 2 Morning (2 hours and 45 minutes, including breaks)" msgstr "" -#: src/running-the-course/course-structure.md -msgid "[Pattern Matching](../pattern-matching.md) (50 minutes)" +#: src/running-the-course/course-structure.md src/hello-world.md +#: src/types-and-values.md src/control-flow-basics.md src/tuples-and-arrays.md +#: src/references.md src/welcome-day-2.md src/methods-and-traits.md +#: src/closures.md src/std-types.md src/welcome-day-3.md src/borrowing.md +#: src/welcome-day-4.md src/iterators.md src/modules.md src/testing.md +#: src/error-handling.md +msgid "3 minutes" msgstr "" -#: src/running-the-course/course-structure.md -msgid "[Methods and Traits](../methods-and-traits.md) (55 minutes)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "[Generics](../generics.md) (45 minutes)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "Day 2 Afternoon (3 hours, including breaks)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "[Standard Library Types](../std-types.md) (1 hour and 10 minutes)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "[Standard Library Traits](../std-traits.md) (1 hour and 40 minutes)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "Day 3 Morning (2 hours and 15 minutes, including breaks)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "[Welcome](../welcome-day-3.md) (3 minutes)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "[Memory Management](../memory-management.md) (1 hour and 10 minutes)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "[Smart Pointers](../smart-pointers.md) (45 minutes)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "Day 3 Afternoon (2 hours and 20 minutes, including breaks)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "[Borrowing](../borrowing.md) (1 hour)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "" -"[Slices and Lifetimes](../slices-and-lifetimes.md) (1 hour and 10 minutes)" -msgstr "" - -#: src/running-the-course/course-structure.md -msgid "Day 4 Morning (3 hours and 5 minutes, including breaks)" +#: src/running-the-course/course-structure.md src/welcome-day-2.md +#: src/welcome-day-3-afternoon.md +msgid "50 minutes" msgstr "" #: src/running-the-course/course-structure.md -msgid "[Welcome](../welcome-day-4.md) (3 minutes)" +msgid "Day 2 Afternoon (2 hours and 50 minutes, including breaks)" msgstr "" -#: src/running-the-course/course-structure.md -msgid "[Iterators](../iterators.md) (45 minutes)" +#: src/running-the-course/course-structure.md src/welcome-day-2-afternoon.md +#: src/std-traits.md src/smart-pointers.md src/lifetimes.md src/iterators.md +#: src/testing.md src/unsafe-rust.md src/concurrency/welcome.md +#: src/concurrency/sync-exercises.md src/concurrency/async-exercises.md +msgid "30 minutes" msgstr "" #: src/running-the-course/course-structure.md -msgid "[Modules](../modules.md) (40 minutes)" +msgid "Day 3 Morning (2 hours and 20 minutes, including breaks)" msgstr "" #: src/running-the-course/course-structure.md -msgid "[Testing](../testing.md) (1 hour and 5 minutes)" +msgid "Day 3 Afternoon (1 hour and 55 minutes, including breaks)" msgstr "" #: src/running-the-course/course-structure.md -msgid "Day 4 Afternoon (2 hours, including breaks)" +msgid "Day 4 Morning (2 hours and 50 minutes, including breaks)" msgstr "" #: src/running-the-course/course-structure.md -msgid "[Error Handling](../error-handling.md) (45 minutes)" +msgid "Day 4 Afternoon (2 hours and 20 minutes, including breaks)" msgstr "" -#: src/running-the-course/course-structure.md -msgid "[Unsafe Rust](../unsafe-rust.md) (1 hour and 5 minutes)" +#: src/running-the-course/course-structure.md src/welcome-day-4-afternoon.md +msgid "1 hour and 15 minutes" msgstr "" #: src/running-the-course/course-structure.md @@ -1615,12 +1919,11 @@ msgid "Deep Dives" msgstr "" #: src/running-the-course/course-structure.md -#, fuzzy msgid "" "In addition to the 4-day class on Rust Fundamentals, we cover some more " "specialized topics:" msgstr "" -"Ud over kurset på tre dage om Grundlæggende Rust, dækker vi mere " +"Ud over kurset på fire dage om Grundlæggende Rust, dækker vi mere " "specialiserede emner:" #: src/running-the-course/course-structure.md @@ -1651,9 +1954,8 @@ msgid "" msgstr "" #: src/running-the-course/course-structure.md -#, fuzzy msgid "Rust in Chromium" -msgstr "Rust i Android" +msgstr "Rust i Chromium" #: src/running-the-course/course-structure.md msgid "" @@ -1695,8 +1997,8 @@ msgstr "Samtidighed i Rust" #: src/running-the-course/course-structure.md msgid "" -"The [Concurrency in Rust](../concurrency.md) deep dive is a full day class " -"on classical as well as `async`/`await` concurrency." +"The [Concurrency in Rust](../concurrency/welcome.md) deep dive is a full day " +"class on classical as well as `async`/`await` concurrency." msgstr "" #: src/running-the-course/course-structure.md @@ -1707,49 +2009,103 @@ msgid "" msgstr "" #: src/running-the-course/course-structure.md -msgid "Format" +msgid "Morning (3 hours and 20 minutes, including breaks)" +msgstr "" + +#: src/running-the-course/course-structure.md src/references.md +#: src/std-types.md src/memory-management.md src/borrowing.md +#: src/error-handling.md src/concurrency/welcome.md +#: src/concurrency/sync-exercises.md src/concurrency/welcome-async.md +#: src/concurrency/async-pitfalls.md src/concurrency/async-exercises.md +#: src/idiomatic/leveraging-the-type-system.md +msgid "20 minutes" +msgstr "" + +#: src/running-the-course/course-structure.md src/concurrency/welcome.md +msgid "Send and Sync" +msgstr "Send og Sync" + +#: src/running-the-course/course-structure.md src/concurrency/welcome.md +#: src/concurrency/welcome-async.md +msgid "1 hour and 10 minutes" +msgstr "" + +#: src/running-the-course/course-structure.md +msgid "Afternoon (3 hours and 30 minutes, including breaks)" msgstr "" #: src/running-the-course/course-structure.md msgid "" -"The course is meant to be very interactive and we recommend letting the " -"questions drive the exploration of Rust!" +"The [Idiomatic Rust](../idiomatic/welcome.md) deep dive is a 2-day class on " +"Rust idioms and patterns." msgstr "" -#: src/running-the-course/keyboard-shortcuts.md -msgid "There are several useful keyboard shortcuts in mdBook:" +#: src/running-the-course/course-structure.md +msgid "" +"You should be familiar with the material in [Rust Fundamentals](../welcome-" +"day-1.md) before starting this course." msgstr "" -#: src/running-the-course/keyboard-shortcuts.md -msgid "Arrow-Left" +#: src/running-the-course/course-structure.md +msgid "Morning (25 minutes, including breaks)" msgstr "" -#: src/running-the-course/keyboard-shortcuts.md -msgid ": Navigate to the previous page." +#: src/running-the-course/course-structure.md src/idiomatic/welcome.md +msgid "25 minutes" msgstr "" -#: src/running-the-course/keyboard-shortcuts.md -msgid "Arrow-Right" +#: src/running-the-course/course-structure.md +msgid "Unsafe (Work in Progress)" +msgstr "" + +#: src/running-the-course/course-structure.md +msgid "" +"The [Unsafe](../unsafe-deep-dive/welcome.md) deep dive is a two-day class on " +"the _unsafe_ Rust language. It covers the fundamentals of Rust's safety " +"guarantees, the motivation for `unsafe`, review process for `unsafe` code, " +"FFI basics, and building data structures that the borrow checker would " +"normally reject." +msgstr "" + +#: src/running-the-course/course-structure.md +msgid "Day 1 Morning (1 hour, including breaks)" +msgstr "" + +#: src/running-the-course/course-structure.md src/hello-world.md +#: src/control-flow-basics.md src/user-defined-types.md +#: src/memory-management.md src/concurrency/channels.md +#: src/concurrency/send-sync.md src/unsafe-deep-dive/foundations.md +msgid "2 minutes" +msgstr "" + +#: src/running-the-course/course-structure.md +msgid "Format" +msgstr "" + +#: src/running-the-course/course-structure.md +msgid "" +"The course is meant to be very interactive and we recommend letting the " +"questions drive the exploration of Rust!" msgstr "" #: src/running-the-course/keyboard-shortcuts.md -msgid ": Navigate to the next page." +msgid "There are several useful keyboard shortcuts in mdBook:" msgstr "" -#: src/running-the-course/keyboard-shortcuts.md src/cargo/code-samples.md -msgid "Ctrl + Enter" -msgstr "Ctrl + Enter" +#: src/running-the-course/keyboard-shortcuts.md +msgid "Arrow-Left: Navigate to the previous page." +msgstr "" #: src/running-the-course/keyboard-shortcuts.md -msgid ": Execute the code sample that has focus." +msgid "Arrow-Right: Navigate to the next page." msgstr "" #: src/running-the-course/keyboard-shortcuts.md -msgid "s" +msgid "Ctrl + Enter: Execute the code sample that has focus." msgstr "" #: src/running-the-course/keyboard-shortcuts.md -msgid ": Activate the search bar." +msgid "s: Activate the search bar." msgstr "" #: src/running-the-course/translations.md @@ -1761,9 +2117,9 @@ msgstr "" #: src/running-the-course/translations.md msgid "" "[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)." +"by [@rastringer](https://github.com/rastringer), [@hugojacob](https://" +"github.com/hugojacob), [@joaovicmendes](https://github.com/joaovicmendes), " +"and [@henrif75](https://github.com/henrif75)." msgstr "" #: src/running-the-course/translations.md @@ -1772,8 +2128,7 @@ msgid "" "by [@suetfei](https://github.com/suetfei), [@wnghl](https://github.com/" "wnghl), [@anlunx](https://github.com/anlunx), [@kongy](https://github.com/" "kongy), [@noahdragon](https://github.com/noahdragon), [@superwhd](https://" -"github.com/superwhd), [@SketchK](https://github.com/SketchK), and [@nodmp]" -"(https://github.com/nodmp)." +"github.com/superwhd), @SketchK, and [@nodmp](https://github.com/nodmp)." msgstr "" #: src/running-the-course/translations.md @@ -1785,11 +2140,29 @@ msgid "" "johnathan79717)." msgstr "" +#: src/running-the-course/translations.md +msgid "" +"[Farsi](https://google.github.io/comprehensive-rust/fa/) by [@DannyRavi]" +"(https://github.com/DannyRavi), [@javad-jafari](https://github.com/javad-" +"jafari), [@Alix1383](https://github.com/alix1383), [@moaminsharifi](https://" +"github.com/moaminsharifi) , [@hamidrezakp](https://github.com/hamidrezakp) " +"and [@mehrad77](https://github.com/mehrad77)." +msgstr "" + +#: src/running-the-course/translations.md +msgid "" +"[Japanese](https://google.github.io/comprehensive-rust/ja/) by [@CoinEZ-JPN]" +"(https://github.com/CoinEZ), [@momotaro1105](https://github.com/" +"momotaro1105), [@HidenoriKobayashi](https://github.com/HidenoriKobayashi) " +"and [@kantasv](https://github.com/kantasv)." +msgstr "" + #: src/running-the-course/translations.md 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)." +"(https://github.com/keispace), [@jiyongp](https://github.com/jiyongp), " +"[@jooyunghan](https://github.com/jooyunghan), and [@namhyung](https://" +"github.com/namhyung)." msgstr "" #: src/running-the-course/translations.md @@ -1798,6 +2171,13 @@ msgid "" "(https://github.com/deavid)." msgstr "" +#: src/running-the-course/translations.md +msgid "" +"[Ukrainian](https://google.github.io/comprehensive-rust/uk/) by [@git-user-" +"cpp](https://github.com/git-user-cpp), [@yaremam](https://github.com/" +"yaremam) and [@reta](https://github.com/reta)." +msgstr "" + #: src/running-the-course/translations.md msgid "" "Use the language picker in the top-right corner to switch between languages." @@ -1813,6 +2193,12 @@ msgid "" "recently updated translations:" msgstr "" +#: src/running-the-course/translations.md +msgid "" +"[Arabic](https://google.github.io/comprehensive-rust/ar/) by [@younies]" +"(https://github.com/younies)" +msgstr "" + #: src/running-the-course/translations.md msgid "" "[Bengali](https://google.github.io/comprehensive-rust/bn/) by [@raselmandol]" @@ -1822,7 +2208,8 @@ msgstr "" #: src/running-the-course/translations.md msgid "" "[French](https://google.github.io/comprehensive-rust/fr/) by [@KookaS]" -"(https://github.com/KookaS) and [@vcaen](https://github.com/vcaen)." +"(https://github.com/KookaS), [@vcaen](https://github.com/vcaen) and " +"[@AdrienBaudemont](https://github.com/AdrienBaudemont)." msgstr "" #: src/running-the-course/translations.md @@ -1833,9 +2220,17 @@ msgstr "" #: src/running-the-course/translations.md msgid "" -"[Japanese](https://google.github.io/comprehensive-rust/ja/) by [@CoinEZ-JPN]" -"(https://github.com/CoinEZ) and [@momotaro1105](https://github.com/" -"momotaro1105)." +"[Italian](https://google.github.io/comprehensive-rust/it/) by " +"[@henrythebuilder](https://github.com/henrythebuilder) and [@detro](https://" +"github.com/detro)." +msgstr "" + +#: src/running-the-course/translations.md +msgid "" +"The full list of translations with their current status is also available " +"either [as of their last update](https://google.github.io/comprehensive-rust/" +"translation-report.html) or [synced to the latest version of the course]" +"(https://google.github.io/comprehensive-rust/synced-translation-report.html)." msgstr "" #: src/running-the-course/translations.md @@ -1848,11 +2243,11 @@ msgstr "" #: src/cargo.md msgid "" -"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." +"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 "" #: src/cargo.md @@ -1867,7 +2262,7 @@ msgstr "" 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 to different compiler versions." +"use to install different compiler versions." msgstr "" #: src/cargo.md @@ -1881,12 +2276,15 @@ msgid "" "different IDE available called [RustRover](https://www.jetbrains.com/rust/)." msgstr "" +#: src/cargo.md +msgid "On Debian/Ubuntu, you can install `rustup` via `apt`:" +msgstr "" + #: src/cargo.md msgid "" -"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:" +"On macOS, you can use [Homebrew](https://brew.sh/) to install Rust, but this " +"may provide an outdated version. Therefore, it is recommended to install " +"Rust from the official site." msgstr "" #: src/cargo/rust-ecosystem.md @@ -1900,7 +2298,7 @@ msgstr "" #: src/cargo/rust-ecosystem.md msgid "" -"`rustc`: the Rust compiler which turns `.rs` files into binaries and other " +"`rustc`: the Rust compiler that turns `.rs` files into binaries and other " "intermediate formats." msgstr "" @@ -1921,11 +2319,10 @@ msgid "" "and `rustup` will let you switch between them as needed." msgstr "" -#: src/cargo/rust-ecosystem.md src/hello-world/hello-world.md -#: src/tuples-and-arrays/tuples-and-arrays.md src/references/exclusive.md -#: src/pattern-matching/destructuring.md src/memory-management/move.md -#: src/error-handling/try.md src/android/setup.md src/concurrency/threads.md -#: src/async/async-await.md +#: src/cargo/rust-ecosystem.md src/types-and-values/hello-world.md +#: src/references/exclusive.md src/memory-management/move.md +#: src/error-handling/try.md src/unsafe-rust/unsafe-functions/calling.md +#: src/android/setup.md src/concurrency/async/async-await.md msgid "Key points:" msgstr "Nøglepunkter:" @@ -1949,14 +2346,15 @@ msgstr "" #: src/cargo/rust-ecosystem.md msgid "" -"Dependencies can also be resolved from alternative [registries](https://doc." -"rust-lang.org/cargo/reference/registries.html), git, folders, and more." +"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 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." +"current edition is Rust 2024. Previous editions were Rust 2015, Rust 2018 " +"and Rust 2021." msgstr "" #: src/cargo/rust-ecosystem.md @@ -2004,14 +2402,14 @@ msgstr "" #: src/cargo/rust-ecosystem.md msgid "" -"[build scripting](https://doc.rust-lang.org/cargo/reference/build-scripts." -"html)" +"[build scripting](https://doc.rust-lang.org/cargo/reference/build-" +"scripts.html)" msgstr "" #: src/cargo/rust-ecosystem.md msgid "" -"[global installation](https://doc.rust-lang.org/cargo/commands/cargo-install." -"html)" +"[global installation](https://doc.rust-lang.org/cargo/commands/cargo-" +"install.html)" msgstr "" #: src/cargo/rust-ecosystem.md @@ -2039,7 +2437,7 @@ msgstr "" #: src/cargo/code-samples.md msgid "" "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 " +"the exercises. On the last day, we will do a larger exercise that shows you " "how to work with dependencies and for that you need Cargo." msgstr "" @@ -2051,13 +2449,11 @@ msgstr "" msgid "\"Edit me!\"" msgstr "\"Rediger mig!\"" -#: src/cargo/code-samples.md -msgid "You can use " -msgstr "Du kan bruge " - #: src/cargo/code-samples.md #, fuzzy -msgid " to execute the code when focus is in the text box." +msgid "" +"You can use Ctrl + Enter to execute the code when focus is in the " +"text box." msgstr "for at afvikle koden når tekstboksen er i fokus." #: src/cargo/code-samples.md @@ -2120,7 +2516,7 @@ msgstr "" #: src/cargo/running-locally.md msgid "" -"Replace the boiler-plate code in `src/main.rs` with your own code. For " +"Replace the boilerplate 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 "" @@ -2181,40 +2577,16 @@ msgstr "" msgid "User-defined types: structs and enums." msgstr "" -#: src/welcome-day-1.md -msgid "Pattern matching: destructuring enums, structs, and arrays." -msgstr "" - #: src/welcome-day-1.md src/welcome-day-2.md src/welcome-day-3.md -#: src/welcome-day-4.md +#: src/welcome-day-4.md src/concurrency/welcome.md +#: src/concurrency/welcome-async.md src/idiomatic/welcome.md msgid "Schedule" msgstr "" -#: src/welcome-day-1.md src/welcome-day-1-afternoon.md src/welcome-day-2.md -#: src/welcome-day-2-afternoon.md src/welcome-day-3.md -#: src/welcome-day-3-afternoon.md src/welcome-day-4.md -#: src/welcome-day-4-afternoon.md -msgid "In this session:" -msgstr "" - -#: src/welcome-day-1.md -msgid "[Welcome](./welcome-day-1.md) (5 minutes)" -msgstr "" - -#: src/welcome-day-1.md -msgid "[Hello, World](./hello-world.md) (20 minutes)" -msgstr "" - -#: src/welcome-day-1.md -msgid "[Types and Values](./types-and-values.md) (1 hour and 5 minutes)" -msgstr "" - #: src/welcome-day-1.md -msgid "[Control Flow Basics](./control-flow-basics.md) (1 hour)" -msgstr "" - -#: src/welcome-day-1.md src/welcome-day-2-afternoon.md -msgid "Including 10 minute breaks, this session should take about 3 hours" +msgid "" +"Including 10 minute breaks, this session should take about 2 hours and 10 " +"minutes. It contains:" msgstr "" #: src/welcome-day-1.md @@ -2235,9 +2607,10 @@ msgstr "" #: src/welcome-day-1.md 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." +"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/welcome-day-1.md @@ -2268,39 +2641,40 @@ msgid "" "schedule. Feel free to be flexible and adjust as necessary!" msgstr "" +#: src/hello-world.md src/concurrency/send-sync.md +msgid "This segment should take about 15 minutes. It contains:" +msgstr "" + #: src/hello-world.md src/types-and-values.md src/control-flow-basics.md #: src/tuples-and-arrays.md src/references.md src/user-defined-types.md #: src/pattern-matching.md src/methods-and-traits.md src/generics.md -#: src/std-types.md src/std-traits.md src/memory-management.md -#: src/smart-pointers.md src/borrowing.md src/slices-and-lifetimes.md -#: src/iterators.md src/modules.md src/testing.md src/error-handling.md -#: src/unsafe-rust.md -msgid "In this segment:" -msgstr "" - -#: src/hello-world.md -msgid "[What is Rust?](./hello-world/what-is-rust.md) (10 minutes)" -msgstr "" - -#: src/hello-world.md -msgid "[Hello, World](./hello-world/hello-world.md) (5 minutes)" -msgstr "" - -#: src/hello-world.md -msgid "[Benefits of Rust](./hello-world/benefits.md) (3 minutes)" -msgstr "" - -#: src/hello-world.md -msgid "[Playground](./hello-world/playground.md) (2 minutes)" -msgstr "" - -#: src/hello-world.md -msgid "This segment should take about 20 minutes" +#: src/closures.md src/std-types.md src/std-traits.md src/memory-management.md +#: src/smart-pointers.md src/borrowing.md src/lifetimes.md src/iterators.md +#: src/modules.md src/testing.md src/error-handling.md src/unsafe-rust.md +#: src/concurrency/threads.md src/concurrency/channels.md +#: src/concurrency/send-sync.md src/concurrency/shared-state.md +#: src/concurrency/sync-exercises.md src/concurrency/async.md +#: src/concurrency/async-control-flow.md src/concurrency/async-pitfalls.md +#: src/concurrency/async-exercises.md +#: src/idiomatic/leveraging-the-type-system.md +#: src/unsafe-deep-dive/motivations.md src/unsafe-deep-dive/foundations.md +msgid "Slide" +msgstr "" + +#: src/hello-world.md src/references.md src/user-defined-types.md +#: src/pattern-matching.md src/methods-and-traits.md src/generics.md +#: src/closures.md src/std-types.md src/memory-management.md +#: src/smart-pointers.md src/borrowing.md src/lifetimes.md src/modules.md +#: src/unsafe-rust.md src/concurrency/channels.md src/concurrency/send-sync.md +#: src/concurrency/shared-state.md src/concurrency/async.md +#: src/concurrency/async-control-flow.md src/concurrency/async-pitfalls.md +#: src/unsafe-deep-dive/foundations.md +msgid "10 minutes" msgstr "" #: src/hello-world/what-is-rust.md msgid "" -"Rust is a new programming language which had its [1.0 release in 2015]" +"Rust is a new programming language that had its [1.0 release in 2015]" "(https://blog.rust-lang.org/2015/05/15/Rust-1.0.html):" msgstr "" @@ -2375,79 +2749,6 @@ msgstr "" msgid "Focuses on reliability and safety without sacrificing performance." msgstr "" -#: src/hello-world/hello-world.md -msgid "" -"Let us jump into the simplest possible Rust program, a classic Hello World " -"program:" -msgstr "" - -#: src/hello-world/hello-world.md -msgid "\"Hello 🌍!\"" -msgstr "\"Hallo 🌍!\"" - -#: src/hello-world/hello-world.md -msgid "What you see:" -msgstr "Hvad du ser:" - -#: src/hello-world/hello-world.md -msgid "Functions are introduced with `fn`." -msgstr "" - -#: src/hello-world/hello-world.md -msgid "Blocks are delimited by curly braces like in C and C++." -msgstr "" - -#: src/hello-world/hello-world.md -msgid "The `main` function is the entry point of the program." -msgstr "" - -#: src/hello-world/hello-world.md -msgid "Rust has hygienic macros, `println!` is an example of this." -msgstr "" - -#: src/hello-world/hello-world.md -msgid "Rust strings are UTF-8 encoded and can contain any Unicode character." -msgstr "" - -#: src/hello-world/hello-world.md -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/hello-world.md -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/hello-world.md -msgid "Rust is modern with full support for things like Unicode." -msgstr "" - -#: src/hello-world/hello-world.md -msgid "" -"Rust uses macros for situations where you want to have a variable number of " -"arguments (no function [overloading](../control-flow-basics/functions.md))." -msgstr "" - -#: src/hello-world/hello-world.md -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/hello-world.md -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/benefits.md msgid "Some unique selling points of Rust:" msgstr "" @@ -2563,7 +2864,7 @@ 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)" +"collector) as well as access to low-level hardware (should you need it)." msgstr "" #: src/hello-world/playground.md @@ -2602,32 +2903,85 @@ msgid "" "assembly." msgstr "" -#: src/types-and-values.md -msgid "[Variables](./types-and-values/variables.md) (5 minutes)" +#: src/types-and-values.md src/concurrency/async.md +msgid "This segment should take about 40 minutes. It contains:" +msgstr "" + +#: src/types-and-values/hello-world.md +msgid "" +"Let us jump into the simplest possible Rust program, a classic Hello World " +"program:" +msgstr "" + +#: src/types-and-values/hello-world.md +msgid "\"Hello 🌍!\"" +msgstr "\"Hallo 🌍!\"" + +#: src/types-and-values/hello-world.md +msgid "What you see:" +msgstr "Hvad du ser:" + +#: src/types-and-values/hello-world.md +msgid "Functions are introduced with `fn`." +msgstr "" + +#: src/types-and-values/hello-world.md +msgid "The `main` function is the entry point of the program." +msgstr "" + +#: src/types-and-values/hello-world.md +msgid "Blocks are delimited by curly braces like in C and C++." +msgstr "" + +#: src/types-and-values/hello-world.md +msgid "Statements end with `;`." +msgstr "" + +#: src/types-and-values/hello-world.md +msgid "Rust has hygienic macros, `println!` is an example of this." +msgstr "" + +#: src/types-and-values/hello-world.md +msgid "Rust strings are UTF-8 encoded and can contain any Unicode character." msgstr "" -#: src/types-and-values.md -msgid "[Values](./types-and-values/values.md) (10 minutes)" +#: src/types-and-values/hello-world.md +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/types-and-values.md -msgid "[Arithmetic](./types-and-values/arithmetic.md) (5 minutes)" +#: src/types-and-values/hello-world.md +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/types-and-values.md -msgid "[Strings](./types-and-values/strings.md) (10 minutes)" +#: src/types-and-values/hello-world.md +msgid "Rust is modern with full support for Unicode." msgstr "" -#: src/types-and-values.md -msgid "[Type Inference](./types-and-values/inference.md) (5 minutes)" +#: src/types-and-values/hello-world.md +msgid "" +"Rust uses macros for situations where you want to have a variable number of " +"arguments (no function [overloading](../control-flow-basics/functions.md))." msgstr "" -#: src/types-and-values.md -msgid "[Exercise: Fibonacci](./types-and-values/exercise.md) (30 minutes)" +#: src/types-and-values/hello-world.md +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/types-and-values.md src/testing.md src/unsafe-rust.md -msgid "This segment should take about 1 hour and 5 minutes" +#: src/types-and-values/hello-world.md +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/types-and-values/variables.md @@ -2636,9 +2990,7 @@ msgid "" "`let`:" msgstr "" -#: src/types-and-values/variables.md src/control-flow-basics/loops.md -#: src/control-flow-basics/break-continue.md -#: src/control-flow-basics/blocks-and-scopes.md +#: src/types-and-values/variables.md #, fuzzy msgid "\"x: {x}\"" msgstr "\"{x}\"" @@ -2657,9 +3009,16 @@ msgstr "" #: src/types-and-values/variables.md msgid "" -"The `i32` here is the type of the variable. This must be known at compile " -"time, but type inference (covered later) allows the programmer to omit it in " -"many cases." +"Warnings are enabled for this slide, such as for unused variables or " +"unnecessary `mut`. These are omitted in most slides to avoid distracting " +"warnings. Try removing the mutation but leaving the `mut` keyword in place." +msgstr "" + +#: src/types-and-values/variables.md +msgid "" +"The `i32` here is the type of the variable. This must be known at compile " +"time, but type inference (covered later) allows the programmer to omit it in " +"many cases." msgstr "" #: src/types-and-values/values.md @@ -2668,12 +3027,11 @@ msgid "" "each type." msgstr "" -#: src/types-and-values/values.md src/tuples-and-arrays/tuples-and-arrays.md -#: src/unsafe-rust/exercise.md +#: src/types-and-values/values.md src/unsafe-rust/exercise.md msgid "Types" msgstr "" -#: src/types-and-values/values.md src/tuples-and-arrays/tuples-and-arrays.md +#: src/types-and-values/values.md msgid "Literals" msgstr "" @@ -2717,7 +3075,7 @@ msgstr "" msgid "Unicode scalar values" msgstr "" -#: src/types-and-values/values.md +#: src/types-and-values/values.md src/android/aidl/types/primitives.md msgid "`char`" msgstr "" @@ -2729,7 +3087,7 @@ msgstr "" msgid "Booleans" msgstr "" -#: src/types-and-values/values.md +#: src/types-and-values/values.md src/android/aidl/types/primitives.md msgid "`bool`" msgstr "" @@ -2758,7 +3116,7 @@ msgid "`bool` is 8 bits wide." msgstr "" #: src/types-and-values/values.md -msgid "There are a few syntaxes which are not shown above:" +msgid "There are a few syntaxes that are not shown above:" msgstr "" #: src/types-and-values/values.md @@ -2787,8 +3145,8 @@ msgstr "" #: src/types-and-values/arithmetic.md msgid "" "What about integer overflow? In C and C++ overflow of _signed_ integers is " -"actually undefined, and might do different things on different platforms or " -"compilers. In Rust, it's defined." +"actually undefined, and might do unknown things at runtime. In Rust, it's " +"defined." msgstr "" #: src/types-and-values/arithmetic.md @@ -2806,83 +3164,6 @@ msgid "" "why the example requires a separate function." msgstr "" -#: src/types-and-values/strings.md -msgid "" -"Rust has two types to represent strings, both of which will be covered in " -"more depth later. Both _always_ store UTF-8 encoded strings." -msgstr "" - -#: src/types-and-values/strings.md -msgid "`String` - a modifiable, owned string." -msgstr "" - -#: src/types-and-values/strings.md -msgid "`&str` - a read-only string. String literals have this type." -msgstr "" - -#: src/types-and-values/strings.md -#, fuzzy -msgid "\"Greetings\"" -msgstr "\"greetings\"" - -#: src/types-and-values/strings.md -msgid "\"🪐\"" -msgstr "" - -#: src/types-and-values/strings.md -msgid "\", \"" -msgstr "" - -#: src/types-and-values/strings.md -#, fuzzy -msgid "\"final sentence: {}\"" -msgstr "\"indre blok: {a}\"" - -#: src/types-and-values/strings.md src/async/control-flow/join.md -msgid "\"{:?}\"" -msgstr "\"{:?}\"" - -#: src/types-and-values/strings.md -msgid "//println!(\"{:?}\", &sentence[12..13]);\n" -msgstr "" - -#: src/types-and-values/strings.md -msgid "" -"This slide introduces strings. Everything here will be covered in more depth " -"later, but this is enough for subsequent slides and exercises to use strings." -msgstr "" - -#: src/types-and-values/strings.md -msgid "Invalid UTF-8 in a string is UB, and this not allowed in safe Rust." -msgstr "" - -#: src/types-and-values/strings.md -msgid "" -"`String` is a user-defined type with a constructor (`::new()`) and methods " -"like `s.push_str(..)`." -msgstr "" - -#: src/types-and-values/strings.md -msgid "" -"The `&` in `&str` indicates that this is a reference. We will cover " -"references later, so for now just think of `&str` as a unit meaning \"a read-" -"only string\"." -msgstr "" - -#: src/types-and-values/strings.md -msgid "" -"The commented-out line is indexing into the string by byte position. " -"`12..13` does not end on a character boundary, so the program panics. Adjust " -"it to a range that does, based on the error message." -msgstr "" - -#: src/types-and-values/strings.md -msgid "" -"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/types-and-values/inference.md msgid "Rust will look at how the variable is _used_ to determine the type:" msgstr "" @@ -2915,14 +3196,13 @@ msgstr "" #: src/types-and-values/exercise.md msgid "" -"The first and second Fibonacci numbers are both `1`. For n>2, the n'th " -"Fibonacci number is calculated recursively as the sum of the n-1'th and " -"n-2'th Fibonacci numbers." +"The Fibonacci sequence begins with `[0, 1]`. For `n > 1`, the next number is " +"the sum of the previous two." msgstr "" #: src/types-and-values/exercise.md msgid "" -"Write a function `fib(n)` that calculates the n'th Fibonacci number. When " +"Write a function `fib(n)` that calculates the nth Fibonacci number. When " "will this function panic?" msgstr "" @@ -2940,298 +3220,320 @@ msgstr "" #: src/types-and-values/exercise.md src/types-and-values/solution.md #, fuzzy -msgid "\"fib(n) = {}\"" +msgid "\"fib({n}) = {}\"" msgstr "\"fib({i}): {n}\"" -#: src/control-flow-basics.md -msgid "[Conditionals](./control-flow-basics/conditionals.md) (5 minutes)" +#: src/control-flow-basics.md src/methods-and-traits.md src/generics.md +#: src/modules.md src/testing.md +msgid "This segment should take about 45 minutes. It contains:" msgstr "" #: src/control-flow-basics.md -msgid "[Loops](./control-flow-basics/loops.md) (5 minutes)" +#, fuzzy +msgid "if Expressions" +msgstr "`if let`-udtryk" + +#: src/control-flow-basics.md src/pattern-matching.md src/concurrency/async.md +#: src/concurrency/async-control-flow.md +msgid "4 minutes" msgstr "" #: src/control-flow-basics.md -msgid "" -"[break and continue](./control-flow-basics/break-continue.md) (5 minutes)" -msgstr "" +#, fuzzy +msgid "match Expressions" +msgstr "`match`-udtryk" #: src/control-flow-basics.md -msgid "" -"[Blocks and Scopes](./control-flow-basics/blocks-and-scopes.md) (10 minutes)" +msgid "break and continue" msgstr "" #: src/control-flow-basics.md -msgid "[Functions](./control-flow-basics/functions.md) (3 minutes)" +msgid "We will now cover the many kinds of flow control found in Rust." msgstr "" #: src/control-flow-basics.md -msgid "[Macros](./control-flow-basics/macros.md) (2 minutes)" +msgid "" +"Most of this will be very familiar to what you have seen in other " +"programming languages." msgstr "" -#: src/control-flow-basics.md +#: src/control-flow-basics/blocks-and-scopes.md msgid "" -"[Exercise: Collatz Sequence](./control-flow-basics/exercise.md) (30 minutes)" +"A block in Rust contains a sequence of expressions, enclosed by braces {}. " +"The final expression of a block determines the value and type of the whole " +"block:" +msgstr "" + +#: src/control-flow-basics/blocks-and-scopes.md +msgid "// dbg!(y);\n" msgstr "" -#: src/control-flow-basics.md src/tuples-and-arrays.md src/borrowing.md -msgid "This segment should take about 1 hour" +#: src/control-flow-basics/blocks-and-scopes.md +msgid "" +"If the last expression ends with `;`, then the resulting value and type is " +"`()`." msgstr "" -#: src/control-flow-basics/conditionals.md -msgid "Much of the Rust syntax will be familiar to you from C, C++ or Java:" +#: src/control-flow-basics/blocks-and-scopes.md +msgid "A variable's scope is limited to the enclosing block." msgstr "" -#: src/control-flow-basics/conditionals.md -msgid "Blocks are delimited by curly braces." +#: src/control-flow-basics/blocks-and-scopes.md +msgid "" +"You can explain that dbg! is a Rust macro that prints and returns the value " +"of a given expression for quick and dirty debugging." msgstr "" -#: src/control-flow-basics/conditionals.md +#: src/control-flow-basics/blocks-and-scopes.md msgid "" -"Line comments are started with `//`, block comments are delimited by `/* ... " -"*/`." +"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-basics/conditionals.md -msgid "Keywords like `if` and `while` work the same." +#: src/control-flow-basics/blocks-and-scopes.md +msgid "" +"Demonstrate that attempting to access `y` outside of its scope won't compile." msgstr "" -#: src/control-flow-basics/conditionals.md -msgid "Variable assignment is done with `=`, comparison is done with `==`." +#: src/control-flow-basics/blocks-and-scopes.md +msgid "" +"Values are effectively \"deallocated\" when they go out of their scope, even " +"if their data on the stack is still there." msgstr "" -#: src/control-flow-basics/conditionals.md +#: src/control-flow-basics/if.md msgid "`if` expressions" msgstr "" -#: src/control-flow-basics/conditionals.md +#: src/control-flow-basics/if.md msgid "" "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-basics/conditionals.md -msgid "\"small\"" +#: src/control-flow-basics/if.md +msgid "\"zero!\"" msgstr "" -#: src/control-flow-basics/conditionals.md +#: src/control-flow-basics/if.md msgid "\"biggish\"" msgstr "" -#: src/control-flow-basics/conditionals.md +#: src/control-flow-basics/if.md msgid "\"huge\"" msgstr "" -#: src/control-flow-basics/conditionals.md +#: src/control-flow-basics/if.md msgid "" "In addition, you can use `if` as an expression. The last expression of each " "block becomes the value of the `if` expression:" msgstr "" -#: src/control-flow-basics/conditionals.md +#: src/control-flow-basics/if.md +msgid "\"small\"" +msgstr "" + +#: src/control-flow-basics/if.md msgid "\"large\"" msgstr "" -#: src/control-flow-basics/conditionals.md +#: src/control-flow-basics/if.md #, fuzzy msgid "\"number size: {}\"" msgstr "\"{numbers:?}\"" -#: src/control-flow-basics/conditionals.md +#: src/control-flow-basics/if.md msgid "" "Because `if` is an expression and must have a particular type, both of its " "branch blocks must have the same type. Show what happens if you add `;` " "after `\"small\"` in the second example." msgstr "" -#: src/control-flow-basics/conditionals.md +#: src/control-flow-basics/if.md msgid "" -"When `if` is used in an expression, the expression must have a `;` to " -"separate it from the next statement. Remove the `;` before `println!` to see " -"the compiler error." -msgstr "" - -#: src/control-flow-basics/loops.md -msgid "There are three looping keywords in Rust: `while`, `loop`, and `for`:" -msgstr "" - -#: src/control-flow-basics/loops.md -msgid "`while`" +"An `if` expression should be used in the same way as the other expressions. " +"For example, when it is used in a `let` statement, the statement must be " +"terminated with a `;` as well. Remove the `;` before `println!` to see the " +"compiler error." msgstr "" -#: src/control-flow-basics/loops.md -msgid "" -"The [`while` keyword](https://doc.rust-lang.org/reference/expressions/loop-" -"expr.html#predicate-loops) works much like in other languages, executing the " -"loop body as long as the condition is true." +#: src/control-flow-basics/match.md +msgid "`match` can be used to check a value against one or more options:" msgstr "" -#: src/control-flow-basics/loops.md +#: src/control-flow-basics/match.md #, fuzzy -msgid "\"Final x: {x}\"" -msgstr "\" -> {x}\"" +msgid "\"one\"" +msgstr "\"none\"" -#: src/control-flow-basics/loops.md -#, fuzzy -msgid "`for`" -msgstr "`for`\\-løkker" +#: src/control-flow-basics/match.md +msgid "\"ten\"" +msgstr "" -#: src/control-flow-basics/loops.md -msgid "" -"The [`for` loop](https://doc.rust-lang.org/std/keyword.for.html) iterates " -"over ranges of values:" +#: src/control-flow-basics/match.md +msgid "\"one hundred\"" msgstr "" -#: src/control-flow-basics/loops.md -msgid "`loop`" +#: src/control-flow-basics/match.md +msgid "\"something else\"" msgstr "" -#: src/control-flow-basics/loops.md -msgid "" -"The [`loop` statement](https://doc.rust-lang.org/std/keyword.loop.html) just " -"loops forever, until a `break`." +#: src/control-flow-basics/match.md +msgid "Like `if` expressions, `match` can also return a value;" msgstr "" -#: src/control-flow-basics/loops.md -msgid "\"{i}\"" +#: src/control-flow-basics/match.md +msgid "\"The value of {flag} is {val}\"" msgstr "" -#: src/control-flow-basics/loops.md +#: src/control-flow-basics/match.md msgid "" -"We will discuss iteration later; for now, just stick to range expressions." +"`match` arms are evaluated from top to bottom, and the first one that " +"matches has its corresponding body executed." msgstr "" -#: src/control-flow-basics/loops.md +#: src/control-flow-basics/match.md msgid "" -"Note that the `for` loop only iterates to `4`. Show the `1..=5` syntax for " -"an inclusive range." +"There is no fall-through between cases the way that `switch` works in other " +"languages." msgstr "" -#: src/control-flow-basics/break-continue.md +#: src/control-flow-basics/match.md msgid "" -"If you want to exit any kind of loop early, use [`break`](https://doc.rust-" -"lang.org/reference/expressions/loop-expr.html#break-expressions). For " -"`loop`, this can take an optional expression that becomes the value of the " -"`loop` expression." +"The body of a `match` arm can be a single expression or a block. Technically " +"this is the same thing, since blocks are also expressions, but students may " +"not fully understand that symmetry at this point." msgstr "" -#: src/control-flow-basics/break-continue.md +#: src/control-flow-basics/match.md msgid "" -"If you want to immediately start the next iteration use [`continue`](https://" -"doc.rust-lang.org/reference/expressions/loop-expr.html#continue-expressions)." +"`match` expressions need to be exhaustive, meaning they either need to cover " +"all possible values or they need to have a default case such as `_`. " +"Exhaustiveness is easiest to demonstrate with enums, but enums haven't been " +"introduced yet. Instead we demonstrate matching on a `bool`, which is the " +"simplest primitive type." msgstr "" -#: src/control-flow-basics/break-continue.md -#, fuzzy -msgid "\"{result}\"" -msgstr "\"result: {:?}\"" - -#: src/control-flow-basics/break-continue.md +#: src/control-flow-basics/match.md msgid "" -"Both `continue` and `break` can optionally take a label argument which is " -"used to break out of nested loops:" +"This slide introduces `match` without talking about pattern matching, giving " +"students a chance to get familiar with the syntax without front-loading too " +"much information. We'll be talking about pattern matching in more detail " +"tomorrow, so try not to go into too much detail here." msgstr "" -#: src/control-flow-basics/break-continue.md -#, fuzzy -msgid "\"x: {x}, i: {i}\"" -msgstr "\"{x}, {abs_x}\"" +#: src/control-flow-basics/match.md src/references/dangling.md +#: src/user-defined-types/named-structs.md src/user-defined-types/enums.md +#: src/user-defined-types/static.md src/pattern-matching/infallible.md +#: src/pattern-matching/destructuring-structs.md +#: src/pattern-matching/let-control-flow/let-else.md src/closures/syntax.md +#: src/memory-management/review.md src/memory-management/move.md +#: src/memory-management/copy-types.md src/borrowing/shared.md +#: src/borrowing/borrowck.md src/borrowing/interior-mutability/refcell.md +#: src/iterators/motivation.md src/iterators/iterator.md +#: src/iterators/helpers.md src/iterators/collect.md +#: src/modules/encapsulation.md src/error-handling/result.md +#: src/error-handling/anyhow.md src/concurrency/async/state-machine.md +msgid "More to Explore" +msgstr "" -#: src/control-flow-basics/break-continue.md +#: src/control-flow-basics/match.md msgid "" -"In this case we break the outer loop after 3 iterations of the inner loop." +"To further motivate the usage of `match`, you can compare the examples to " +"their equivalents written with `if`. In the second case, matching on a " +"`bool`, an `if {} else {}` block is pretty similar. But in the first example " +"that checks multiple cases, a `match` expression can be more concise than " +"`if {} else if {} else if {} else`." msgstr "" -#: src/control-flow-basics/break-continue.md +#: src/control-flow-basics/match.md msgid "" -"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)." +"`match` also supports match guards, which allow you to add an arbitrary " +"logical condition that will get evaluated to determine if the match arm " +"should be taken. However talking about match guards requires explaining " +"about pattern matching, which we're trying to avoid on this slide." msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md -msgid "Blocks" -msgstr "Blokke" - -#: src/control-flow-basics/blocks-and-scopes.md -msgid "" -"A block in Rust contains a sequence of expressions, enclosed by braces `{}`. " -"Each block has a value and a type, which are those of the last expression of " -"the block:" +#: src/control-flow-basics/loops.md +msgid "There are three looping keywords in Rust: `while`, `loop`, and `for`:" msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md -msgid "\"y: {y}\"" +#: src/control-flow-basics/loops.md +msgid "`while`" msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md +#: src/control-flow-basics/loops.md msgid "" -"If the last expression ends with `;`, then the resulting value and type is " -"`()`." +"The [`while` keyword](https://doc.rust-lang.org/reference/expressions/loop-" +"expr.html#predicate-loops) works much like in other languages, executing the " +"loop body as long as the condition is true." msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md -msgid "Scopes and Shadowing" -msgstr "Virkefelt og overskyggede variabler" - -#: src/control-flow-basics/blocks-and-scopes.md -msgid "A variable's scope is limited to the enclosing block." +#: src/control-flow-basics/loops/for.md +msgid "" +"The [`for` loop](https://doc.rust-lang.org/std/keyword.for.html) iterates " +"over ranges of values or the items in a collection:" msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md +#: src/control-flow-basics/loops/for.md msgid "" -"You can shadow variables, both those from outer scopes and variables from " -"the same scope:" +"Under the hood `for` loops use a concept called \"iterators\" to handle " +"iterating over different kinds of ranges/collections. Iterators will be " +"discussed in more detail later." msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md -msgid "\"before: {a}\"" -msgstr "\"før: {a}\"" - -#: src/control-flow-basics/blocks-and-scopes.md src/std-traits/from-and-into.md -#: src/slices-and-lifetimes/solution.md -msgid "\"hello\"" -msgstr "\"hallo\"" +#: src/control-flow-basics/loops/for.md +msgid "" +"Note that the first `for` loop only iterates to `4`. Show the `1..=5` syntax " +"for an inclusive range." +msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md -msgid "\"inner scope: {a}\"" -msgstr "\"indre blok: {a}\"" +#: src/control-flow-basics/loops/loop.md +msgid "" +"The [`loop` statement](https://doc.rust-lang.org/std/keyword.loop.html) just " +"loops forever, until a `break`." +msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md -msgid "\"shadowed in inner scope: {a}\"" -msgstr "\"overskygget i indre blok: {a}\"" +#: src/control-flow-basics/loops/loop.md +msgid "" +"The `loop` statement works like a `while true` loop. Use it for things like " +"servers that will serve connections forever." +msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md -msgid "\"after: {a}\"" -msgstr "\"efter: {a}\"" +#: src/control-flow-basics/break-continue.md +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-basics/blocks-and-scopes.md +#: src/control-flow-basics/break-continue.md 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`." +"If you want to exit any kind of loop early, use [`break`](https://doc.rust-" +"lang.org/reference/expressions/loop-expr.html#break-expressions). With " +"`loop`, this can take an optional expression that becomes the value of the " +"`loop` expression." msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md +#: src/control-flow-basics/break-continue.md msgid "" -"Show that a variable's scope is limited by adding a `b` in the inner block " -"in the last example, and then trying to access it outside that block." +"Note that `loop` is the only looping construct that can return a non-trivial " +"value. This is because it's guaranteed to only return at a `break` statement " +"(unlike `while` and `for` loops, which can also return when the condition " +"fails)." msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md +#: src/control-flow-basics/break-continue/labels.md msgid "" -"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." +"Both `continue` and `break` can optionally take a label argument that is " +"used to break out of nested loops:" msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md -msgid "A shadowing variable can have a different type." +#: src/control-flow-basics/break-continue/labels.md +msgid "Labeled break also works on arbitrary blocks, e.g." msgstr "" -#: src/control-flow-basics/blocks-and-scopes.md -msgid "" -"Shadowing looks obscure at first, but is convenient for holding on to values " -"after `.unwrap()`." +#: src/control-flow-basics/break-continue/labels.md +msgid "\"This line gets skipped\"" msgstr "" #: src/control-flow-basics/functions.md @@ -3251,7 +3553,7 @@ msgstr "" #: src/control-flow-basics/functions.md msgid "" "Some functions have no return value, and return the 'unit type', `()`. The " -"compiler will infer this if the `-> ()` return type is omitted." +"compiler will infer this if the return type is omitted." msgstr "" #: src/control-flow-basics/functions.md @@ -3300,12 +3602,6 @@ msgid "" "panic." msgstr "" -#: src/control-flow-basics/macros.md -msgid "" -"`unreachable!()` marks a bit of code as unreachable. If executed, it will " -"panic." -msgstr "" - #: src/control-flow-basics/macros.md #, fuzzy msgid "\"{n}! = {}\"" @@ -3324,285 +3620,175 @@ msgid "" "use of derive macros." msgstr "" -#: src/control-flow-basics/exercise.md -msgid "" -"The [Collatz Sequence](https://en.wikipedia.org/wiki/Collatz_conjecture) is " -"defined as follows, for an arbitrary n" +#: src/control-flow-basics/macros.md src/pattern-matching/match.md +msgid "More To Explore" msgstr "" -#: src/control-flow-basics/exercise.md -msgid "1" +#: src/control-flow-basics/macros.md +msgid "" +"There are a number of other useful macros provided by the standard library. " +"Some other examples you can share with students if they want to know more:" msgstr "" -#: src/control-flow-basics/exercise.md -msgid " greater than zero:" +#: src/control-flow-basics/macros.md +msgid "" +"[`assert!`](https://doc.rust-lang.org/stable/std/macro.assert.html) and " +"related macros can be used to add assertions to your code. These are used " +"heavily in writing tests." msgstr "" -#: src/control-flow-basics/exercise.md -msgid "If _n" +#: src/control-flow-basics/macros.md +msgid "" +"[`unreachable!`](https://doc.rust-lang.org/stable/std/" +"macro.unreachable.html) is used to mark a branch of control flow that should " +"never be hit." msgstr "" -#: src/control-flow-basics/exercise.md -msgid "i" +#: src/control-flow-basics/macros.md +msgid "" +"[`eprintln!`](https://doc.rust-lang.org/stable/std/macro.eprintln.html) " +"allows you to print to stderr." msgstr "" #: src/control-flow-basics/exercise.md -msgid "_ is 1, then the sequence terminates at _n" +msgid "" +"The [Collatz Sequence](https://en.wikipedia.org/wiki/Collatz_conjecture) is " +"defined as follows, for an arbitrary n1 greater than zero:" msgstr "" #: src/control-flow-basics/exercise.md -msgid "_." +msgid "" +"If _ni_ is 1, then the sequence terminates at _ni_." msgstr "" #: src/control-flow-basics/exercise.md -msgid "_ is even, then _n" +msgid "If _ni_ is even, then _ni+1 = ni / 2_." msgstr "" #: src/control-flow-basics/exercise.md -msgid "i+1" +msgid "" +"If _ni_ is odd, then _ni+1 = 3 * ni + 1_." msgstr "" #: src/control-flow-basics/exercise.md -msgid " = n" +msgid "For example, beginning with _n1_ = 3:" msgstr "" #: src/control-flow-basics/exercise.md -msgid " / 2_." +msgid "3 is odd, so _n2_ = 3 * 3 + 1 = 10;" msgstr "" #: src/control-flow-basics/exercise.md -msgid "_ is odd, then _n" +msgid "10 is even, so _n3_ = 10 / 2 = 5;" msgstr "" #: src/control-flow-basics/exercise.md -msgid " = 3 * n" +msgid "5 is odd, so _n4_ = 3 * 5 + 1 = 16;" msgstr "" #: src/control-flow-basics/exercise.md -msgid " + 1_." +msgid "16 is even, so _n5_ = 16 / 2 = 8;" msgstr "" #: src/control-flow-basics/exercise.md -msgid "For example, beginning with _n" +msgid "8 is even, so _n6_ = 8 / 2 = 4;" msgstr "" #: src/control-flow-basics/exercise.md -msgid "_ = 3:" +msgid "4 is even, so _n7_ = 4 / 2 = 2;" msgstr "" #: src/control-flow-basics/exercise.md -msgid "3 is odd, so _n" +msgid "2 is even, so _n8_ = 1; and" msgstr "" #: src/control-flow-basics/exercise.md -msgid "2" +msgid "the sequence terminates." msgstr "" #: src/control-flow-basics/exercise.md -msgid "_ = 3 * 3 + 1 = 10;" +msgid "" +"Write a function to calculate the length of the Collatz sequence for a given " +"initial `n`." msgstr "" -#: src/control-flow-basics/exercise.md -msgid "10 is even, so _n" +#: src/control-flow-basics/exercise.md src/control-flow-basics/solution.md +msgid "/// Determine the length of the collatz sequence beginning at `n`.\n" msgstr "" -#: src/control-flow-basics/exercise.md src/bare-metal/aps/better-uart.md -msgid "3" -msgstr "" +#: src/control-flow-basics/exercise.md src/control-flow-basics/solution.md +msgid "\"Length: {}\"" +msgstr "\"Længde: {}\"" -#: src/control-flow-basics/exercise.md -msgid "_ = 10 / 2 = 5;" +#: src/control-flow-basics/exercise.md src/control-flow-basics/solution.md +msgid "// should be 15\n" msgstr "" -#: src/control-flow-basics/exercise.md -msgid "5 is odd, so _n" -msgstr "" +#: src/welcome-day-1-afternoon.md src/welcome-day-2-afternoon.md +#: src/welcome-day-3-afternoon.md src/welcome-day-4-afternoon.md +#, fuzzy +msgid "Welcome Back" +msgstr "Velkommen" -#: src/control-flow-basics/exercise.md src/bare-metal/aps/better-uart.md -msgid "4" +#: src/welcome-day-1-afternoon.md src/welcome-day-2.md +msgid "" +"Including 10 minute breaks, this session should take about 2 hours and 45 " +"minutes. It contains:" msgstr "" -#: src/control-flow-basics/exercise.md -msgid "_ = 3 * 5 + 1 = 16;" +#: src/tuples-and-arrays.md +msgid "This segment should take about 35 minutes. It contains:" msgstr "" -#: src/control-flow-basics/exercise.md -msgid "16 is even, so _n" +#: src/tuples-and-arrays.md +msgid "" +"We have seen how primitive types work in Rust. Now it's time for you to " +"start building new composite types." msgstr "" -#: src/control-flow-basics/exercise.md -msgid "5" +#: src/tuples-and-arrays/arrays.md +msgid "" +"Arrays can also be initialized using the shorthand syntax, e.g. `[0; 1024]`. " +"This can be useful when you want to initialize all elements to the same " +"value, or if you have a large array that would be hard to initialize " +"manually." msgstr "" -#: src/control-flow-basics/exercise.md -msgid "_ = 16 / 2 = 8;" +#: src/tuples-and-arrays/arrays.md +msgid "" +"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. Slices, which have a size determined at runtime, are " +"covered later." msgstr "" -#: src/control-flow-basics/exercise.md -msgid "8 is even, so _n" -msgstr "" - -#: src/control-flow-basics/exercise.md src/bare-metal/aps/better-uart.md -msgid "6" -msgstr "" - -#: src/control-flow-basics/exercise.md -msgid "_ = 8 / 2 = 4;" -msgstr "" - -#: src/control-flow-basics/exercise.md -msgid "4 is even, so _n" -msgstr "" - -#: src/control-flow-basics/exercise.md -msgid "7" -msgstr "" - -#: src/control-flow-basics/exercise.md -msgid "_ = 4 / 2 = 2;" -msgstr "" - -#: src/control-flow-basics/exercise.md -msgid "2 is even, so _n" -msgstr "" - -#: src/control-flow-basics/exercise.md src/bare-metal/aps/better-uart.md -msgid "8" -msgstr "" - -#: src/control-flow-basics/exercise.md -msgid "_ = 1; and" -msgstr "" - -#: src/control-flow-basics/exercise.md -msgid "the sequence terminates." -msgstr "" - -#: src/control-flow-basics/exercise.md +#: src/tuples-and-arrays/arrays.md msgid "" -"Write a function to calculate the length of the collatz sequence for a given " -"initial `n`." -msgstr "" - -#: src/control-flow-basics/exercise.md src/control-flow-basics/solution.md -msgid "/// Determine the length of the collatz sequence beginning at `n`.\n" +"Try accessing an out-of-bounds array element. The compiler is able to " +"determine that the index is unsafe, and will not compile the code:" msgstr "" -#: src/control-flow-basics/solution.md src/concurrency/scoped-threads.md -msgid "\"Length: {}\"" -msgstr "\"Længde: {}\"" - -#: src/welcome-day-1-afternoon.md src/welcome-day-2-afternoon.md -#: src/welcome-day-3-afternoon.md src/welcome-day-4-afternoon.md +#: src/tuples-and-arrays/arrays.md #, fuzzy -msgid "Welcome Back" -msgstr "Velkommen" - -#: src/welcome-day-1-afternoon.md -msgid "[Tuples and Arrays](./tuples-and-arrays.md) (1 hour)" -msgstr "" - -#: src/welcome-day-1-afternoon.md -msgid "[References](./references.md) (50 minutes)" -msgstr "" - -#: src/welcome-day-1-afternoon.md -msgid "[User-Defined Types](./user-defined-types.md) (50 minutes)" -msgstr "" - -#: src/welcome-day-1-afternoon.md -msgid "" -"Including 10 minute breaks, this session should take about 2 hours and 55 " -"minutes" -msgstr "" - -#: src/tuples-and-arrays.md -msgid "" -"[Tuples and Arrays](./tuples-and-arrays/tuples-and-arrays.md) (10 minutes)" -msgstr "" - -#: src/tuples-and-arrays.md -msgid "[Array Iteration](./tuples-and-arrays/iteration.md) (3 minutes)" -msgstr "" - -#: src/tuples-and-arrays.md -msgid "[Pattern Matching](./tuples-and-arrays/match.md) (10 minutes)" -msgstr "" - -#: src/tuples-and-arrays.md -msgid "[Destructuring](./tuples-and-arrays/destructuring.md) (5 minutes)" -msgstr "" - -#: src/tuples-and-arrays.md -msgid "[Exercise: Nested Arrays](./tuples-and-arrays/exercise.md) (30 minutes)" -msgstr "" - -#: src/tuples-and-arrays/tuples-and-arrays.md -msgid "" -"Tuples and arrays are the first \"compound\" types we have seen. All " -"elements of an array have the same type, while tuples can accommodate " -"different types. Both types have a size fixed at compile time." -msgstr "" - -#: src/tuples-and-arrays/tuples-and-arrays.md -#: src/tuples-and-arrays/destructuring.md -msgid "Arrays" -msgstr "" - -#: src/tuples-and-arrays/tuples-and-arrays.md -msgid "`[T; N]`" -msgstr "" - -#: src/tuples-and-arrays/tuples-and-arrays.md -msgid "`[20, 30, 40]`, `[0; 3]`" -msgstr "" - -#: src/tuples-and-arrays/tuples-and-arrays.md -#: src/tuples-and-arrays/destructuring.md -msgid "Tuples" -msgstr "" - -#: src/tuples-and-arrays/tuples-and-arrays.md -msgid "`()`, `(T,)`, `(T1, T2)`, ..." -msgstr "" - -#: src/tuples-and-arrays/tuples-and-arrays.md -msgid "`()`, `('x',)`, `('x', 1.2)`, ..." -msgstr "" - -#: src/tuples-and-arrays/tuples-and-arrays.md -msgid "Array assignment and access:" -msgstr "" - -#: src/tuples-and-arrays/tuples-and-arrays.md -msgid "Tuple assignment and access:" -msgstr "" - -#: src/tuples-and-arrays/tuples-and-arrays.md -msgid "Arrays:" -msgstr "" - -#: src/tuples-and-arrays/tuples-and-arrays.md -msgid "" -"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. Slices, which have a size determined at runtime, are " -"covered later." -msgstr "" +msgid "\"a: {a:?}\"" +msgstr "\"a: {a}\"" -#: src/tuples-and-arrays/tuples-and-arrays.md +#: src/tuples-and-arrays/arrays.md msgid "" -"Try accessing an out-of-bounds array element. Array accesses are checked at " -"runtime. Rust can usually optimize these checks away, and they can be " -"avoided using unsafe Rust." +"Array accesses are checked at runtime. Rust can usually optimize these " +"checks away; meaning if the compiler can prove the access is safe, it " +"removes the runtime check for better performance. They can be avoided using " +"unsafe Rust. The optimization is so good that it's hard to give an example " +"of runtime checks failing. The following code will compile but panic at " +"runtime:" msgstr "" -#: src/tuples-and-arrays/tuples-and-arrays.md +#: src/tuples-and-arrays/arrays.md msgid "We can use literals to assign values to arrays." msgstr "" -#: src/tuples-and-arrays/tuples-and-arrays.md +#: src/tuples-and-arrays/arrays.md msgid "" "The `println!` macro asks for the debug implementation with the `?` format " "parameter: `{}` gives the default output, `{:?}` gives the debug output. " @@ -3611,42 +3797,38 @@ msgid "" "here." msgstr "" -#: src/tuples-and-arrays/tuples-and-arrays.md +#: src/tuples-and-arrays/arrays.md msgid "" "Adding `#`, eg `{a:#?}`, invokes a \"pretty printing\" format, which can be " "easier to read." msgstr "" -#: src/tuples-and-arrays/tuples-and-arrays.md -msgid "Tuples:" +#: src/tuples-and-arrays/arrays.md +msgid "" +"Arrays are not heap-allocated. They are regular values with a fixed size " +"known at compile time, meaning they go on the stack. This can be different " +"from what students expect if they come from a garbage-collected language, " +"where arrays may be heap allocated by default." msgstr "" -#: src/tuples-and-arrays/tuples-and-arrays.md +#: src/tuples-and-arrays/tuples.md msgid "Like arrays, tuples have a fixed length." msgstr "" -#: src/tuples-and-arrays/tuples-and-arrays.md +#: src/tuples-and-arrays/tuples.md msgid "Tuples group together values of different types into a compound type." msgstr "" -#: src/tuples-and-arrays/tuples-and-arrays.md +#: src/tuples-and-arrays/tuples.md msgid "" "Fields of a tuple can be accessed by the period and the index of the value, " "e.g. `t.0`, `t.1`." msgstr "" -#: src/tuples-and-arrays/tuples-and-arrays.md +#: src/tuples-and-arrays/tuples.md 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/tuples-and-arrays/tuples-and-arrays.md -msgid "" -"You can think of it as `void` that can be familiar to you from other " -"programming languages." +"The empty tuple `()` is referred to as the \"unit type\" and signifies " +"absence of a return value, akin to `void` in other languages." msgstr "" #: src/tuples-and-arrays/iteration.md @@ -3662,210 +3844,53 @@ msgstr "" #: src/tuples-and-arrays/iteration.md msgid "" "The `assert_ne!` macro is new here. There are also `assert_eq!` and `assert!" -"` macros. These are always checked while, debug-only variants like " +"` macros. These are always checked, while debug-only variants like " "`debug_assert!` compile to nothing in release builds." msgstr "" -#: src/tuples-and-arrays/match.md -msgid "" -"The `match` keyword lets you match a value against one or more _patterns_. " -"The comparisons are done from top to bottom and the first match wins." -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "The patterns can be simple values, similarly to `switch` in C and C++:" -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "'x'" -msgstr "'x'" - -#: src/tuples-and-arrays/match.md -msgid "'q'" -msgstr "'q'" - -#: src/tuples-and-arrays/match.md -msgid "\"Quitting\"" -msgstr "" - -#: src/tuples-and-arrays/match.md src/std-traits/solution.md -#: src/error-handling/exercise.md src/error-handling/solution.md -msgid "'a'" -msgstr "'a'" - -#: src/tuples-and-arrays/match.md -msgid "'s'" -msgstr "'s'" - -#: src/tuples-and-arrays/match.md -msgid "'w'" -msgstr "'w'" - -#: src/tuples-and-arrays/match.md -msgid "'d'" -msgstr "'d'" - -#: src/tuples-and-arrays/match.md -msgid "\"Moving around\"" -msgstr "" - -#: src/tuples-and-arrays/match.md src/error-handling/exercise.md -#: src/error-handling/solution.md -msgid "'0'" -msgstr "'0'" - -#: src/tuples-and-arrays/match.md src/error-handling/exercise.md -#: src/error-handling/solution.md -msgid "'9'" -msgstr "'9'" - -#: src/tuples-and-arrays/match.md -msgid "\"Number input\"" -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "\"Lowercase: {key}\"" -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "\"Something else\"" -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "" -"The `_` pattern is a wildcard pattern which matches any value. The " -"expressions _must_ be irrefutable, meaning that it covers every possibility, " -"so `_` is often used as the final catch-all case." -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "" -"Match can be used as an expression. Just like `if`, 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/tuples-and-arrays/match.md -msgid "" -"A variable in the pattern (`key` in this example) will create a binding that " -"can be used within the match arm." -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "A match guard causes the arm to match only if the condition is true." -msgstr "" - -#: src/tuples-and-arrays/match.md src/user-defined-types/named-structs.md -#: src/user-defined-types/enums.md src/methods-and-traits/methods.md -msgid "Key Points:" -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "" -"You might point out how some specific characters are being used when in a " -"pattern" -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "`|` as an `or`" -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "`..` can expand as much as it needs to be" -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "`1..=5` represents an inclusive range" -msgstr "" - -#: src/tuples-and-arrays/match.md -msgid "`_` is a wild card" -msgstr "" - -#: src/tuples-and-arrays/match.md -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." -msgstr "" - -#: src/tuples-and-arrays/match.md -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/tuples-and-arrays/match.md -msgid "" -"The condition defined in the guard applies to every expression in a pattern " -"with an `|`." -msgstr "" - #: src/tuples-and-arrays/destructuring.md msgid "" -"Destructuring is a way of extracting data from a data structure by writing a " -"pattern that is matched up to the data structure, binding variables to " -"subcomponents of the data structure." -msgstr "" - -#: src/tuples-and-arrays/destructuring.md -msgid "You can destructure tuples and arrays by matching on their elements:" -msgstr "" - -#: src/tuples-and-arrays/destructuring.md -msgid "\"on Y axis\"" -msgstr "" - -#: src/tuples-and-arrays/destructuring.md -msgid "\"on X axis\"" +"Rust supports using pattern matching to destructure a larger value like a " +"tuple into its constituent parts:" msgstr "" #: src/tuples-and-arrays/destructuring.md -msgid "\"left of Y axis\"" -msgstr "" - -#: src/tuples-and-arrays/destructuring.md -msgid "\"below X axis\"" -msgstr "" - -#: src/tuples-and-arrays/destructuring.md -msgid "\"first quadrant\"" -msgstr "" - -#: src/tuples-and-arrays/destructuring.md -msgid "\"Tell me about {triple:?}\"" -msgstr "\"Fortæl mig om {triple:?}\"" - -#: src/tuples-and-arrays/destructuring.md -msgid "\"First is 0, y = {y}, and z = {z}\"" -msgstr "" +#, fuzzy +msgid "\"{tuple:?}: {}\"" +msgstr "\"int: {}\"" #: src/tuples-and-arrays/destructuring.md -msgid "\"First is 1 and the rest were ignored\"" +msgid "\"ordered\"" msgstr "" #: src/tuples-and-arrays/destructuring.md -msgid "\"All elements were ignored\"" +msgid "\"unordered\"" msgstr "" #: src/tuples-and-arrays/destructuring.md -msgid "Create a new array pattern using `_` to represent an element." +msgid "" +"The patterns used here are \"irrefutable\", meaning that the compiler can " +"statically verify that the value on the right of `=` has the same structure " +"as the pattern." msgstr "" #: src/tuples-and-arrays/destructuring.md -msgid "Add more values to the array." +msgid "" +"A variable name is an irrefutable pattern that always matches any value, " +"hence why we can also use `let` to declare a single variable." msgstr "" #: src/tuples-and-arrays/destructuring.md msgid "" -"Point out that how `..` will expand to account for different number of " -"elements." +"Rust also supports using patterns in conditionals, allowing for equality " +"comparison and destructuring to happen at the same time. This form of " +"pattern matching will be discussed in more detail later." msgstr "" #: src/tuples-and-arrays/destructuring.md -msgid "Show matching against the tail with patterns `[.., b]` and `[a@..,b]`" +msgid "" +"Edit the examples above to show the compiler error when the pattern doesn't " +"match the value being matched on." msgstr "" #: src/tuples-and-arrays/exercise.md @@ -3878,65 +3903,41 @@ msgstr "" #: src/tuples-and-arrays/exercise.md msgid "" -"Use an array such as the above to write a function `transpose` which will " -"transpose a matrix (turn rows into columns):" -msgstr "" - -#: src/tuples-and-arrays/exercise.md -msgid "Hard-code both functions to operate on 3 × 3 matrices." +"Use an array such as the above to write a function `transpose` that " +"transposes a matrix (turns rows into columns):" msgstr "" #: src/tuples-and-arrays/exercise.md msgid "" "Copy the code below to and implement the " -"functions:" -msgstr "" - -#: src/tuples-and-arrays/exercise.md src/borrowing/exercise.md -#: src/unsafe-rust/exercise.md -msgid "// TODO: remove this when you're done with your implementation.\n" +"function. This function only operates on 3x3 matrices." msgstr "" #: src/tuples-and-arrays/exercise.md src/tuples-and-arrays/solution.md msgid "// <-- the comment makes rustfmt add a newline\n" msgstr "" -#: src/tuples-and-arrays/exercise.md src/tuples-and-arrays/solution.md -#, fuzzy -msgid "\"matrix: {:#?}\"" -msgstr "\"matrix:\"" - -#: src/tuples-and-arrays/exercise.md src/tuples-and-arrays/solution.md -#, fuzzy -msgid "\"transposed: {:#?}\"" -msgstr "\"transponeret:\"" - -#: src/tuples-and-arrays/solution.md -msgid "//\n" -msgstr "" - -#: src/references.md -msgid "[Shared References](./references/shared.md) (10 minutes)" -msgstr "" - -#: src/references.md -msgid "[Exclusive References](./references/exclusive.md) (10 minutes)" +#: src/references.md src/smart-pointers.md src/borrowing.md src/iterators.md +#: src/error-handling.md src/concurrency/async-pitfalls.md +msgid "This segment should take about 55 minutes. It contains:" msgstr "" -#: src/references.md -msgid "[Exercise: Geometry](./references/exercise.md) (30 minutes)" +#: src/references/shared.md +msgid "" +"A reference provides a way to access another value without taking ownership " +"of the value, and is also called \"borrowing\". Shared references are read-" +"only, and the referenced data cannot change." msgstr "" -#: src/references.md src/user-defined-types.md src/pattern-matching.md -msgid "This segment should take about 50 minutes" -msgstr "" +#: src/references/shared.md src/std-traits/solution.md +#, fuzzy +msgid "'A'" +msgstr "'x'" #: src/references/shared.md -msgid "" -"A reference provides a way to access another value without taking " -"responsibility for the value, and is also called \"borrowing\". Shared " -"references are read-only, and the referenced data cannot change." -msgstr "" +#, fuzzy +msgid "'B'" +msgstr "'x'" #: src/references/shared.md msgid "" @@ -3946,7 +3947,8 @@ msgid "" msgstr "" #: src/references/shared.md -msgid "Rust will statically forbid dangling references:" +msgid "" +"References can never be null in Rust, so null checking is not necessary." msgstr "" #: src/references/shared.md @@ -3968,15 +3970,15 @@ msgstr "" #: src/references/shared.md msgid "" -"Rust does not automatically create references for you - the `&` is always " -"required." +"Explicit referencing with `&` is usually required. However, Rust performs " +"automatic referencing and dereferencing when invoking methods." msgstr "" #: src/references/shared.md msgid "" "Rust will auto-dereference in some cases, in particular when invoking " -"methods (try `r.count_ones()`). There is no need for an `->` operator like " -"in C++." +"methods (try `r.is_ascii()`). There is no need for an `->` operator like in " +"C++." msgstr "" #: src/references/shared.md @@ -3996,13 +3998,13 @@ msgstr "" #: src/references/shared.md msgid "" "Rust is tracking the lifetimes of all references to ensure they live long " -"enough. Dangling references cannot occur in safe Rust. `x_axis` would return " -"a reference to `point`, but `point` will be deallocated when the function " -"returns, so this will not compile." +"enough. Dangling references cannot occur in safe Rust." msgstr "" #: src/references/shared.md -msgid "We will talk more about borrowing when we get to ownership." +msgid "" +"We will talk more about borrowing and preventing dangling references when we " +"get to ownership." msgstr "" #: src/references/exclusive.md @@ -4023,9 +4025,191 @@ msgstr "" #: src/references/exclusive.md msgid "" "Be sure to note the difference between `let mut x_coord: &i32` and `let " -"x_coord: &mut i32`. The first one represents a shared reference which can be " -"bound to different values, while the second represents an exclusive " -"reference to a mutable value." +"x_coord: &mut i32`. The first one is a shared reference that can be bound to " +"different values, while the second is an exclusive reference to a mutable " +"value." +msgstr "" + +#: src/references/slices.md +msgid "A slice gives you a view into a larger collection:" +msgstr "" + +#: src/references/slices.md +msgid "Slices borrow data from the sliced type." +msgstr "" + +#: src/references/slices.md +msgid "" +"We create a slice by borrowing `a` and specifying the starting and ending " +"indexes in brackets." +msgstr "" + +#: src/references/slices.md +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/references/slices.md +msgid "" +"The same is true for the last index, so `&a[2..a.len()]` and `&a[2..]` are " +"identical." +msgstr "" + +#: src/references/slices.md +msgid "" +"To easily create a slice of the full array, we can therefore use `&a[..]`." +msgstr "" + +#: src/references/slices.md +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/references/slices.md +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/references/slices.md +msgid "You can't \"grow\" a slice once it's created:" +msgstr "" + +#: src/references/slices.md +msgid "" +"You can't append elements of the slice, since it doesn't own the backing " +"buffer." +msgstr "" + +#: src/references/slices.md +msgid "" +"You can't grow a slice to point to a larger section of the backing buffer. A " +"slice does not have information about the length of the underlying buffer " +"and so you can't know how large the slice can be grown." +msgstr "" + +#: src/references/slices.md +msgid "" +"To get a larger slice you have to back to the original buffer and create a " +"larger slice from there." +msgstr "" + +#: src/references/strings.md +msgid "We can now understand the two string types in Rust:" +msgstr "" + +#: src/references/strings.md +msgid "`&str` is a slice of UTF-8 encoded bytes, similar to `&[u8]`." +msgstr "" + +#: src/references/strings.md +msgid "" +"`String` is an owned buffer of UTF-8 encoded bytes, similar to `Vec`." +msgstr "" + +#: src/references/strings.md src/std-traits/read-and-write.md +msgid "\"World\"" +msgstr "\"Verden\"" + +#: src/references/strings.md +msgid "\"s1: {s1}\"" +msgstr "\"s1: {s1}\"" + +#: src/references/strings.md +msgid "\"Hello \"" +msgstr "\"Hallo \"" + +#: src/references/strings.md +msgid "\"s2: {s2}\"" +msgstr "\"s2: {s2}\"" + +#: src/references/strings.md +msgid "\"s3: {s3}\"" +msgstr "\"s3: {s3}\"" + +#: src/references/strings.md +msgid "" +"`&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/references/strings.md +msgid "" +"Rust's `String` type is a wrapper around a vector of bytes. As with a " +"`Vec`, it is owned." +msgstr "" + +#: src/references/strings.md +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/references/strings.md +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/references/strings.md +msgid "" +"You can borrow `&str` slices from `String` via `&` and optionally range " +"selection. If you select a byte range that is not aligned to character " +"boundaries, the expression will panic. The `chars` iterator iterates over " +"characters and is preferred over trying to get character boundaries right." +msgstr "" + +#: src/references/strings.md +msgid "" +"For C++ programmers: think of `&str` as `std::string_view` 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/references/strings.md +msgid "Byte strings literals allow you to create a `&[u8]` value directly:" +msgstr "" + +#: src/references/strings.md +msgid "" +"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/references/dangling.md +msgid "" +"Rust enforces a number of rules for references that make them always safe to " +"use. One rule is that references can never be `null`, making them safe to " +"use without `null` checks. The other rule we'll look at for now is that " +"references can't _outlive_ the data they point to." +msgstr "" + +#: src/references/dangling.md +msgid "" +"This slide gets students thinking about references as not simply being " +"pointers, since Rust has different rules for references than other languages." +msgstr "" + +#: src/references/dangling.md +msgid "" +"We'll look at the rest of Rust's borrowing rules on day 3 when we talk about " +"Rust's ownership system." +msgstr "" + +#: src/references/dangling.md +msgid "" +"Rust's equivalent of nullability is the `Option` type, which can be used to " +"make any type \"nullable\" (not just references/pointers). We haven't yet " +"introduced enums or pattern matching, though, so try not to go into too much " +"detail about this here." msgstr "" #: src/references/exercise.md @@ -4076,30 +4260,24 @@ msgid "" "direction.\n" msgstr "" -#: src/user-defined-types.md -msgid "[Named Structs](./user-defined-types/named-structs.md) (10 minutes)" -msgstr "" - -#: src/user-defined-types.md -msgid "[Tuple Structs](./user-defined-types/tuple-structs.md) (10 minutes)" -msgstr "" - -#: src/user-defined-types.md -msgid "[Enums](./user-defined-types/enums.md) (5 minutes)" -msgstr "" - -#: src/user-defined-types.md +#: src/references/solution.md msgid "" -"[Static and Const](./user-defined-types/static-and-const.md) (5 minutes)" +"Note that in `normalize` we were able to do `*item /= mag` to modify each " +"element. This is because we're iterating using a mutable reference to an " +"array, which causes the `for` loop to give mutable references to each " +"element." msgstr "" -#: src/user-defined-types.md -msgid "[Type Aliases](./user-defined-types/aliases.md) (2 minutes)" +#: src/references/solution.md +msgid "" +"It is also possible to take slice references here, e.g., `fn " +"magnitude(vector: &[f64]) -> f64`. This makes the function more general, at " +"the cost of a runtime length check." msgstr "" -#: src/user-defined-types.md -msgid "" -"[Exercise: Elevator Events](./user-defined-types/exercise.md) (15 minutes)" +#: src/user-defined-types.md src/std-types.md src/std-traits.md +#: src/memory-management.md +msgid "This segment should take about 1 hour. It contains:" msgstr "" #: src/user-defined-types/named-structs.md @@ -4119,9 +4297,10 @@ msgstr "\"Peter\"" msgid "\"Avery\"" msgstr "" -#: src/user-defined-types/named-structs.md -msgid "\"Jackie\"" -msgstr "\"Jackie\"" +#: src/user-defined-types/named-structs.md src/user-defined-types/enums.md +#: src/pattern-matching/match.md src/methods-and-traits/methods.md +msgid "Key Points:" +msgstr "" #: src/user-defined-types/named-structs.md msgid "Structs work like in C or C++." @@ -4162,9 +4341,29 @@ msgstr "" #: src/user-defined-types/named-structs.md msgid "" -"The syntax `..avery` 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." +"Struct fields do not support default values. Default values are specified by " +"implementing the `Default` trait which we will cover later." +msgstr "" + +#: src/user-defined-types/named-structs.md +msgid "You can also demonstrate the struct update syntax here:" +msgstr "" + +#: src/user-defined-types/named-structs.md +msgid "\"Jackie\"" +msgstr "\"Jackie\"" + +#: src/user-defined-types/named-structs.md +msgid "" +"It 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/user-defined-types/named-structs.md +msgid "" +"It is mainly used in combination with the `Default` trait. We will talk " +"about struct update syntax in more detail on the slide on the `Default` " +"trait, so we don't need to talk about it here unless students ask about it." msgstr "" #: src/user-defined-types/tuple-structs.md @@ -4186,7 +4385,7 @@ msgstr "" #: src/user-defined-types/tuple-structs.md #: src/android/interoperability/cpp/cpp-bridge.md #: src/bare-metal/microcontrollers/type-state.md -#: src/async/pitfalls/cancellation.md +#: src/concurrency/async-pitfalls/cancellation.md msgid "// ...\n" msgstr "// ...\n" @@ -4206,6 +4405,12 @@ msgid "" "to validate it again at every use: `PhoneNumber(String)` or `OddNumber(u32)`." msgstr "" +#: src/user-defined-types/tuple-structs.md +msgid "" +"The newtype pattern is covered extensively in the [\"Idiomatic Rust\" module]" +"(../idiomatic/leveraging-the-type-system/newtype-pattern.md)." +msgstr "" + #: src/user-defined-types/tuple-structs.md msgid "" "Demonstrate how to add a `f64` value to a `Newtons` type by accessing the " @@ -4214,18 +4419,34 @@ msgstr "" #: src/user-defined-types/tuple-structs.md msgid "" -"Rust generally doesn’t like inexplicit things, like automatic unwrapping or " -"for instance using booleans as integers." +"Rust generally avoids implicit conversions, like automatic unwrapping or " +"using booleans as integers." +msgstr "" + +#: src/user-defined-types/tuple-structs.md +msgid "" +"Operator overloading is discussed on Day 2 ([Standard Library Traits](../std-" +"traits.md))." +msgstr "" + +#: src/user-defined-types/tuple-structs.md +msgid "" +"When a tuple struct has zero fields, the `()` can be omitted. The result is " +"a zero-sized type (ZST), of which there is only one value (the name of the " +"type)." msgstr "" #: src/user-defined-types/tuple-structs.md -msgid "Operator overloading is discussed on Day 3 (generics)." +msgid "" +"This is common for types that implement some behavior but have no data " +"(imagine a `NullReader` that implements some reader behavior by always " +"returning EOF)." msgstr "" #: src/user-defined-types/tuple-structs.md msgid "" -"The example is a subtle reference to the [Mars Climate Orbiter](https://en." -"wikipedia.org/wiki/Mars_Climate_Orbiter) failure." +"The example is a subtle reference to the [Mars Climate Orbiter](https://" +"en.wikipedia.org/wiki/Mars_Climate_Orbiter) failure." msgstr "" #: src/user-defined-types/enums.md @@ -4247,7 +4468,7 @@ msgid "// Struct variant\n" msgstr "" #: src/user-defined-types/enums.md -msgid "\"On this turn: {:?}\"" +msgid "\"On this turn: {player_move:?}\"" msgstr "" #: src/user-defined-types/enums.md @@ -4311,12 +4532,6 @@ msgid "" "bytes." msgstr "" -#: src/user-defined-types/enums.md src/user-defined-types/static-and-const.md -#: src/memory-management/review.md src/memory-management/move.md -#: src/smart-pointers/box.md src/borrowing/shared.md -msgid "More to Explore" -msgstr "" - #: src/user-defined-types/enums.md msgid "" "Rust has several optimizations it can employ to make enums take up less " @@ -4337,54 +4552,72 @@ msgid "" "guarantees regarding this representation, therefore this is totally unsafe." msgstr "" -#: src/user-defined-types/static-and-const.md +#: src/user-defined-types/aliases.md msgid "" -"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." +"A type alias creates a name for another type. The two types can be used " +"interchangeably." +msgstr "" + +#: src/user-defined-types/aliases.md +msgid "// Aliases are more useful with long, complex types:\n" +msgstr "" + +#: src/user-defined-types/aliases.md +msgid "" +"A [newtype](tuple-structs.html) is often a better alternative since it " +"creates a distinct type. Prefer `struct InventoryCount(usize)` to `type " +"InventoryCount = usize`." +msgstr "" + +#: src/user-defined-types/aliases.md +msgid "C programmers will recognize this as similar to a `typedef`." msgstr "" -#: src/user-defined-types/static-and-const.md +#: src/user-defined-types/const.md msgid "`const`" msgstr "" -#: src/user-defined-types/static-and-const.md +#: src/user-defined-types/const.md msgid "" -"Constant variables are evaluated at compile time and their values are " -"inlined wherever they are used:" +"Constants are evaluated at compile time and their values are inlined " +"wherever they are used:" msgstr "" -#: src/user-defined-types/static-and-const.md +#: src/user-defined-types/const.md 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/user-defined-types/static-and-const.md +#: src/user-defined-types/const.md msgid "" "Only functions marked `const` can be called at compile time to generate " "`const` values. `const` functions can however be called at runtime." msgstr "" -#: src/user-defined-types/static-and-const.md +#: src/user-defined-types/const.md +msgid "Mention that `const` behaves semantically similar to C++'s `constexpr`" +msgstr "" + +#: src/user-defined-types/static.md msgid "`static`" msgstr "" -#: src/user-defined-types/static-and-const.md +#: src/user-defined-types/static.md msgid "" "Static variables will live during the whole execution of the program, and " "therefore will not move:" msgstr "" -#: src/user-defined-types/static-and-const.md +#: src/user-defined-types/static.md msgid "\"Welcome to RustOS 3.14\"" msgstr "\"Velkommen til RustOS 3.14\"" -#: src/user-defined-types/static-and-const.md +#: src/user-defined-types/static.md msgid "\"{BANNER}\"" msgstr "\"{BANNER}\"" -#: src/user-defined-types/static-and-const.md +#: src/user-defined-types/static.md 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 " @@ -4394,110 +4627,32 @@ msgid "" "`const` is generally preferred." msgstr "" -#: src/user-defined-types/static-and-const.md -msgid "Mention that `const` behaves semantically similar to C++'s `constexpr`." +#: src/user-defined-types/static.md +msgid "`static` is similar to mutable global variables in C++." msgstr "" -#: src/user-defined-types/static-and-const.md -msgid "" -"`static`, on the other hand, is much more similar to a `const` or mutable " -"global variable in C++." -msgstr "" - -#: src/user-defined-types/static-and-const.md +#: src/user-defined-types/static.md msgid "" "`static` provides object identity: an address in memory and state as " "required by types with interior mutability such as `Mutex`." msgstr "" -#: src/user-defined-types/static-and-const.md -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/user-defined-types/static-and-const.md -msgid "Properties table:" -msgstr "" - -#: src/user-defined-types/static-and-const.md -#: src/chromium/adding-third-party-crates.md -msgid "Property" -msgstr "Egenskab" - -#: src/user-defined-types/static-and-const.md -msgid "Static" -msgstr "Statisk" - -#: src/user-defined-types/static-and-const.md -msgid "Constant" -msgstr "Konstant" - -#: src/user-defined-types/static-and-const.md -msgid "Has an address in memory" -msgstr "Har en adresse i hukommelsen" - -#: src/user-defined-types/static-and-const.md -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "Yes" -msgstr "Ja" - -#: src/user-defined-types/static-and-const.md -msgid "No (inlined)" -msgstr "Nej (inlinet)" - -#: src/user-defined-types/static-and-const.md -msgid "Lives for the entire duration of the program" -msgstr "" - -#: src/user-defined-types/static-and-const.md -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "No" -msgstr "Nej" - -#: src/user-defined-types/static-and-const.md -msgid "Can be mutable" -msgstr "" - -#: src/user-defined-types/static-and-const.md -msgid "Yes (unsafe)" -msgstr "Ja (_unsafe_)" - -#: src/user-defined-types/static-and-const.md -msgid "Evaluated at compile time" -msgstr "Evalueret ved kompileringstid" - -#: src/user-defined-types/static-and-const.md -msgid "Yes (initialised at compile time)" -msgstr "Ja (initialiseret ved kompileringstid)" - -#: src/user-defined-types/static-and-const.md -msgid "Inlined wherever it is used" -msgstr "" - -#: src/user-defined-types/static-and-const.md +#: src/user-defined-types/static.md 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." msgstr "" -#: src/user-defined-types/static-and-const.md -msgid "Thread-local data can be created with the macro `std::thread_local`." -msgstr "" - -#: src/user-defined-types/aliases.md +#: src/user-defined-types/static.md msgid "" -"A type alias creates a name for another type. The two types can be used " -"interchangeably." -msgstr "" - -#: src/user-defined-types/aliases.md -msgid "// Aliases are more useful with long, complex types:\n" +"It is common to use `OnceLock` in a static as a way to support " +"initialization on first use. `OnceCell` is not `Sync` and thus cannot be " +"used in this context." msgstr "" -#: src/user-defined-types/aliases.md -msgid "C programmers will recognize this as similar to a `typedef`." +#: src/user-defined-types/static.md +msgid "Thread-local data can be created with the macro `std::thread_local`." msgstr "" #: src/user-defined-types/exercise.md @@ -4577,6 +4732,15 @@ msgstr "" msgid "\"The car has arrived on the 3rd floor: {:?}\"" msgstr "" +#: src/user-defined-types/exercise.md +msgid "" +"If students ask about `#![allow(dead_code)]` at the top of the exercise, " +"it's necessary because the only thing we do with the `Event` type is print " +"it out. Due to a nuance of how the compiler checks for dead code this causes " +"it to think the code is unused. They can ignore it for the purpose of this " +"exercise." +msgstr "" + #: src/user-defined-types/solution.md msgid "/// A button was pressed.\n" msgstr "" @@ -4641,140 +4805,350 @@ msgid "" msgstr "" #: src/welcome-day-2.md -msgid "[Welcome](./welcome-day-2.md) (3 minutes)" +msgid "Closures: function pointers with data." msgstr "" -#: src/welcome-day-2.md -msgid "[Pattern Matching](./pattern-matching.md) (50 minutes)" +#: src/pattern-matching.md src/lifetimes.md +msgid "This segment should take about 50 minutes. It contains:" msgstr "" -#: src/welcome-day-2.md -msgid "[Methods and Traits](./methods-and-traits.md) (55 minutes)" +#: src/pattern-matching/infallible.md +msgid "" +"In day 1 we briefly saw how patterns can be used to _destructure_ compound " +"values. Let's review that and talk about a few other things patterns can " +"express:" msgstr "" -#: src/welcome-day-2.md -msgid "[Generics](./generics.md) (45 minutes)" +#: src/pattern-matching/infallible.md +msgid "// This does the same thing as above.\n" msgstr "" -#: src/welcome-day-2.md src/welcome-day-4.md -msgid "" -"Including 10 minute breaks, this session should take about 3 hours and 5 " -"minutes" +#: src/pattern-matching/infallible.md +msgid "// Ignore the first element, only bind the second and third.\n" msgstr "" -#: src/pattern-matching.md -msgid "[Destructuring](./pattern-matching/destructuring.md) (10 minutes)" +#: src/pattern-matching/infallible.md +msgid "// Ignore everything but the last element.\n" msgstr "" -#: src/pattern-matching.md -msgid "[Let Control Flow](./pattern-matching/let-control-flow.md) (10 minutes)" +#: src/pattern-matching/infallible.md src/pattern-matching/match.md +#: src/generics/exercise.md src/generics/solution.md src/std-traits/solution.md +msgid "'a'" +msgstr "'a'" + +#: src/pattern-matching/infallible.md +msgid "" +"All of the demonstrated patterns are _irrefutable_, meaning that they will " +"always match the value on the right hand side." msgstr "" -#: src/pattern-matching.md +#: src/pattern-matching/infallible.md msgid "" -"[Exercise: Expression Evaluation](./pattern-matching/exercise.md) (30 " -"minutes)" +"Patterns are type-specific, including irrefutable patterns. Try adding or " +"removing an element to the tuple and look at the resulting compiler errors." msgstr "" -#: src/pattern-matching/destructuring.md -msgid "Like tuples, structs and enums can also be destructured by matching:" +#: src/pattern-matching/infallible.md +msgid "" +"Variable names are patterns that always match and bind the matched value " +"into a new variable with that name." msgstr "" -#: src/pattern-matching/destructuring.md +#: src/pattern-matching/infallible.md +msgid "" +"`_` is a pattern that always matches any value, discarding the matched value." +msgstr "" + +#: src/pattern-matching/infallible.md +msgid "`..` allows you to ignore multiple values at once." +msgstr "" + +#: src/pattern-matching/infallible.md +msgid "" +"You can also demonstrate more advanced usages of `..`, such as ignoring the " +"middle elements of a tuple." +msgstr "" + +#: src/pattern-matching/infallible.md +msgid "All of these patterns work with arrays as well:" +msgstr "" + +#: src/pattern-matching/match.md +msgid "" +"The `match` keyword lets you match a value against one or more _patterns_. " +"The patterns can be simple values, similarly to `switch` in C and C++, but " +"they can also be used to express more complex conditions:" +msgstr "" + +#: src/pattern-matching/match.md +msgid "'x'" +msgstr "'x'" + +#: src/pattern-matching/match.md +msgid "'q'" +msgstr "'q'" + +#: src/pattern-matching/match.md +msgid "\"Quitting\"" +msgstr "" + +#: src/pattern-matching/match.md +msgid "'s'" +msgstr "'s'" + +#: src/pattern-matching/match.md +msgid "'w'" +msgstr "'w'" + +#: src/pattern-matching/match.md +msgid "'d'" +msgstr "'d'" + +#: src/pattern-matching/match.md +msgid "\"Moving around\"" +msgstr "" + +#: src/pattern-matching/match.md +msgid "'0'" +msgstr "'0'" + +#: src/pattern-matching/match.md +msgid "'9'" +msgstr "'9'" + +#: src/pattern-matching/match.md +msgid "\"Number input\"" +msgstr "" + +#: src/pattern-matching/match.md +msgid "\"Lowercase: {key}\"" +msgstr "" + +#: src/pattern-matching/match.md +msgid "\"Something else\"" +msgstr "" + +#: src/pattern-matching/match.md +msgid "" +"A variable in the pattern (`key` in this example) will create a binding that " +"can be used within the match arm. We will learn more about this on the next " +"slide." +msgstr "" + +#: src/pattern-matching/match.md +msgid "" +"A match guard causes the arm to match only if the condition is true. If the " +"condition is false the match will continue checking later cases." +msgstr "" + +#: src/pattern-matching/match.md +msgid "" +"You might point out how some specific characters are being used when in a " +"pattern" +msgstr "" + +#: src/pattern-matching/match.md +msgid "`|` as an `or`" +msgstr "" + +#: src/pattern-matching/match.md +msgid "`..` matches any number of items" +msgstr "" + +#: src/pattern-matching/match.md +msgid "`1..=5` represents an inclusive range" +msgstr "" + +#: src/pattern-matching/match.md +msgid "`_` is a wild card" +msgstr "" + +#: src/pattern-matching/match.md +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." +msgstr "" + +#: src/pattern-matching/match.md +msgid "" +"Match guards are different from `if` expressions after the `=>`. An `if` " +"expression is evaluated 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. In the following example, the wildcard " +"pattern `_ =>` is never even attempted." +msgstr "" + +#: src/pattern-matching/match.md +msgid "\"Uppercase\"" +msgstr "" + +#: src/pattern-matching/match.md +msgid "\"Bug: this is never printed\"" +msgstr "" + +#: src/pattern-matching/match.md +msgid "" +"The condition defined in the guard applies to every expression in a pattern " +"with an `|`." +msgstr "" + +#: src/pattern-matching/match.md +msgid "" +"Note that you can't use an existing variable as the condition in a match " +"arm, as it will instead be interpreted as a variable name pattern, which " +"creates a new variable that will shadow the existing one. For example:" +msgstr "" + +#: src/pattern-matching/match.md +msgid "\"Expected value is 5, actual is {expected}\"" +msgstr "" + +#: src/pattern-matching/match.md +msgid "\"Value was something else\"" +msgstr "" + +#: src/pattern-matching/match.md +msgid "" +"Here we're trying to match on the number 123, where we want the first case " +"to check if the value is 5. The naive expectation is that the first case " +"won't match because the value isn't 5, but instead this is interpreted as a " +"variable pattern which always matches, meaning the first branch will always " +"be taken. If a constant is used instead this will then work as expected." +msgstr "" + +#: src/pattern-matching/match.md +msgid "" +"Another piece of pattern syntax you can show students is the `@` syntax " +"which binds a part of a pattern to a variable. For example:" +msgstr "" + +#: src/pattern-matching/match.md +msgid "\"outer: {outer:?}, inner: {inner}\"" +msgstr "" + +#: src/pattern-matching/match.md +msgid "" +"In this example `inner` has the value 123 which it pulled from the `Option` " +"via destructuring, `outer` captures the entire `Some(inner)` expression, so " +"it contains the full `Option::Some(123)`. This is rarely used but can be " +"useful in more complex patterns." +msgstr "" + +#: src/pattern-matching/destructuring-structs.md msgid "Structs" msgstr "Strukturer" -#: src/pattern-matching/destructuring.md -msgid "\"x.0 = 1, b = {b}, y = {y}\"" -msgstr "\"x.0 = 1, b = {b}, y = {y}\"" +#: src/pattern-matching/destructuring-structs.md +msgid "Like tuples, structs can also be destructured by matching:" +msgstr "" -#: src/pattern-matching/destructuring.md +#: src/pattern-matching/destructuring-structs.md msgid "\"y = 2, x = {i:?}\"" msgstr "\"y = 2, x = {i:?}\"" -#: src/pattern-matching/destructuring.md +#: src/pattern-matching/destructuring-structs.md +msgid "\"x.0 = 1, b = {b}, y = {y}\"" +msgstr "\"x.0 = 1, b = {b}, y = {y}\"" + +#: src/pattern-matching/destructuring-structs.md msgid "\"y = {y}, other fields were ignored\"" msgstr "\"y = {y}, andre felter blev ignoreret\"" -#: src/pattern-matching/destructuring.md +#: src/pattern-matching/destructuring-structs.md +msgid "Change the literal values in `foo` to match with the other patterns." +msgstr "" + +#: src/pattern-matching/destructuring-structs.md +msgid "Add a new field to `Foo` and make changes to the pattern as needed." +msgstr "" + +#: src/pattern-matching/destructuring-structs.md +msgid "" +"Try `match &foo` and check the type of captures. The pattern syntax remains " +"the same, but the captures become shared references. This is [match " +"ergonomics](https://rust-lang.github.io/rfcs/2005-match-ergonomics.html) and " +"is often useful with `match self` when implementing methods on an enum." +msgstr "" + +#: src/pattern-matching/destructuring-structs.md +msgid "" +"The same effect occurs with `match &mut foo`: the captures become exclusive " +"references." +msgstr "" + +#: src/pattern-matching/destructuring-structs.md +msgid "" +"The distinction between a capture and a constant expression can be hard to " +"spot. Try changing the `2` in the first 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-enums.md +msgid "Like tuples, enums can also be destructured by matching:" +msgstr "" + +#: src/pattern-matching/destructuring-enums.md msgid "" "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.md +#: src/pattern-matching/destructuring-enums.md msgid "\"cannot divide {n} into two equal parts\"" msgstr "" -#: src/pattern-matching/destructuring.md +#: src/pattern-matching/destructuring-enums.md msgid "\"{n} divided in two is {half}\"" msgstr "" -#: src/pattern-matching/destructuring.md +#: src/pattern-matching/destructuring-enums.md msgid "\"sorry, an error happened: {msg}\"" msgstr "" -#: src/pattern-matching/destructuring.md +#: src/pattern-matching/destructuring-enums.md msgid "" "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.md -msgid "Change the literal values in `foo` to match with the other patterns." -msgstr "" - -#: src/pattern-matching/destructuring.md -msgid "Add a new field to `Foo` and make changes to the pattern as needed." -msgstr "" - -#: src/pattern-matching/destructuring.md -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.md +#: src/pattern-matching/destructuring-enums.md msgid "" "The `if`/`else` expression is returning an enum that is later unpacked with " "a `match`." msgstr "" -#: src/pattern-matching/destructuring.md +#: src/pattern-matching/destructuring-enums.md 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.md +#: src/pattern-matching/destructuring-enums.md msgid "" "The values in the enum variants can only be accessed after being pattern " "matched." msgstr "" -#: src/pattern-matching/destructuring.md +#: src/pattern-matching/destructuring-enums.md 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/pattern-matching/destructuring.md +#: src/pattern-matching/destructuring-enums.md msgid "" -"Save the result of `divide_in_two` in the `result` variable and `match` it " -"in a loop. That won't compile because `msg` is consumed when matched. To fix " -"it, match `&result` instead of `result`. That will make `msg` a reference so " -"it won't be consumed. This [\"match ergonomics\"](https://rust-lang.github." -"io/rfcs/2005-match-ergonomics.html) appeared in Rust 2018. If you want to " -"support older Rust, replace `msg` with `ref msg` in the pattern." +"Demonstrate the syntax for a struct-style variant by adding one to the enum " +"definition and the `match`. Point out how this is syntactically similar to " +"matching on a struct." msgstr "" #: src/pattern-matching/let-control-flow.md msgid "" -"Rust has a few control flow constructs which differ from other languages. " +"Rust has a few control flow constructs that differ from other languages. " "They are used for pattern matching:" msgstr "" @@ -4787,27 +5161,90 @@ msgid "`while let` expressions" msgstr "`while let`-udtryk" #: src/pattern-matching/let-control-flow.md -msgid "`match` expressions" -msgstr "`match`-udtryk" +#, fuzzy +msgid "`let else` expressions" +msgstr "`while let`-udtryk" -#: src/pattern-matching/let-control-flow.md +#: src/pattern-matching/let-control-flow/if-let.md msgid "" "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/pattern-matching/let-control-flow.md +#: src/pattern-matching/let-control-flow/if-let.md #, fuzzy -msgid "\"slept for {:?}\"" +msgid "\"slept for {duration:?}\"" msgstr "\"expr: {:?}\"" -#: src/pattern-matching/let-control-flow.md +#: src/pattern-matching/let-control-flow/if-let.md +msgid "" +"Unlike `match`, `if let` does not have to cover all branches. This can make " +"it more concise than `match`." +msgstr "" + +#: src/pattern-matching/let-control-flow/if-let.md +msgid "A common usage is handling `Some` values when working with `Option`." +msgstr "" + +#: src/pattern-matching/let-control-flow/if-let.md +msgid "" +"Unlike `match`, `if let` does not support guard clauses for pattern matching." +msgstr "" + +#: src/pattern-matching/let-control-flow/if-let.md +msgid "With an `else` clause, this can be used as an expression." +msgstr "" + +#: src/pattern-matching/let-control-flow/while-let.md +msgid "" +"Like with `if let`, there is a [`while let`](https://doc.rust-lang.org/" +"reference/expressions/loop-expr.html#predicate-pattern-loops) variant that " +"repeatedly tests a value against a pattern:" +msgstr "" + +#: src/pattern-matching/let-control-flow/while-let.md #, fuzzy -msgid "`let else` expressions" +msgid "\"Comprehensive Rust 🦀\"" +msgstr "Velkommen til Comprehensive Rust 🦀" + +#: src/pattern-matching/let-control-flow/while-let.md +msgid "// (There are more efficient ways to reverse a string!)\n" +msgstr "" + +#: src/pattern-matching/let-control-flow/while-let.md +msgid "" +"Here [`String::pop`](https://doc.rust-lang.org/stable/std/string/" +"struct.String.html#method.pop) returns `Some(c)` until the string is empty, " +"after which it will return `None`. The `while let` lets us keep iterating " +"through all items." +msgstr "" + +#: src/pattern-matching/let-control-flow/while-let.md +msgid "" +"Point out that the `while let` loop will keep going as long as the value " +"matches the pattern." +msgstr "" + +#: src/pattern-matching/let-control-flow/while-let.md +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 `name.pop()`. The " +"`while let` provides syntactic sugar for the above scenario." +msgstr "" + +#: src/pattern-matching/let-control-flow/while-let.md +msgid "" +"This form cannot be used as an expression, because it may have no value if " +"the condition is false." +msgstr "" + +#: src/pattern-matching/let-control-flow/let-else.md +#, fuzzy +msgid "`let else` Statements" msgstr "`while let`-udtryk" -#: src/pattern-matching/let-control-flow.md +#: src/pattern-matching/let-control-flow/let-else.md msgid "" "For the common case of matching a pattern and returning from the function, " "use [`let else`](https://doc.rust-lang.org/rust-by-example/flow_control/" @@ -4815,99 +5252,81 @@ msgid "" "- anything but falling off the end of the block)." msgstr "" -#: src/pattern-matching/let-control-flow.md +#: src/pattern-matching/let-control-flow/let-else.md #, fuzzy msgid "\"got None\"" msgstr "\"none\"" -#: src/pattern-matching/let-control-flow.md +#: src/pattern-matching/let-control-flow/let-else.md #, fuzzy msgid "\"got empty string\"" msgstr "\"En streng\"" -#: src/pattern-matching/let-control-flow.md +#: src/pattern-matching/let-control-flow/let-else.md msgid "\"not a hex digit\"" msgstr "" -#: src/pattern-matching/let-control-flow.md src/pattern-matching/solution.md +#: src/pattern-matching/let-control-flow/let-else.md msgid "\"result: {:?}\"" msgstr "\"result: {:?}\"" -#: src/pattern-matching/let-control-flow.md src/generics/trait-bounds.md -#: src/smart-pointers/solution.md src/testing/googletest.md -#: src/testing/solution.md +#: src/pattern-matching/let-control-flow/let-else.md +#: src/generics/trait-bounds.md src/testing/solution.md src/android/testing.md +#: src/android/testing/googletest.md msgid "\"foo\"" msgstr "\"foo\"" -#: src/pattern-matching/let-control-flow.md +#: src/pattern-matching/let-control-flow/let-else.md msgid "" -"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:" +"This early return-based control flow is common in Rust error handling code, " +"where you try to get a value out of a `Result`, returning an error if the " +"`Result` was `Err`." msgstr "" -#: src/pattern-matching/let-control-flow.md +#: src/pattern-matching/let-control-flow/let-else.md msgid "" -"Here [`String::pop`](https://doc.rust-lang.org/stable/std/string/struct." -"String.html#method.pop) returns `Some(c)` until the string is empty, after " -"which it will return `None`. The `while let` lets us keep iterating through " -"all items." +"If students ask, you can also demonstrate how real error handling code would " +"be written with `?`." msgstr "" -#: src/pattern-matching/let-control-flow.md -msgid "if-let" +#: src/pattern-matching/exercise.md +msgid "Let's write a simple recursive evaluator for arithmetic expressions." msgstr "" -#: src/pattern-matching/let-control-flow.md +#: src/pattern-matching/exercise.md msgid "" -"Unlike `match`, `if let` does not have to cover all branches. This can make " -"it more concise than `match`." -msgstr "" - -#: src/pattern-matching/let-control-flow.md -msgid "A common usage is handling `Some` values when working with `Option`." +"An example of a small arithmetic expression could be `10 + 20`, which " +"evaluates to `30`. We can represent the expression as a tree:" msgstr "" -#: src/pattern-matching/let-control-flow.md +#: src/pattern-matching/exercise.md msgid "" -"Unlike `match`, `if let` does not support guard clauses for pattern matching." -msgstr "" - -#: src/pattern-matching/let-control-flow.md -msgid "let-else" +"A bigger and more complex expression would be `(10 * 9) + ((3 - 4) * 5)`, " +"which evaluates to `85`. We represent this as a much bigger tree:" msgstr "" -#: src/pattern-matching/let-control-flow.md -msgid "" -"`if-let`s can pile up, as shown. The `let-else` construct supports " -"flattening this nested code. Rewrite the awkward version for students, so " -"they can see the transformation." +#: src/pattern-matching/exercise.md +msgid "In code, we will represent the tree with two types:" msgstr "" -#: src/pattern-matching/let-control-flow.md -msgid "The rewritten version is:" +#: src/pattern-matching/exercise.md src/pattern-matching/solution.md +#: src/error-handling/exercise.md src/error-handling/solution.md +msgid "/// An operation to perform on two subexpressions.\n" msgstr "" -#: src/pattern-matching/let-control-flow.md -#, fuzzy -msgid "while-let" -msgstr "`while let`-lykker" - -#: src/pattern-matching/let-control-flow.md -msgid "" -"Point out that the `while let` loop will keep going as long as the value " -"matches the pattern." +#: src/pattern-matching/exercise.md src/pattern-matching/solution.md +#: src/error-handling/exercise.md src/error-handling/solution.md +msgid "/// An expression, in tree form.\n" msgstr "" -#: src/pattern-matching/let-control-flow.md -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 `name.pop()`. The " -"`while let` provides syntactic sugar for the above scenario." +#: src/pattern-matching/exercise.md src/pattern-matching/solution.md +#: src/error-handling/exercise.md src/error-handling/solution.md +msgid "/// An operation on two subexpressions.\n" msgstr "" -#: src/pattern-matching/exercise.md -msgid "Let's write a simple recursive evaluator for arithmetic expressions." +#: src/pattern-matching/exercise.md src/pattern-matching/solution.md +#: src/error-handling/exercise.md src/error-handling/solution.md +msgid "/// A literal value\n" msgstr "" #: src/pattern-matching/exercise.md @@ -4918,15 +5337,6 @@ msgid "" "\"unbox\" it: `eval(*boxed_expr)`." msgstr "" -#: src/pattern-matching/exercise.md -msgid "" -"Some expressions cannot be evaluated and will return an error. The standard " -"[`Result`](https://doc.rust-lang.org/std/result/enum.Result." -"html) type is an enum that represents either a successful value " -"(`Ok(Value)`) or an error (`Err(String)`). We will cover this type in detail " -"later." -msgstr "" - #: src/pattern-matching/exercise.md msgid "" "Copy and paste the code into the Rust playground, and begin implementing " @@ -4935,61 +5345,6 @@ msgid "" "temporarily with `#[ignore]`:" msgstr "" -#: src/pattern-matching/exercise.md -msgid "" -"If you finish early, try writing a test that results in division by zero or " -"integer overflow. How could you handle this with `Result` instead of a panic?" -msgstr "" - -#: src/pattern-matching/exercise.md src/pattern-matching/solution.md -msgid "/// An operation to perform on two subexpressions.\n" -msgstr "" - -#: src/pattern-matching/exercise.md src/pattern-matching/solution.md -msgid "/// An expression, in tree form.\n" -msgstr "" - -#: src/pattern-matching/exercise.md src/pattern-matching/solution.md -msgid "/// An operation on two subexpressions.\n" -msgstr "" - -#: src/pattern-matching/exercise.md src/pattern-matching/solution.md -msgid "/// A literal value\n" -msgstr "" - -#: src/pattern-matching/exercise.md src/pattern-matching/solution.md -msgid "\"division by zero\"" -msgstr "" - -#: src/pattern-matching/solution.md -msgid "\"expr: {:?}\"" -msgstr "\"expr: {:?}\"" - -#: src/methods-and-traits.md -msgid "[Methods](./methods-and-traits/methods.md) (10 minutes)" -msgstr "" - -#: src/methods-and-traits.md -msgid "[Traits](./methods-and-traits/traits.md) (10 minutes)" -msgstr "" - -#: src/methods-and-traits.md -msgid "[Deriving](./methods-and-traits/deriving.md) (5 minutes)" -msgstr "" - -#: src/methods-and-traits.md -msgid "[Trait Objects](./methods-and-traits/trait-objects.md) (10 minutes)" -msgstr "" - -#: src/methods-and-traits.md -msgid "" -"[Exercise: Generic Logger](./methods-and-traits/exercise.md) (20 minutes)" -msgstr "" - -#: src/methods-and-traits.md -msgid "This segment should take about 55 minutes" -msgstr "" - #: src/methods-and-traits/methods.md msgid "" "Rust allows you to associate functions with your new types. You do this with " @@ -5017,7 +5372,7 @@ msgid "\"Lap {idx}: {lap} sec\"" msgstr "" #: src/methods-and-traits/methods.md -msgid "// Exclusive ownership of self\n" +msgid "// Exclusive ownership of self (covered later)\n" msgstr "" #: src/methods-and-traits/methods.md @@ -5065,7 +5420,7 @@ msgstr "" #: src/methods-and-traits/methods.md msgid "" "No receiver: this becomes a static method on the struct. Typically used to " -"create constructors which are called `new` by convention." +"create constructors that are called `new` by convention." msgstr "" #: src/methods-and-traits/methods.md @@ -5085,6 +5440,12 @@ msgid "" "all the implementation code in one predictable place." msgstr "" +#: src/methods-and-traits/methods.md +msgid "" +"Note that methods can also be called like associated functions by explicitly " +"passing the receiver in, e.g. `CarRace::add_lap(&mut race, 20)`." +msgstr "" + #: src/methods-and-traits/methods.md msgid "Point out the use of the keyword `self`, a method receiver." msgstr "" @@ -5126,37 +5487,112 @@ msgid "" msgstr "" #: src/methods-and-traits/traits.md +msgid "/// Return a sentence from this pet.\n" +msgstr "" + +#: src/methods-and-traits/traits.md +msgid "/// Print a string to the terminal greeting this pet.\n" +msgstr "" + +#: src/methods-and-traits/traits.md +msgid "" +"A trait defines a number of methods that types must have in order to " +"implement the trait." +msgstr "" + +#: src/methods-and-traits/traits.md +msgid "" +"In the \"Generics\" segment, next, we will see how to build functionality " +"that is generic over all types implementing a trait." +msgstr "" + +#: src/methods-and-traits/traits/implementing.md msgid "\"Oh you're a cutie! What's your name? {}\"" msgstr "" -#: src/methods-and-traits/traits.md src/methods-and-traits/trait-objects.md +#: src/methods-and-traits/traits/implementing.md src/generics/dyn-trait.md +#: src/smart-pointers/trait-objects.md #, fuzzy msgid "\"Woof, my name is {}!\"" msgstr "\"Hej, mit navn er {}\"" -#: src/methods-and-traits/traits.md src/methods-and-traits/trait-objects.md -msgid "\"Miau!\"" -msgstr "" - -#: src/methods-and-traits/traits.md src/methods-and-traits/trait-objects.md +#: src/methods-and-traits/traits/implementing.md src/generics/dyn-trait.md +#: src/smart-pointers/trait-objects.md msgid "\"Fido\"" msgstr "\"Fido\"" -#: src/methods-and-traits/traits.md +#: src/methods-and-traits/traits/implementing.md msgid "" -"A trait defines a number of methods that types must have in order to " -"implement the trait." +"To implement `Trait` for `Type`, you use an `impl Trait for Type { .. }` " +"block." msgstr "" -#: src/methods-and-traits/traits.md -msgid "Traits are implemented in an `impl for { .. }` block." +#: src/methods-and-traits/traits/implementing.md +msgid "" +"Unlike Go interfaces, just having matching methods is not enough: a `Cat` " +"type with a `talk()` method would not automatically satisfy `Pet` unless it " +"is in an `impl Pet` block." msgstr "" -#: src/methods-and-traits/traits.md +#: src/methods-and-traits/traits/implementing.md +msgid "" +"Traits may provide default implementations of some methods. Default " +"implementations can rely on all the methods of the trait. In this case, " +"`greet` is provided, and relies on `talk`." +msgstr "" + +#: src/methods-and-traits/traits/implementing.md +msgid "" +"Multiple `impl` blocks are allowed for a given type. This includes both " +"inherent `impl` blocks and trait `impl` blocks. Likewise multiple traits can " +"be implemented for a given type (and often types implement many traits!). " +"`impl` blocks can even be spread across multiple modules/files." +msgstr "" + +#: src/methods-and-traits/traits/supertraits.md +msgid "" +"A trait can require that types implementing it also implement other traits, " +"called _supertraits_. Here, any type implementing `Pet` must implement " +"`Animal`." +msgstr "" + +#: src/methods-and-traits/traits/supertraits.md +msgid "\"Rex\"" +msgstr "\"Rex\"" + +#: src/methods-and-traits/traits/supertraits.md +#, fuzzy +msgid "\"{} has {} legs\"" +msgstr "\"{} {}\"" + +#: src/methods-and-traits/traits/supertraits.md msgid "" -"Traits may specify pre-implemented (provided) methods and methods that users " -"are required to implement themselves. Provided methods can rely on required " -"methods. In this case, `greet` is provided, and relies on `talk`." +"This is sometimes called \"trait inheritance\" but students should not " +"expect this to behave like OO inheritance. It just specifies an additional " +"requirement on implementations of a trait." +msgstr "" + +#: src/methods-and-traits/traits/associated-types.md +msgid "" +"Associated types are placeholder types that are supplied by the trait " +"implementation." +msgstr "" + +#: src/methods-and-traits/traits/associated-types.md +#: src/lifetimes/lifetime-elision.md +msgid "\"{:?}\"" +msgstr "\"{:?}\"" + +#: src/methods-and-traits/traits/associated-types.md +msgid "" +"Associated types are sometimes also called \"output types\". The key " +"observation is that the implementer, not the caller, chooses this type." +msgstr "" + +#: src/methods-and-traits/traits/associated-types.md +msgid "" +"Many standard library traits have associated types, including arithmetic " +"operators and `Iterator`." msgstr "" #: src/methods-and-traits/deriving.md @@ -5183,7 +5619,7 @@ msgstr "" #: src/methods-and-traits/deriving.md #, fuzzy -msgid "\"{:?} vs. {:?}\"" +msgid "\"{p1:?} vs. {p2:?}\"" msgstr "\"{:?} + {:?} = {:?}\"" #: src/methods-and-traits/deriving.md @@ -5193,185 +5629,31 @@ msgid "" "serialization support for a struct using `#[derive(Serialize)]`." msgstr "" -#: src/methods-and-traits/trait-objects.md -msgid "" -"Trait objects allow for values of different types, for instance in a " -"collection:" -msgstr "" - -#: src/methods-and-traits/trait-objects.md -#, fuzzy -msgid "\"Hello, who are you? {}\"" -msgstr "\"Hej, mit navn er {}\"" - -#: src/methods-and-traits/trait-objects.md -msgid "Memory layout after allocating `pets`:" -msgstr "" - -#: src/methods-and-traits/trait-objects.md -#, fuzzy -msgid "" -"```bob\n" -" Stack Heap\n" -".- - - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - " -"- -.\n" -": : : :\n" -": pets : : +----+----+----+----" -"+ :\n" -": +-----------+-------+ : : +-----+-----+ .->| F | i | d | o " -"| :\n" -": | ptr | o---+---+-----+-->| o o | o o | | +----+----+----+----" -"+ :\n" -": | len | 2 | : : +-|-|-+-|-|-+ " -"`---------. :\n" -": | capacity | 2 | : : | | | | data " -"| :\n" -": +-----------+-------+ : : | | | | +-------+--|-------" -"+ :\n" -": : : | | | '-->| name | o, 4, 4 " -"| :\n" -": : : | | | | age | 5 " -"| :\n" -"`- - - - - - - - - - - - - -' : | | | +-------+----------" -"+ :\n" -" : | | " -"| :\n" -" : | | | " -"vtable :\n" -" : | | | +----------------------" -"+ :\n" -" : | | '---->| \"::talk\" " -"| :\n" -" : | | +----------------------" -"+ :\n" -" : | " -"| :\n" -" : | | " -"data :\n" -" : | | +-------+-------" -"+ :\n" -" : | '-->| lives | 9 " -"| :\n" -" : | +-------+-------" -"+ :\n" -" : " -"| :\n" -" : | " -"vtable :\n" -" : | +----------------------" -"+ :\n" -" : '---->| \"::talk\" " -"| :\n" -" : +----------------------" -"+ :\n" -" : :\n" -" '- - - - - - - - - - - - - - - - - - - - - " -"- -'\n" -"```" -msgstr "" -"```bob\n" -" Stak Heap\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" -" : :\n" -" '- - - - - - - - - - - - - - - - - - - - - " -"- -'\n" -"\n" -"```" - -#: src/methods-and-traits/trait-objects.md -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." -msgstr "" - -#: src/methods-and-traits/trait-objects.md -msgid "" -"`dyn Pet` is a way to tell the compiler about a dynamically sized type that " -"implements `Pet`." -msgstr "" - -#: src/methods-and-traits/trait-objects.md -msgid "" -"In the example, `pets` is allocated on the stack and the vector data is on " -"the heap. The two vector elements are _fat pointers_:" -msgstr "" - -#: src/methods-and-traits/trait-objects.md +#: src/methods-and-traits/deriving.md msgid "" -"A fat pointer is a double-width pointer. It has two components: a pointer to " -"the actual object and a pointer to the [virtual method table](https://en." -"wikipedia.org/wiki/Virtual_method_table) (vtable) for the `Pet` " -"implementation of that particular object." +"Derivation is usually provided for traits that have a common boilerplate " +"implementation that is correct for most cases. For example, demonstrate how " +"a manual `Clone` impl can be repetitive compared to deriving the trait:" msgstr "" -#: src/methods-and-traits/trait-objects.md +#: src/methods-and-traits/deriving.md msgid "" -"The data for the `Dog` named Fido is the `name` and `age` fields. The `Cat` " -"has a `lives` field." -msgstr "" - -#: src/methods-and-traits/trait-objects.md -msgid "Compare these outputs in the above example:" +"Not all of the `.clone()`s in the above are necessary in this case, but this " +"demonstrates the generally boilerplate-y pattern that manual impls would " +"follow, which should help make the use of `derive` clear to students." msgstr "" -#: src/methods-and-traits/trait-objects.md src/std-traits/closures.md -msgid "\"{} {}\"" -msgstr "\"{} {}\"" - -#: src/methods-and-traits/trait-objects.md src/std-traits/exercise.md -#: src/std-traits/solution.md src/modules/exercise.md src/modules/solution.md -#: src/android/build-rules/library.md -#: src/android/interoperability/cpp/rust-bridge.md -#: src/async/pitfalls/cancellation.md -msgid "\"{}\"" -msgstr "\"{}\"" +#: src/methods-and-traits/exercise.md +#, fuzzy +msgid "Exercise: Logger Trait" +msgstr "Øvelser" #: src/methods-and-traits/exercise.md msgid "" "Let's design a simple logging utility, using a trait `Logger` with a `log` " -"method. Code which might log its progress can then take an `&impl Logger`. " -"In testing, this might put messages in the test logfile, while in a " -"production build it would send messages to a log server." +"method. Code that might log its progress can then take an `&impl Logger`. In " +"testing, this might put messages in the test logfile, while in a production " +"build it would send messages to a log server." msgstr "" #: src/methods-and-traits/exercise.md @@ -5384,57 +5666,57 @@ msgstr "" #: src/methods-and-traits/exercise.md msgid "" "This is a common pattern: a struct wrapping a trait implementation and " -"implementing that same trait, adding behavior in the process. What other " -"kinds of wrappers might be useful in a logging utility?" +"implementing that same trait, adding behavior in the process. In the " +"\"Generics\" segment, we will see how to make the wrapper generic over the " +"wrapped type." msgstr "" #: src/methods-and-traits/exercise.md src/methods-and-traits/solution.md +#: src/generics/generic-data.md src/closures/exercise.md +#: src/closures/solution.md msgid "/// Log a message at the given verbosity level.\n" msgstr "" #: src/methods-and-traits/exercise.md src/methods-and-traits/solution.md +#: src/generics/generic-data.md src/closures/exercise.md +#: src/closures/solution.md msgid "\"verbosity={verbosity}: {message}\"" msgstr "" #: src/methods-and-traits/exercise.md src/methods-and-traits/solution.md -msgid "\"FYI\"" -msgstr "" - -#: src/methods-and-traits/exercise.md src/methods-and-traits/solution.md -msgid "\"Uhoh\"" +#: src/generics/generic-data.md +msgid "/// Only log messages up to the given verbosity level.\n" msgstr "" #: src/methods-and-traits/exercise.md -msgid "// TODO: Define and implement `VerbosityFilter`.\n" -msgstr "" - -#: src/methods-and-traits/solution.md -msgid "/// Only log messages up to the given verbosity level.\n" +msgid "// TODO: Implement the `Logger` trait for `VerbosityFilter`.\n" msgstr "" -#: src/generics.md -msgid "[Generic Functions](./generics/generic-functions.md) (5 minutes)" +#: src/methods-and-traits/exercise.md src/methods-and-traits/solution.md +#: src/generics/generic-data.md src/closures/exercise.md +#: src/closures/solution.md +msgid "\"FYI\"" msgstr "" -#: src/generics.md -msgid "[Generic Data Types](./generics/generic-data.md) (15 minutes)" +#: src/methods-and-traits/exercise.md src/methods-and-traits/solution.md +#: src/generics/generic-data.md +msgid "\"Uhoh\"" msgstr "" #: src/generics.md -msgid "[Trait Bounds](./generics/trait-bounds.md) (10 minutes)" -msgstr "" +#, fuzzy +msgid "impl Trait" +msgstr "`impl Trait`" #: src/generics.md -msgid "[impl Trait](./generics/impl-trait.md) (5 minutes)" -msgstr "" +#, fuzzy +msgid "dyn Trait" +msgstr "Asynkrone egenskaber (eng. Traits)" #: src/generics.md -msgid "[Exercise: Generic min](./generics/exercise.md) (10 minutes)" -msgstr "" - -#: src/generics.md src/smart-pointers.md src/iterators.md src/error-handling.md -msgid "This segment should take about 45 minutes" -msgstr "" +#, fuzzy +msgid "Exercise: Generic min" +msgstr "Øvelser" #: src/generics/generic-functions.md msgid "" @@ -5442,10 +5724,6 @@ msgid "" "structures (such as sorting or a binary tree) over the types used or stored." msgstr "" -#: src/generics/generic-functions.md -msgid "/// Pick `even` or `odd` depending on the value of `n`.\n" -msgstr "" - #: src/generics/generic-functions.md #, fuzzy msgid "\"picked a number: {:?}\"" @@ -5453,16 +5731,26 @@ msgstr "\"{numbers:?}\"" #: src/generics/generic-functions.md #, fuzzy -msgid "\"picked a tuple: {:?}\"" +msgid "\"picked a string: {:?}\"" msgstr "\"result: {:?}\"" #: src/generics/generic-functions.md -msgid "\"dog\"" -msgstr "" +#, fuzzy +msgid "'L'" +msgstr "'x'" + +#: src/generics/generic-functions.md +#, fuzzy +msgid "'R'" +msgstr "'x'" #: src/generics/generic-functions.md -msgid "\"cat\"" -msgstr "\"cat\"" +msgid "" +"It can be helpful to show the monomorphized versions of `pick`, either " +"before talking about the generic `pick` in order to show how generics can " +"reduce code duplication, or after talking about generics to show how " +"monomorphization works." +msgstr "" #: src/generics/generic-functions.md msgid "" @@ -5470,13 +5758,19 @@ msgid "" "value." msgstr "" +#: src/generics/generic-functions.md +msgid "" +"In this example we only use the primitive types `i32` and `char` for `T`, " +"but we can use any type here, including user-defined types:" +msgstr "" + #: src/generics/generic-functions.md msgid "" "This is similar to C++ templates, but Rust partially compiles the generic " "function immediately, so that function must be valid for all types matching " -"the constraints. For example, try modifying `pick` to return `even + odd` if " -"`n == 0`. Even if only the `pick` instantiation with integers is used, Rust " -"still considers it invalid. C++ would let you do this." +"the constraints. For example, try modifying `pick` to return `left + right` " +"if `cond` is false. Even if only the `pick` instantiation with integers is " +"used, Rust still considers it invalid. C++ would let you do this." msgstr "" #: src/generics/generic-functions.md @@ -5486,27 +5780,62 @@ msgid "" "hand-coded the data structures without the abstraction." msgstr "" -#: src/generics/generic-data.md -msgid "You can use generics to abstract over the concrete field type:" +#: src/generics/trait-bounds.md +msgid "" +"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 "" -#: src/generics/generic-data.md -msgid "// fn set_x(&mut self, x: T)\n" -msgstr "// fn set_x(&mut self, x: T)\n" +#: src/generics/trait-bounds.md +msgid "You can do this with `T: Trait`:" +msgstr "" -#: src/generics/generic-data.md -msgid "\"{integer:?} and {float:?}\"" -msgstr "\"{integer:?} og {float:?}\"" +#: src/generics/trait-bounds.md +msgid "\"{pair:?}\"" +msgstr "\"{pair:?}\"" + +#: src/generics/trait-bounds.md +msgid "Try making a `NotCloneable` and passing it to `duplicate`." +msgstr "" + +#: src/generics/trait-bounds.md +msgid "When multiple traits are necessary, use `+` to join them." +msgstr "" + +#: src/generics/trait-bounds.md +msgid "Show a `where` clause, students will encounter it when reading code." +msgstr "" + +#: src/generics/trait-bounds.md +msgid "It declutters the function signature if you have many parameters." +msgstr "" + +#: src/generics/trait-bounds.md +msgid "It has additional features making it more powerful." +msgstr "" + +#: src/generics/trait-bounds.md +msgid "" +"If someone asks, the extra feature is that the type on the left of \":\" can " +"be arbitrary, like `Option`." +msgstr "" + +#: src/generics/trait-bounds.md +msgid "" +"Note that Rust does not (yet) support specialization. For example, given the " +"original `duplicate`, it is invalid to add a specialized `duplicate(a: u32)`." +msgstr "" #: src/generics/generic-data.md -#, fuzzy -msgid "\"coords: {:?}\"" -msgstr "\"result: {:?}\"" +msgid "" +"You can use generics to abstract over the concrete field type. Returning to " +"the exercise for the previous segment:" +msgstr "" #: src/generics/generic-data.md msgid "" -"_Q:_ Why `T` is specified twice in `impl Point {}`? Isn't that " -"redundant?" +"_Q:_ Why is `L` specified twice in `impl .. VerbosityFilter`? " +"Isn't that redundant?" msgstr "" #: src/generics/generic-data.md @@ -5516,74 +5845,71 @@ msgid "" msgstr "" #: src/generics/generic-data.md -msgid "It means these methods are defined for any `T`." +msgid "It means these methods are defined for any `L`." msgstr "" #: src/generics/generic-data.md -msgid "It is possible to write `impl Point { .. }`." +msgid "It is possible to write `impl VerbosityFilter { .. }`." msgstr "" #: src/generics/generic-data.md msgid "" -"`Point` is still generic and you can use `Point`, but methods in this " -"block will only be available for `Point`." +"`VerbosityFilter` is still generic and you can use `VerbosityFilter`, " +"but methods in this block will only be available for " +"`VerbosityFilter`." msgstr "" #: src/generics/generic-data.md msgid "" -"Try declaring a new variable `let p = Point { x: 5, y: 10.0 };`. Update the " -"code to allow points that have elements of different types, by using two " -"type variables, e.g., `T` and `U`." +"Note that we don't put a trait bound on the `VerbosityFilter` type itself. " +"You can put bounds there as well, but generally in Rust we only put the " +"trait bounds on the impl blocks." msgstr "" -#: src/generics/trait-bounds.md +#: src/generics/generic-traits.md msgid "" -"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 "" - -#: src/generics/trait-bounds.md -msgid "You can do this with `T: Trait` or `impl Trait`:" -msgstr "" - -#: src/generics/trait-bounds.md -msgid "// struct NotClonable;\n" -msgstr "// struct NotClonable;\n" - -#: src/generics/trait-bounds.md -msgid "\"{pair:?}\"" -msgstr "\"{pair:?}\"" - -#: src/generics/trait-bounds.md -msgid "Try making a `NonClonable` and passing it to `duplicate`." +"Traits can also be generic, just like types and functions. A trait's " +"parameters get concrete types when it is used. For example the [`From`]" +"(https://doc.rust-lang.org/std/convert/trait.From.html) trait is used to " +"define type conversions:" msgstr "" -#: src/generics/trait-bounds.md -msgid "When multiple traits are necessary, use `+` to join them." +#: src/generics/generic-traits.md +msgid "\"Converted from integer: {from}\"" msgstr "" -#: src/generics/trait-bounds.md -msgid "Show a `where` clause, students will encounter it when reading code." +#: src/generics/generic-traits.md +msgid "\"Converted from bool: {from}\"" msgstr "" -#: src/generics/trait-bounds.md -msgid "It declutters the function signature if you have many parameters." +#: src/generics/generic-traits.md +msgid "" +"The `From` trait will be covered later in the course, but its [definition in " +"the `std` docs](https://doc.rust-lang.org/std/convert/trait.From.html) is " +"simple, and copied here for reference." msgstr "" -#: src/generics/trait-bounds.md -msgid "It has additional features making it more powerful." +#: src/generics/generic-traits.md +msgid "" +"Implementations of the trait do not need to cover all possible type " +"parameters. Here, `Foo::from(\"hello\")` would not compile because there is " +"no `From<&str>` implementation for `Foo`." msgstr "" -#: src/generics/trait-bounds.md +#: src/generics/generic-traits.md msgid "" -"If someone asks, the extra feature is that the type on the left of \":\" can " -"be arbitrary, like `Option`." +"Generic traits take types as \"input\", while associated types are a kind of " +"\"output\" type. A trait can have multiple implementations for different " +"input types." msgstr "" -#: src/generics/trait-bounds.md +#: src/generics/generic-traits.md msgid "" -"Note that Rust does not (yet) support specialization. For example, given the " -"original `duplicate`, it is invalid to add a specialized `duplicate(a: u32)`." +"In fact, Rust requires that at most one implementation of a trait match for " +"any type T. Unlike some other languages, Rust has no heuristic for choosing " +"the \"most specific\" match. There is work on adding this support, called " +"[specialization](https://rust-lang.github.io/rfcs/1210-impl-" +"specialization.html)." msgstr "" #: src/generics/impl-trait.md @@ -5598,22 +5924,10 @@ msgid "" "// fn add_42_millions>(x: T) -> i32 {\n" msgstr "" -#: src/generics/impl-trait.md -msgid "\"{many}\"" -msgstr "\"{many}\"" - -#: src/generics/impl-trait.md -msgid "\"{many_more}\"" -msgstr "\"{many_more}\"" - -#: src/generics/impl-trait.md -msgid "\"debuggable: {debuggable:?}\"" -msgstr "" - #: src/generics/impl-trait.md msgid "" -"`impl Trait` allows you to work with types which you cannot name. The " -"meaning of `impl Trait` is a bit different in the different positions." +"`impl Trait` allows you to work with types that you cannot name. The meaning " +"of `impl Trait` is a bit different in the different positions." msgstr "" #: src/generics/impl-trait.md @@ -5645,256 +5959,575 @@ msgid "" "the error message shows." msgstr "" -#: src/generics/exercise.md +#: src/generics/dyn-trait.md msgid "" -"In this short exercise, you will implement a generic `min` function that " -"determines the minimum of two values, using a `LessThan` trait." +"In addition to using traits for static dispatch via generics, Rust also " +"supports using them for type-erased, dynamic dispatch via trait objects:" msgstr "" -#: src/generics/exercise.md src/generics/solution.md -msgid "/// Return true if self is less than other.\n" +#: src/generics/dyn-trait.md src/smart-pointers/trait-objects.md +msgid "\"Miau!\"" msgstr "" -#: src/generics/exercise.md -msgid "// TODO: implement the `min` function used in `main`.\n" +#: src/generics/dyn-trait.md +msgid "// Uses generics and static dispatch.\n" msgstr "" -#: src/generics/exercise.md src/generics/solution.md -msgid "\"Shapiro\"" -msgstr "" +#: src/generics/dyn-trait.md src/smart-pointers/trait-objects.md +#, fuzzy +msgid "\"Hello, who are you? {}\"" +msgstr "\"Hej, mit navn er {}\"" -#: src/generics/exercise.md src/generics/solution.md -msgid "\"Baumann\"" +#: src/generics/dyn-trait.md +msgid "// Uses type-erasure and dynamic dispatch.\n" msgstr "" -#: src/welcome-day-2-afternoon.md -msgid "[Standard Library Types](./std-types.md) (1 hour and 10 minutes)" +#: src/generics/dyn-trait.md +msgid "" +"Generics, including `impl Trait`, use monomorphization to create a " +"specialized instance of the function for each different type that the " +"generic is instantiated with. This means that calling a trait method from " +"within a generic function still uses static dispatch, as the compiler has " +"full type information and can resolve that type's trait implementation to " +"use." msgstr "" -#: src/welcome-day-2-afternoon.md -msgid "[Standard Library Traits](./std-traits.md) (1 hour and 40 minutes)" +#: src/generics/dyn-trait.md +msgid "" +"When using `dyn Trait`, it instead uses dynamic dispatch through a [virtual " +"method table](https://en.wikipedia.org/wiki/Virtual_method_table) (vtable). " +"This means that there's a single version of `fn dynamic` that is used " +"regardless of what type of `Pet` is passed in." msgstr "" -#: src/std-types.md -msgid "[Standard Library](./std-types/std.md) (3 minutes)" +#: src/generics/dyn-trait.md +msgid "" +"When using `dyn Trait`, the trait object needs to be behind some kind of " +"indirection. In this case it's a reference, though smart pointer types like " +"`Box` can also be used (this will be demonstrated on day 3)." msgstr "" -#: src/std-types.md -msgid "[Documentation](./std-types/docs.md) (5 minutes)" +#: src/generics/dyn-trait.md +msgid "" +"At runtime, a `&dyn Pet` is represented as a \"fat pointer\", i.e. a pair of " +"two pointers: One pointer points to the concrete object that implements " +"`Pet`, and the other points to the vtable for the trait implementation for " +"that type. When calling the `talk` method on `&dyn Pet` the compiler looks " +"up the function pointer for `talk` in the vtable and then invokes the " +"function, passing the pointer to the `Dog` or `Cat` into that function. The " +"compiler doesn't need to know the concrete type of the `Pet` in order to do " +"this." msgstr "" -#: src/std-types.md -msgid "[Option](./std-types/option.md) (10 minutes)" +#: src/generics/dyn-trait.md +msgid "" +"A `dyn Trait` is considered to be \"type-erased\", because we no longer have " +"compile-time knowledge of what the concrete type is." msgstr "" -#: src/std-types.md -msgid "[Result](./std-types/result.md) (10 minutes)" +#: src/generics/exercise.md +msgid "" +"In this short exercise, you will implement a generic `min` function that " +"determines the minimum of two values, using the [`Ord`](https://doc.rust-" +"lang.org/stable/std/cmp/trait.Ord.html) trait." msgstr "" -#: src/std-types.md -msgid "[String](./std-types/string.md) (10 minutes)" +#: src/generics/exercise.md +msgid "// TODO: implement the `min` function used in the tests.\n" msgstr "" -#: src/std-types.md -msgid "[Vec](./std-types/vec.md) (10 minutes)" -msgstr "" +#: src/generics/exercise.md src/generics/solution.md +#, fuzzy +msgid "'z'" +msgstr "'x'" -#: src/std-types.md -msgid "[HashMap](./std-types/hashmap.md) (10 minutes)" +#: src/generics/exercise.md src/generics/solution.md +#, fuzzy +msgid "'7'" +msgstr "'x'" + +#: src/generics/exercise.md src/generics/solution.md +#, fuzzy +msgid "'1'" +msgstr "'x'" + +#: src/generics/exercise.md src/generics/solution.md +#: src/std-traits/from-and-into.md +msgid "\"hello\"" +msgstr "\"hallo\"" + +#: src/generics/exercise.md src/generics/solution.md +msgid "\"goodbye\"" msgstr "" -#: src/std-types.md -msgid "[Exercise: Counter](./std-types/exercise.md) (10 minutes)" +#: src/generics/exercise.md src/generics/solution.md +msgid "\"bat\"" msgstr "" -#: src/std-types.md src/memory-management.md src/slices-and-lifetimes.md -msgid "This segment should take about 1 hour and 10 minutes" +#: src/generics/exercise.md src/generics/solution.md +msgid "\"armadillo\"" msgstr "" -#: src/std-types.md +#: src/generics/exercise.md msgid "" -"For each of the slides in this section, spend some time reviewing the " -"documentation pages, highlighting some of the more common methods." +"Show students the [`Ord`](https://doc.rust-lang.org/stable/std/cmp/" +"trait.Ord.html) trait and [`Ordering`](https://doc.rust-lang.org/stable/std/" +"cmp/enum.Ordering.html) enum." msgstr "" -#: src/std-types/std.md +#: src/welcome-day-2-afternoon.md src/welcome-day-4.md msgid "" -"Rust comes with a standard library which helps establish a set of common " -"types used by Rust libraries and programs. This way, two libraries can work " -"together smoothly because they both use the same `String` type." +"Including 10 minute breaks, this session should take about 2 hours and 50 " +"minutes. It contains:" msgstr "" -#: src/std-types/std.md -msgid "" -"In fact, Rust contains several layers of the Standard Library: `core`, " -"`alloc` and `std`." +#: src/closures.md src/concurrency/threads.md src/concurrency/shared-state.md +msgid "This segment should take about 30 minutes. It contains:" msgstr "" -#: src/std-types/std.md +#: src/closures/syntax.md +msgid "Closures are created with vertical bars: `|..| ..`." +msgstr "" + +#: src/closures/syntax.md +msgid "// Argument and return type can be inferred for lightweight syntax:\n" +msgstr "" + +#: src/closures/syntax.md +msgid "// Or we can specify types and bracket the body to be fully explicit:\n" +msgstr "" + +#: src/closures/syntax.md msgid "" -"`core` includes the most basic types and functions that don't depend on " -"`libc`, allocator or even the presence of an operating system." +"The arguments go between the `|..|`. The body can be surrounded by `{ .. }`, " +"but if it is a single expression these can be omitted." msgstr "" -#: src/std-types/std.md +#: src/closures/syntax.md msgid "" -"`alloc` includes types which require a global heap allocator, such as `Vec`, " -"`Box` and `Arc`." +"Argument types are optional, and are inferred if not given. The return type " +"is also optional, but can only be written if using `{ .. }` around the body." msgstr "" -#: src/std-types/std.md +#: src/closures/syntax.md msgid "" -"Embedded Rust applications often only use `core`, and sometimes `alloc`." +"The examples can both be written as mere nested functions instead -- they do " +"not capture any variables from their lexical environment. We will see " +"captures next." msgstr "" -#: src/std-types/docs.md -msgid "Rust comes with extensive documentation. For example:" +#: src/closures/syntax.md +msgid "" +"The ability to store functions in variables doesn't just apply to closures, " +"regular functions can be put in variables and then invoked the same way that " +"closures can: [Example in the playground](https://play.rust-lang.org/?" +"version=stable&mode=debug&edition=2024&gist=817cbeeefc49f3d0d180a3d6d54c8bda)." msgstr "" -#: src/std-types/docs.md +#: src/closures/syntax.md msgid "" -"All of the details about [loops](https://doc.rust-lang.org/stable/reference/" -"expressions/loop-expr.html)." +"The linked example also demonstrates that closures that don't capture " +"anything can also coerce to a regular function pointer." msgstr "" -#: src/std-types/docs.md +#: src/closures/capturing.md msgid "" -"Primitive types like [`u8`](https://doc.rust-lang.org/stable/std/primitive." -"u8.html)." +"A closure can capture variables from the environment where it was defined." msgstr "" -#: src/std-types/docs.md +#: src/closures/capturing.md msgid "" -"Standard library types like [`Option`](https://doc.rust-lang.org/stable/std/" -"option/enum.Option.html) or [`BinaryHeap`](https://doc.rust-lang.org/stable/" -"std/collections/struct.BinaryHeap.html)." +"By default, a closure captures values by reference. Here `max_value` is " +"captured by `clamp`, but still available to `main` for printing. Try making " +"`max_value` mutable, changing it, and printing the clamped values again. Why " +"doesn't this work?" msgstr "" -#: src/std-types/docs.md -msgid "In fact, you can document your own code:" +#: src/closures/capturing.md +msgid "" +"If a closure mutates values, it will capture them by mutable reference. Try " +"adding `max_value += 1` to `clamp`." msgstr "" -#: src/std-types/docs.md +#: src/closures/capturing.md msgid "" -"/// Determine whether the first argument is divisible by the second " -"argument.\n" -"///\n" -"/// If the second argument is zero, the result is false.\n" +"You can force a closure to move values instead of referencing them with the " +"`move` keyword. This can help with lifetimes, for example if the closure " +"must outlive the captured values (more on lifetimes later)." msgstr "" -#: src/std-types/docs.md +#: src/closures/capturing.md msgid "" -"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." +"This looks like `move |v| ..`. Try adding this keyword and see if `main` can " +"still access `max_value` after defining `clamp`." msgstr "" -#: src/std-types/docs.md +#: src/closures/capturing.md msgid "" -"To document an item from inside the item (such as inside a module), use `//!" -"` or `/*! .. */`, called \"inner doc comments\":" +"By default, closures will capture each variable from an outer scope by the " +"least demanding form of access they can (by shared reference if possible, " +"then exclusive reference, then by move). The `move` keyword forces capture " +"by value." msgstr "" -#: src/std-types/docs.md +#: src/closures/traits.md +msgid "Closure traits" +msgstr "" + +#: src/closures/traits.md msgid "" -"//! This module contains functionality relating to divisibility of " -"integers.\n" +"Closures or lambda expressions have types that 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 "" -#: src/std-types/docs.md +#: src/closures/traits.md msgid "" -"Show students the generated docs for the `rand` crate at ." +"The special types `fn(..) -> T` refer to function pointers - either the " +"address of a function, or a closure that captures nothing." msgstr "" -#: src/std-types/option.md +#: src/closures/traits.md +msgid "\"Calling {func_name}({input}): {}\"" +msgstr "" + +#: src/closures/traits.md +msgid "\"-itis\"" +msgstr "" + +#: src/closures/traits.md #, fuzzy -msgid "Option" -msgstr "Undtagelser" +msgid "\"{x}{suffix}\"" +msgstr "\"{x}, {abs_x}\"" -#: src/std-types/option.md -msgid "" -"We have already seen some use of `Option`. It stores either a value of " -"type `T` or nothing. For example, [`String::find`](https://doc.rust-lang.org/" -"stable/std/string/struct.String.html#method.find) returns an `Option`." +#: src/closures/traits.md +msgid "\"add_suffix\"" msgstr "" -#: src/std-types/option.md -msgid "\"Löwe 老虎 Léopard Gepardi\"" +#: src/closures/traits.md +msgid "\"senior\"" msgstr "" -#: src/std-types/option.md -msgid "'é'" +#: src/closures/traits.md +msgid "\"appendix\"" msgstr "" -#: src/std-types/option.md -msgid "\"find returned {position:?}\"" +#: src/closures/traits.md +#, fuzzy +msgid "\"/\"" +msgstr "\"\"" + +#: src/closures/traits.md +#, fuzzy +msgid "\"accumulate\"" +msgstr "\"accumulate: {}\"" + +#: src/closures/traits.md +msgid "\"red\"" msgstr "" -#: src/std-types/option.md +#: src/closures/traits.md #, fuzzy -msgid "'Z'" -msgstr "'x'" +msgid "\"green\"" +msgstr "\"greetings\"" -#: src/std-types/option.md -msgid "\"Character not found\"" +#: src/closures/traits.md +msgid "\"blue\"" msgstr "" -#: src/std-types/option.md -msgid "`Option` is widely used, not just in the standard library." +#: src/closures/traits.md +msgid "\"take_and_reverse\"" msgstr "" -#: src/std-types/option.md +#: src/closures/traits.md +msgid "\"reversed: \"" +msgstr "" + +#: src/closures/traits.md msgid "" -"`unwrap` will return the value in an `Option`, or panic. `expect` is similar " -"but takes an error message." +"An `Fn` (e.g. `add_suffix`) neither consumes nor mutates captured values. It " +"can be called needing only a shared reference to the closure, which means " +"the closure can be executed repeatedly and even concurrently." msgstr "" -#: src/std-types/option.md +#: src/closures/traits.md msgid "" -"You can panic on None, but you can't \"accidentally\" forget to check for " -"None." +"An `FnMut` (e.g. `accumulate`) might mutate captured values. The closure " +"object is accessed via exclusive reference, so it can be called repeatedly " +"but not concurrently." msgstr "" -#: src/std-types/option.md +#: src/closures/traits.md msgid "" -"It's common to `unwrap`/`expect` all over the place when hacking something " -"together, but production code typically handles `None` in a nicer fashion." +"If you have an `FnOnce` (e.g. `take_and_reverse`), you may only call it " +"once. Doing so consumes the closure and any values captured by move." msgstr "" -#: src/std-types/option.md +#: src/closures/traits.md msgid "" -"The niche optimization means that `Option` often has the same size in " -"memory as `T`." +"`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/std-types/result.md -msgid "Result" +#: src/closures/traits.md +msgid "" +"When you define a function that takes a closure, you should take `FnOnce` if " +"you can (i.e. you call it once), or `FnMut` else, and last `Fn`. This allows " +"the most flexibility for the caller." msgstr "" -#: src/std-types/result.md +#: src/closures/traits.md msgid "" -"`Result` is similar to `Option`, but indicates the success or failure of an " -"operation, each with a different type. This is similar to the `Res` defined " -"in the expression exercise, but generic: `Result` where `T` is used in " -"the `Ok` variant and `E` appears in the `Err` variant." +"In contrast, when you have a closure, the most flexible you can have is `Fn` " +"(which can be passed to a consumer of any of the three closure traits), then " +"`FnMut`, and lastly `FnOnce`." msgstr "" -#: src/std-types/result.md -msgid "\"diary.txt\"" -msgstr "\"dagbog.txt\"" +#: src/closures/traits.md +msgid "" +"The compiler also infers `Copy` (e.g. for `add_suffix`) and `Clone` (e.g. " +"`take_and_reverse`), depending on what the closure captures. Function " +"pointers (references to `fn` items) implement `Copy` and `Fn`." +msgstr "" + +#: src/closures/exercise.md +msgid "" +"Building on the generic logger from this morning, implement a `Filter` that " +"uses a closure to filter log messages, sending those that pass the filtering " +"predicate to an inner logger." +msgstr "" + +#: src/closures/exercise.md +msgid "// TODO: Define and implement `Filter`.\n" +msgstr "" + +#: src/closures/exercise.md src/closures/solution.md +msgid "\"yikes\"" +msgstr "" + +#: src/closures/exercise.md src/closures/solution.md +msgid "\"yikes, something went wrong\"" +msgstr "" + +#: src/closures/exercise.md src/closures/solution.md +msgid "\"uhoh\"" +msgstr "" + +#: src/closures/solution.md +msgid "/// Only log messages matching a filtering predicate.\n" +msgstr "" + +#: src/closures/solution.md +msgid "" +"Note that the `P: Fn(u8, &str) -> bool` bound on the first `Filter` impl " +"block isn't strictly necessary, but it helps with type inference when " +"calling `new`. Demonstrate removing it and showing how the compiler now " +"needs type annotations for the closure passed to `new`." +msgstr "" + +#: src/std-types.md src/std-types/option.md +#, fuzzy +msgid "Option" +msgstr "Undtagelser" + +#: src/std-types.md src/std-types/result.md src/error-handling.md +msgid "Result" +msgstr "" + +#: src/std-types.md src/std-types/string.md +msgid "String" +msgstr "" + +#: src/std-types.md +#, fuzzy +msgid "Vec" +msgstr "`Vec`" + +#: src/std-types.md +#, fuzzy +msgid "HashMap" +msgstr "`HashMap`" + +#: src/std-types.md +msgid "" +"For each of the slides in this section, spend some time reviewing the " +"documentation pages, highlighting some of the more common methods." +msgstr "" + +#: src/std-types/std.md +msgid "" +"Rust comes with a standard library that helps establish a set of common " +"types used by Rust libraries and programs. This way, two libraries can work " +"together smoothly because they both use the same `String` type." +msgstr "" + +#: src/std-types/std.md +msgid "" +"In fact, Rust contains several layers of the Standard Library: `core`, " +"`alloc` and `std`." +msgstr "" + +#: src/std-types/std.md +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-types/std.md +msgid "" +"`alloc` includes types that require a global heap allocator, such as `Vec`, " +"`Box` and `Arc`." +msgstr "" + +#: src/std-types/std.md +msgid "" +"Embedded Rust applications often only use `core`, and sometimes `alloc`." +msgstr "" + +#: src/std-types/docs.md +msgid "Rust comes with extensive documentation. For example:" +msgstr "" + +#: src/std-types/docs.md +msgid "" +"All of the details about [loops](https://doc.rust-lang.org/stable/reference/" +"expressions/loop-expr.html)." +msgstr "" + +#: src/std-types/docs.md +msgid "" +"Primitive types like [`u8`](https://doc.rust-lang.org/stable/std/" +"primitive.u8.html)." +msgstr "" + +#: src/std-types/docs.md +msgid "" +"Standard library types like [`Option`](https://doc.rust-lang.org/stable/std/" +"option/enum.Option.html) or [`BinaryHeap`](https://doc.rust-lang.org/stable/" +"std/collections/struct.BinaryHeap.html)." +msgstr "" + +#: src/std-types/docs.md +msgid "Use `rustup doc --std` or to view the documentation." +msgstr "" + +#: src/std-types/docs.md +msgid "In fact, you can document your own code:" +msgstr "" + +#: src/std-types/docs.md +msgid "" +"/// Determine whether the first argument is divisible by the second " +"argument.\n" +"///\n" +"/// If the second argument is zero, the result is false.\n" +msgstr "" + +#: src/std-types/docs.md +msgid "" +"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/std-types/docs.md +msgid "" +"To document an item from inside the item (such as inside a module), use `//!" +"` or `/*! .. */`, called \"inner doc comments\":" +msgstr "" + +#: src/std-types/docs.md +msgid "" +"//! This module contains functionality relating to divisibility of " +"integers.\n" +msgstr "" + +#: src/std-types/docs.md +msgid "" +"Show students the generated docs for the `rand` crate at ." +msgstr "" + +#: src/std-types/option.md +msgid "" +"We have already seen some use of `Option`. It stores either a value of " +"type `T` or nothing. For example, [`String::find`](https://doc.rust-lang.org/" +"stable/std/string/struct.String.html#method.find) returns an `Option`." +msgstr "" + +#: src/std-types/option.md +msgid "\"Löwe 老虎 Léopard Gepardi\"" +msgstr "" + +#: src/std-types/option.md +msgid "'é'" +msgstr "" + +#: src/std-types/option.md +#, fuzzy +msgid "'Z'" +msgstr "'x'" + +#: src/std-types/option.md +msgid "\"Character not found\"" +msgstr "" + +#: src/std-types/option.md +msgid "`Option` is widely used, not just in the standard library." +msgstr "" + +#: src/std-types/option.md +msgid "" +"`unwrap` will return the value in an `Option`, or panic. `expect` is similar " +"but takes an error message." +msgstr "" + +#: src/std-types/option.md +msgid "" +"You can panic on None, but you can't \"accidentally\" forget to check for " +"None." +msgstr "" + +#: src/std-types/option.md +msgid "" +"It's common to `unwrap`/`expect` all over the place when hacking something " +"together, but production code typically handles `None` in a nicer fashion." +msgstr "" + +#: src/std-types/option.md +msgid "" +"The \"niche optimization\" means that `Option` often has the same size in " +"memory as `T`, if there is some representation that is not a valid value of " +"T. For example, a reference cannot be NULL, so `Option<&T>` automatically " +"uses NULL to represent the `None` variant, and thus can be stored in the " +"same memory as `&T`." +msgstr "" #: src/std-types/result.md +msgid "" +"`Result` is similar to `Option`, but indicates the success or failure of an " +"operation, each with a different enum variant. It is generic: `Result` " +"where `T` is used in the `Ok` variant and `E` appears in the `Err` variant." +msgstr "" + +#: src/std-types/result.md src/error-handling/result.md +msgid "\"diary.txt\"" +msgstr "\"dagbog.txt\"" + +#: src/std-types/result.md src/error-handling/result.md #, fuzzy msgid "\"Dear diary: {contents} ({bytes} bytes)\"" msgstr "\"Kære dagbog: {contents}\"" -#: src/std-types/result.md +#: src/std-types/result.md src/error-handling/result.md msgid "\"Could not read file content\"" msgstr "" -#: src/std-types/result.md +#: src/std-types/result.md src/error-handling/result.md msgid "\"The diary could not be opened: {err}\"" msgstr "" @@ -5916,22 +6549,18 @@ msgstr "" #: src/std-types/result.md msgid "" "`Result` is the standard type to implement error handling as we will see on " -"Day 3." -msgstr "" - -#: src/std-types/string.md -msgid "String" +"Day 4." msgstr "" #: src/std-types/string.md msgid "" -"[`String`](https://doc.rust-lang.org/std/string/struct.String.html) is the " -"standard heap-allocated growable UTF-8 string buffer:" +"[`String`](https://doc.rust-lang.org/std/string/struct.String.html) is a " +"growable UTF-8 encoded string:" msgstr "" -#: src/std-types/string.md src/std-traits/read-and-write.md -#: src/memory-management/review.md src/testing/unit-tests.md -#: src/concurrency/scoped-threads.md +#: src/std-types/string.md src/std-traits/comparisons.md +#: src/std-traits/read-and-write.md src/memory-management/review.md +#: src/testing/unit-tests.md src/concurrency/threads/scoped.md msgid "\"Hello\"" msgstr "\"Hello\"" @@ -6033,6 +6662,15 @@ msgid "" "boundaries or not." msgstr "" +#: src/std-types/string.md +msgid "" +"Many types can be converted to a string with the [`to_string`](https://" +"doc.rust-lang.org/std/string/trait.ToString.html#tymethod.to_string) method. " +"This trait is automatically implemented for all types that implement " +"`Display`, so anything that can be formatted can also be converted to a " +"string." +msgstr "" + #: src/std-types/vec.md msgid "" "[`Vec`](https://doc.rust-lang.org/std/vec/struct.Vec.html) is the standard " @@ -6097,12 +6735,6 @@ msgid "" "remove the last element." msgstr "" -#: src/std-types/vec.md -msgid "" -"Slices are covered on day 3. For now, students only need to know that a " -"value of type `Vec` gives access to all of the documented slice methods, too." -msgstr "" - #: src/std-types/hashmap.md msgid "Standard hash map with protection against HashDoS attacks:" msgstr "" @@ -6143,10 +6775,6 @@ msgstr "\"{book} er ukendt.\"" msgid "// Use the .entry() method to insert a value if nothing is found.\n" msgstr "" -#: src/std-types/hashmap.md -msgid "\"{page_counts:#?}\"" -msgstr "\"{page_counts:#?}\"" - #: src/std-types/hashmap.md msgid "" "`HashMap` is not defined in the prelude and needs to be brought into scope." @@ -6181,43 +6809,30 @@ msgstr "" #: src/std-types/hashmap.md msgid "" -"Alternatively HashMap can be built from any `Iterator` which yields key-" -"value tuples." -msgstr "" - -#: src/std-types/hashmap.md -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-types/hashmap.md -msgid "" -"Try removing `to_string()` from the example above and see if it still " -"compiles. Where do you think we might run into issues?" +"Alternatively HashMap can be built from any `Iterator` that yields key-value " +"tuples." msgstr "" #: src/std-types/hashmap.md msgid "" -"This type has several \"method-specific\" return types, such as `std::" -"collections::hash_map::Keys`. These types often appear in searches of the " -"Rust docs. Show students the docs for this type, and the helpful link back " -"to the `keys` method." +"This type has several \"method-specific\" return types, such as " +"`std::collections::hash_map::Keys`. These types often appear in searches of " +"the Rust docs. Show students the docs for this type, and the helpful link " +"back to the `keys` method." msgstr "" #: src/std-types/exercise.md msgid "" "In this exercise you will take a very simple data structure and make it " "generic. It uses a [`std::collections::HashMap`](https://doc.rust-lang.org/" -"stable/std/collections/struct.HashMap.html) to keep track of which values " +"stable/std/collections/struct.HashMap.html) to keep track of what values " "have been seen and how many times each one has appeared." msgstr "" #: src/std-types/exercise.md msgid "" -"The initial version of `Counter` is hard coded to only work for `u32` " -"values. Make the struct and its methods generic over the type of value being " +"The initial version of `Counter` is hardcoded to only work for `u32` values. " +"Make the struct and its methods generic over the type of value being " "tracked, that way `Counter` can track any type of value." msgstr "" @@ -6263,44 +6878,22 @@ msgid "\"got {} apples\"" msgstr "" #: src/std-traits.md -msgid "[Comparisons](./std-traits/comparisons.md) (10 minutes)" -msgstr "" - -#: src/std-traits.md -msgid "[Operators](./std-traits/operators.md) (10 minutes)" -msgstr "" - -#: src/std-traits.md -msgid "[From and Into](./std-traits/from-and-into.md) (10 minutes)" -msgstr "" - -#: src/std-traits.md -msgid "[Casting](./std-traits/casting.md) (5 minutes)" -msgstr "" - -#: src/std-traits.md -msgid "[Read and Write](./std-traits/read-and-write.md) (10 minutes)" -msgstr "" - -#: src/std-traits.md -msgid "[Default, struct update syntax](./std-traits/default.md) (5 minutes)" -msgstr "" - -#: src/std-traits.md -msgid "[Closures](./std-traits/closures.md) (20 minutes)" -msgstr "" +#, fuzzy +msgid "From and Into" +msgstr "`From` og `Into`" #: src/std-traits.md -msgid "[Exercise: ROT13](./std-traits/exercise.md) (30 minutes)" -msgstr "" +#, fuzzy +msgid "Read and Write" +msgstr "`Read` og `Write`" #: src/std-traits.md -msgid "This segment should take about 1 hour and 40 minutes" +msgid "Default, struct update syntax" msgstr "" #: src/std-traits.md msgid "" -"As with the standard-library types, spend time reviewing the documentation " +"As with the standard library types, spend time reviewing the documentation " "for each trait." msgstr "" @@ -6358,14 +6951,23 @@ msgid "" "them." msgstr "" +#: src/std-traits/comparisons.md +msgid "" +"When comparing references in Rust, it will compare the value of the things " +"pointed to, it will NOT compare the references themselves. That means that " +"references to two different things can compare as equal if the values " +"pointed to are the same:" +msgstr "" + #: src/std-traits/operators.md msgid "" -"Operator overloading is implemented via traits in [`std::ops`](https://doc." -"rust-lang.org/std/ops/index.html):" +"Operator overloading is implemented via traits in [`std::ops`](https://" +"doc.rust-lang.org/std/ops/index.html):" msgstr "" #: src/std-traits/operators.md -msgid "\"{:?} + {:?} = {:?}\"" +#, fuzzy +msgid "\"{p1:?} + {p2:?} = {:?}\"" msgstr "\"{:?} + {:?} = {:?}\"" #: src/std-traits/operators.md src/memory-management/drop.md @@ -6403,11 +7005,20 @@ msgid "" "i32)> for Point` would add a tuple to a `Point`." msgstr "" +#: src/std-traits/operators.md +msgid "" +"The `Not` trait (`!` operator) is notable because it does not convert the " +"argument to `bool` like the same operator in C-family languages; instead, " +"for integer types it flips each bit of the number, which, arithmetically, is " +"equivalent to subtracting the argument from `-1`: `!5 == -6`." +msgstr "" + #: src/std-traits/from-and-into.md 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:" +"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. Unlike `as`, these traits " +"correspond to lossless, infallible conversions." msgstr "" #: src/std-traits/from-and-into.md @@ -6525,13 +7136,10 @@ msgstr "" msgid "\"\\n\"" msgstr "\"\\n\"" -#: src/std-traits/read-and-write.md src/slices-and-lifetimes/str.md -msgid "\"World\"" -msgstr "\"Verden\"" - #: src/std-traits/read-and-write.md -msgid "\"Logged: {:?}\"" -msgstr "" +#, fuzzy +msgid "\"Logged: {buffer:?}\"" +msgstr "\"{buffer}\"" #: src/std-traits/default.md msgid "The `Default` Trait" @@ -6539,31 +7147,18 @@ msgstr "" #: src/std-traits/default.md msgid "" -"[`Default`](https://doc.rust-lang.org/std/default/trait.Default.html) trait " -"produces a default value for a type." +"The [`Default`](https://doc.rust-lang.org/std/default/trait.Default.html) " +"trait produces a default value for a type." msgstr "" #: src/std-traits/default.md msgid "\"John Smith\"" msgstr "\"John Smith\"" -#: src/std-traits/default.md -msgid "\"{default_struct:#?}\"" -msgstr "\"{default_struct:#?}\"" - #: src/std-traits/default.md msgid "\"Y is set!\"" msgstr "\"Y er sat!\"" -#: src/std-traits/default.md -msgid "\"{almost_default_struct:#?}\"" -msgstr "" - -#: src/std-traits/default.md src/slices-and-lifetimes/exercise.md -#: src/slices-and-lifetimes/solution.md -msgid "\"{:#?}\"" -msgstr "\"{:#?}\"" - #: src/std-traits/default.md msgid "" "It can be implemented directly or it can be derived via `#[derive(Default)]`." @@ -6602,89 +7197,6 @@ msgid "" "with-struct-update-syntax)." msgstr "" -#: src/std-traits/closures.md -msgid "" -"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 "" - -#: src/std-traits/closures.md -msgid "\"Calling function on {input}\"" -msgstr "" - -#: src/std-traits/closures.md -msgid "\"add_3: {}\"" -msgstr "\"add_3: {}\"" - -#: src/std-traits/closures.md -msgid "\"accumulate: {}\"" -msgstr "\"accumulate: {}\"" - -#: src/std-traits/closures.md -msgid "\"multiply_sum: {}\"" -msgstr "\"multiply_sum: {}\"" - -#: src/std-traits/closures.md -msgid "" -"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/std-traits/closures.md -msgid "" -"An `FnMut` (e.g. `accumulate`) might mutate captured values. You can call it " -"multiple times, but not concurrently." -msgstr "" - -#: src/std-traits/closures.md -msgid "" -"If you have an `FnOnce` (e.g. `multiply_sum`), you may only call it once. It " -"might consume captured values." -msgstr "" - -#: src/std-traits/closures.md -msgid "" -"`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/std-traits/closures.md -msgid "" -"When you define a function that takes a closure, you should take `FnOnce` if " -"you can (i.e. you call it once), or `FnMut` else, and last `Fn`. This allows " -"the most flexibility for the caller." -msgstr "" - -#: src/std-traits/closures.md -msgid "" -"In contrast, when you have a closure, the most flexible you can have is `Fn` " -"(it can be passed everywhere), then `FnMut`, and lastly `FnOnce`." -msgstr "" - -#: src/std-traits/closures.md -msgid "" -"The compiler also infers `Copy` (e.g. for `add_3`) and `Clone` (e.g. " -"`multiply_sum`), depending on what the closure captures." -msgstr "" - -#: src/std-traits/closures.md -msgid "" -"By default, closures will capture by reference if they can. The `move` " -"keyword makes them capture by value." -msgstr "" - -#: src/std-traits/closures.md -msgid "\"Hi\"" -msgstr "\"Hej\"" - -#: src/std-traits/closures.md -msgid "\"there\"" -msgstr "\"der\"" - #: src/std-traits/exercise.md msgid "" "In this example, you will implement the classic [\"ROT13\" cipher](https://" @@ -6711,11 +7223,6 @@ msgid "" "by 13 characters?" msgstr "" -#: src/std-traits/solution.md -#, fuzzy -msgid "'A'" -msgstr "'x'" - #: src/welcome-day-3.md msgid "Welcome to Day 3" msgstr "Velkommen til Dag 3" @@ -6734,56 +7241,18 @@ msgstr "" msgid "Smart pointers: standard library pointer types." msgstr "" -#: src/welcome-day-3.md -msgid "[Welcome](./welcome-day-3.md) (3 minutes)" -msgstr "" - -#: src/welcome-day-3.md -msgid "[Memory Management](./memory-management.md) (1 hour and 10 minutes)" -msgstr "" - -#: src/welcome-day-3.md -msgid "[Smart Pointers](./smart-pointers.md) (45 minutes)" -msgstr "" - -#: src/welcome-day-3.md -msgid "" -"Including 10 minute breaks, this session should take about 2 hours and 15 " -"minutes" -msgstr "" - -#: src/memory-management.md -msgid "[Review of Program Memory](./memory-management/review.md) (5 minutes)" -msgstr "" - -#: src/memory-management.md +#: src/welcome-day-3.md src/welcome-day-4-afternoon.md msgid "" -"[Approaches to Memory Management](./memory-management/approaches.md) (10 " -"minutes)" -msgstr "" - -#: src/memory-management.md -msgid "[Ownership](./memory-management/ownership.md) (5 minutes)" -msgstr "" - -#: src/memory-management.md -msgid "[Move Semantics](./memory-management/move.md) (10 minutes)" -msgstr "" - -#: src/memory-management.md -msgid "[Clone](./memory-management/clone.md) (2 minutes)" -msgstr "" - -#: src/memory-management.md -msgid "[Copy Types](./memory-management/copy-types.md) (5 minutes)" +"Including 10 minute breaks, this session should take about 2 hours and 20 " +"minutes. It contains:" msgstr "" -#: src/memory-management.md -msgid "[Drop](./memory-management/drop.md) (10 minutes)" +#: src/memory-management.md src/memory-management/clone.md +msgid "Clone" msgstr "" #: src/memory-management.md -msgid "[Exercise: Builder Type](./memory-management/exercise.md) (20 minutes)" +msgid "Drop" msgstr "" #: src/memory-management/review.md @@ -6819,7 +7288,7 @@ msgid "Values have dynamic sizes determined at runtime." msgstr "" #: src/memory-management/review.md -msgid "Slightly slower than the stack: some book-keeping needed." +msgid "Slightly slower than the stack: some bookkeeping needed." msgstr "" #: src/memory-management/review.md @@ -6869,7 +7338,7 @@ msgid "" msgstr "" #: src/memory-management/review.md -msgid "\"ptr = {ptr:#x}, len = {len}, capacity = {capacity}\"" +msgid "\"capacity = {capacity}, ptr = {ptr:#x}, len = {len}\"" msgstr "" #: src/memory-management/approaches.md @@ -6906,8 +7375,7 @@ msgid "" msgstr "" #: src/memory-management/approaches.md -msgid "" -"Typically implemented with reference counting, garbage collection, or RAII." +msgid "Typically implemented with reference counting or garbage collection." msgstr "" #: src/memory-management/approaches.md @@ -6941,7 +7409,7 @@ msgstr "" msgid "" "C++ has tools like smart pointers (`unique_ptr`, `shared_ptr`) that take " "advantage of language guarantees about calling destructors to ensure memory " -"is freed when a function returns. It is still quite easy to mis-use these " +"is freed when a function returns. It is still quite easy to misuse these " "tools and create similar bugs to C." msgstr "" @@ -6957,10 +7425,10 @@ msgstr "" msgid "" "Rust's ownership and borrowing model can, in many cases, get the performance " "of C, with alloc and free operations precisely where they are required -- " -"zero cost. It also provides tools similar to C++'s smart pointers. When " +"zero-cost. It also provides tools similar to C++'s smart pointers. When " "required, other options such as reference counting are available, and there " -"are even third-party crates available to support runtime garbage collection " -"(not covered in this class)." +"are even crates available to support runtime garbage collection (not covered " +"in this class)." msgstr "" #: src/memory-management/ownership.md @@ -6983,7 +7451,7 @@ msgstr "" #: src/memory-management/ownership.md msgid "" -"Students familiar with garbage-collection implementations will know that a " +"Students familiar with garbage collection implementations will know that a " "garbage collector starts with a set of \"roots\" to find all reachable " "memory. Rust's \"single owner\" principle is a similar idea." msgstr "" @@ -6992,16 +7460,12 @@ msgstr "" msgid "An assignment will transfer _ownership_ between variables:" msgstr "" -#: src/memory-management/move.md +#: src/memory-management/move.md src/concurrency/async-control-flow/select.md msgid "\"Hello!\"" msgstr "" -#: src/memory-management/move.md src/slices-and-lifetimes/str.md -msgid "\"s2: {s2}\"" -msgstr "\"s2: {s2}\"" - #: src/memory-management/move.md -msgid "// println!(\"s1: {s1}\");\n" +msgid "// dbg!(s1);\n" msgstr "" #: src/memory-management/move.md @@ -7025,23 +7489,24 @@ msgid "After move to `s2`:" msgstr "" #: src/memory-management/move.md +#, fuzzy msgid "" "```bob\n" " Stack Heap\n" -".- - - - - - - - - - - - - -. .- - - - - - - - - - - - - -.\n" -": : : :\n" -": s1 \"(inaccessible)\" : : :\n" -": +-----------+-------+ : : +----+----+----+----+ :\n" -": | ptr | o---+---+--+--+-->| R | u | s | t | :\n" -": | len | 4 | : | : +----+----+----+----+ :\n" -": | capacity | 4 | : | : :\n" -": +-----------+-------+ : | : :\n" -": : | `- - - - - - - - - - - - - -'\n" +".- - - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - -.\n" +": : : :\n" +": s1 \"(inaccessible)\" : : :\n" +": +-----------+-------+ : : +----+----+----+----+----+----+ :\n" +": | ptr | o---+---+--+--+-->| H | e | l | l | o | ! | :\n" +": | len | 6 | : | : +----+----+----+----+----+----+ :\n" +": | capacity | 6 | : | : :\n" +": +-----------+-------+ : | : :\n" +": : | `- - - - - - - - - - - - - - - - - - -'\n" ": s2 : |\n" ": +-----------+-------+ : |\n" ": | ptr | o---+---+--'\n" -": | len | 4 | :\n" -": | capacity | 4 | :\n" +": | len | 6 | :\n" +": | capacity | 6 | :\n" ": +-----------+-------+ :\n" ": :\n" "`- - - - - - - - - - - - - -'\n" @@ -7074,11 +7539,12 @@ msgid "" "parameter. This transfers ownership:" msgstr "" -#: src/memory-management/move.md +#: src/memory-management/move.md src/memory-management/clone.md msgid "\"Hello {name}\"" msgstr "" -#: src/memory-management/move.md src/android/interoperability/java.md +#: src/memory-management/move.md src/memory-management/clone.md +#: src/android/aidl/types/parcelables.md src/android/interoperability/java.md msgid "\"Alice\"" msgstr "" @@ -7132,8 +7598,8 @@ msgstr "" #: src/memory-management/move.md msgid "" -"Alternatively, `main` can pass a clone of `name` in the first call (`name." -"clone()`)." +"Alternatively, `main` can pass a clone of `name` in the first call " +"(`name.clone()`)." msgstr "" #: src/memory-management/move.md @@ -7194,11 +7660,7 @@ msgstr "" #: src/memory-management/move.md msgid "" "Unlike Rust, `=` in C++ can run arbitrary code as determined by the type " -"which is being copied or moved." -msgstr "" - -#: src/memory-management/clone.md -msgid "Clone" +"that is being copied or moved." msgstr "" #: src/memory-management/clone.md @@ -7210,8 +7672,7 @@ msgstr "" #: src/memory-management/clone.md msgid "" "The idea of `Clone` is to make it easy to spot where heap allocations are " -"occurring. Look for `.clone()` and a few others like `Vec::new` or `Box::" -"new`." +"occurring. Look for `.clone()` and a few others like `vec!` or `Box::new`." msgstr "" #: src/memory-management/clone.md @@ -7220,6 +7681,18 @@ msgid "" "and return later to try to optimize those clones away." msgstr "" +#: src/memory-management/clone.md +msgid "" +"`clone` generally performs a deep copy of the value, meaning that if you " +"e.g. clone an array, all of the elements of the array are cloned as well." +msgstr "" + +#: src/memory-management/clone.md +msgid "" +"The behavior for `clone` is user-defined, so it can perform custom cloning " +"logic if needed." +msgstr "" + #: src/memory-management/copy-types.md msgid "" "While move semantics are the default, certain types are copied by default:" @@ -7286,26 +7759,34 @@ msgstr "" msgid "Show that it works if you clone `p1` instead." msgstr "" +#: src/memory-management/copy-types.md +msgid "" +"Shared references are `Copy`/`Clone`, mutable references are not. This is " +"because Rust requires that mutable references be exclusive, so while it's " +"valid to make a copy of a shared reference, creating a copy of a mutable " +"reference would violate Rust's borrowing rules." +msgstr "" + #: src/memory-management/drop.md msgid "The `Drop` Trait" msgstr "" #: src/memory-management/drop.md 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:" +"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/memory-management/drop.md msgid "\"Dropping {}\"" msgstr "\"Dropper {}\"" -#: src/memory-management/drop.md src/exercises/concurrency/link-checker.md -#: src/exercises/concurrency/solutions-morning.md +#: src/memory-management/drop.md src/concurrency/sync-exercises/link-checker.md +#: src/concurrency/sync-exercises/solutions.md msgid "\"a\"" msgstr "\"a\"" -#: src/memory-management/drop.md src/testing/googletest.md +#: src/memory-management/drop.md src/android/testing/googletest.md msgid "\"b\"" msgstr "\"b\"" @@ -7318,11 +7799,11 @@ msgid "\"d\"" msgstr "\"d\"" #: src/memory-management/drop.md -msgid "\"Exiting block B\"" +msgid "\"Exiting innermost block\"" msgstr "" #: src/memory-management/drop.md -msgid "\"Exiting block A\"" +msgid "\"Exiting next block\"" msgstr "" #: src/memory-management/drop.md @@ -7339,8 +7820,8 @@ msgstr "" #: src/memory-management/drop.md msgid "" -"When a value is dropped, if it implements `std::ops::Drop` then its `Drop::" -"drop` implementation will be called." +"When a value is dropped, if it implements `std::ops::Drop` then its " +"`Drop::drop` implementation will be called." msgstr "" #: src/memory-management/drop.md @@ -7451,10 +7932,6 @@ msgstr "" msgid "\"0.13\"" msgstr "" -#: src/memory-management/exercise.md src/memory-management/solution.md -msgid "\"base64: {base64:?}\"" -msgstr "" - #: src/memory-management/exercise.md src/memory-management/solution.md msgid "\"log\"" msgstr "" @@ -7463,11 +7940,6 @@ msgstr "" msgid "\"0.4\"" msgstr "" -#: src/memory-management/exercise.md src/memory-management/solution.md -#, fuzzy -msgid "\"log: {log:?}\"" -msgstr "\"{dog:?}\"" - #: src/memory-management/exercise.md src/memory-management/solution.md #, fuzzy msgid "\"serde\"" @@ -7481,30 +7953,19 @@ msgstr "" msgid "\"4.0\"" msgstr "" -#: src/memory-management/exercise.md src/memory-management/solution.md -#, fuzzy -msgid "\"serde: {serde:?}\"" -msgstr "\"expr: {:?}\"" - #: src/memory-management/solution.md msgid "\"0.1\"" msgstr "" #: src/smart-pointers.md -msgid "[Box" -msgstr "" - -#: src/smart-pointers.md -msgid "](./smart-pointers/box.md) (10 minutes)" -msgstr "" - -#: src/smart-pointers.md -msgid "[Rc](./smart-pointers/rc.md) (5 minutes)" -msgstr "" +#, fuzzy +msgid "Box" +msgstr "`Box`" #: src/smart-pointers.md -msgid "[Exercise: Binary Tree](./smart-pointers/exercise.md) (30 minutes)" -msgstr "" +#, fuzzy +msgid "Rc" +msgstr "`Rc`" #: src/smart-pointers/box.md msgid "" @@ -7525,7 +7986,8 @@ msgstr "" #: src/smart-pointers/box.md msgid "" -"Recursive data types or data types with dynamic sizes need to use a `Box`:" +"Recursive data types or data types with dynamic sizes cannot be stored " +"inline without a pointer indirection. `Box` accomplishes that indirection:" msgstr "" #: src/smart-pointers/box.md @@ -7593,8 +8055,8 @@ msgstr "" #: src/smart-pointers/box.md msgid "" -"have a type whose size that can't be known at compile time, but the Rust " -"compiler wants to know an exact size." +"have a type whose size can't be known at compile time, but the Rust compiler " +"wants to know an exact size." msgstr "" #: src/smart-pointers/box.md @@ -7607,8 +8069,8 @@ msgstr "" #: src/smart-pointers/box.md msgid "" "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)." +"`List`, the compiler would not be able to compute a fixed size for the " +"struct in memory (the `List` would be of infinite size)." msgstr "" #: src/smart-pointers/box.md @@ -7619,55 +8081,18 @@ msgstr "" #: src/smart-pointers/box.md 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/smart-pointers/box.md -msgid "Niche Optimization" -msgstr "" - -#: src/smart-pointers/box.md -msgid "" -"A `Box` cannot be empty, so the pointer is always valid and non-`null`. This " -"allows the compiler to optimize the memory layout:" +"Remove the `Box` in the List definition and show the compiler error. We get " +"the message \"recursive without indirection\", because for data recursion, " +"we have to use indirection, a `Box` or reference of some kind, instead of " +"storing the value directly." msgstr "" #: src/smart-pointers/box.md -#, fuzzy msgid "" -"```bob\n" -" Stack Heap\n" -".- - - - - - - - - - - - - - . .- - - - - - - - - - - - - -.\n" -": : : :\n" -": list : : :\n" -": +---------+----+----+ : : +---------+----+----+ :\n" -": | Element | 1 | o--+----+-----+--->| Element | 2 | // | :\n" -": +---------+----+----+ : : +---------+----+----+ :\n" -": : : :\n" -": : : :\n" -"'- - - - - - - - - - - - - - ' '- - - - - - - - - - - - - -'\n" -"```" +"Though `Box` looks like `std::unique_ptr` in C++, it cannot be empty/null. " +"This makes `Box` one of the types that allow the compiler to optimize " +"storage of some enums (the \"niche optimization\")." msgstr "" -"```bob\n" -" Stak Heap\n" -".- - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - - " -"- -.\n" -": : : :\n" -": " -"list : : :\n" -": +------+----+----+ : : +------+----+----+ +------+----+----" -"+ :\n" -": | Cons | 1 | o--+----+-----+--->| Cons | 2 | o--+--->| Nil | // | // " -"| :\n" -": +------+----+----+ : : +------+----+----+ +------+----+----" -"+ :\n" -": : : :\n" -": : : :\n" -"'- - - - - - - - - - - - -' '- - - - - - - - - - - - - - - - - - - - - - " -"- -'\n" -"```" #: src/smart-pointers/rc.md msgid "" @@ -7677,24 +8102,23 @@ msgid "" msgstr "" #: src/smart-pointers/rc.md -msgid "\"a: {a}\"" -msgstr "\"a: {a}\"" - -#: src/smart-pointers/rc.md -msgid "\"b: {b}\"" -msgstr "\"b: {b}\"" +msgid "" +"Each `Rc` points to the same shared data structure, containing strong and " +"weak pointers and the value:" +msgstr "" #: src/smart-pointers/rc.md msgid "" -"See [`Arc`](../concurrency/shared_state/arc.md) and [`Mutex`](https://doc." -"rust-lang.org/std/sync/struct.Mutex.html) if you are in a multi-threaded " +"See [`Arc`](../concurrency/shared-state/arc.md) and [`Mutex`](https://" +"doc.rust-lang.org/std/sync/struct.Mutex.html) if you are in a multi-threaded " "context." msgstr "" #: src/smart-pointers/rc.md msgid "" -"You can _downgrade_ a shared pointer into a [`Weak`](https://doc.rust-lang." -"org/std/rc/struct.Weak.html) pointer to create cycles that will get dropped." +"You can _downgrade_ a shared pointer into a [`Weak`](https://doc.rust-" +"lang.org/std/rc/struct.Weak.html) pointer to create cycles that will get " +"dropped." msgstr "" #: src/smart-pointers/rc.md @@ -7730,80 +8154,213 @@ msgid "" "cycles that will be dropped properly (likely in combination with `RefCell`)." msgstr "" -#: src/smart-pointers/exercise.md +#: src/smart-pointers/trait-objects.md msgid "" -"A binary tree is a tree-type data structure where every node has two " -"children (left and right). We will create a tree where each node stores a " -"value. For a given node N, all nodes in a N's left subtree contain smaller " -"values, and all nodes in N's right subtree will contain larger values." +"We previously saw how trait objects can be used with references, e.g `&dyn " +"Pet`. However, we can also use trait objects with smart pointers like `Box` " +"to create an owned trait object: `Box`." msgstr "" -#: src/smart-pointers/exercise.md -msgid "Implement the following types, so that the given tests pass." +#: src/smart-pointers/trait-objects.md +msgid "Memory layout after allocating `pets`:" msgstr "" -#: src/smart-pointers/exercise.md +#: src/smart-pointers/trait-objects.md +#, fuzzy msgid "" -"Extra Credit: implement an iterator over a binary tree that returns the " -"values in order." +"```bob\n" +" Stack Heap\n" +".- - - - - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - " +"- - - -.\n" +": : : :\n" +": \"pets: Vec>\" : : \"data: Cat\" +----+----" +"+----+----+ :\n" +": +-----------+-------+ : : +-------+-------+ | F | i | d " +"| o | :\n" +": | ptr | o---+-------+--. : | lives | 9 | +----+----+----" +"+----+ :\n" +": | len | 2 | : | : +-------+-------+ " +"^ :\n" +": | capacity | 2 | : | : ^ " +"| :\n" +": +-----------+-------+ : | : | " +"'-------. :\n" +": : | : | data:" +"\"Dog\"| :\n" +": : | : | +-------" +"+--|-------+ :\n" +"`- - - - - - - - - - - - - - - -' | : +---|-+-----+ | name | o, " +"4, 4 | :\n" +" `--+-->| o o | o o-|----->| age " +"| 5 | :\n" +" : +-|---+-|---+ +-------" +"+----------+ :\n" +" : | " +"| :\n" +" `- - -| - - |- - - - - - - - - - - - - " +"- - - -'\n" +" | |\n" +" | | " +"\"Program text\"\n" +" .- - -| - - |- - - - - - - - - - - - - " +"- - - -.\n" +" : | | " +"vtable :\n" +" : | | " +"+----------------------+ :\n" +" : | `----->| \"::talk\" | :\n" +" : | " +"+----------------------+ :\n" +" : | " +"vtable :\n" +" : | " +"+----------------------+ :\n" +" : '----------->| \"::talk\" | :\n" +" : " +"+----------------------+ :\n" +" : :\n" +" '- - - - - - - - - - - - - - - - - - - " +"- - - -'\n" +"```" msgstr "" +"```bob\n" +" Stak Heap\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" +" : :\n" +" '- - - - - - - - - - - - - - - - - - - - - " +"- -'\n" +"\n" +"```" -#: src/smart-pointers/exercise.md src/smart-pointers/solution.md -msgid "/// A node in the binary tree.\n" +#: src/smart-pointers/trait-objects.md +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." msgstr "" -#: src/smart-pointers/exercise.md src/smart-pointers/solution.md -msgid "/// A possibly-empty subtree.\n" +#: src/smart-pointers/trait-objects.md +msgid "" +"`dyn Pet` is a way to tell the compiler about a dynamically sized type that " +"implements `Pet`." msgstr "" -#: src/smart-pointers/exercise.md src/smart-pointers/solution.md +#: src/smart-pointers/trait-objects.md msgid "" -"/// A container storing a set of values, using a binary tree.\n" -"///\n" -"/// If the same value is added multiple times, it is only stored once.\n" +"In the example, `pets` is allocated on the stack and the vector data is on " +"the heap. The two vector elements are _fat pointers_:" msgstr "" -#: src/smart-pointers/exercise.md -msgid "// Implement `new`, `insert`, `len`, and `has`.\n" +#: src/smart-pointers/trait-objects.md +msgid "" +"A fat pointer is a double-width pointer. It has two components: a pointer to " +"the actual object and a pointer to the [virtual method table](https://" +"en.wikipedia.org/wiki/Virtual_method_table) (vtable) for the `Pet` " +"implementation of that particular object." msgstr "" -#: src/smart-pointers/exercise.md src/smart-pointers/solution.md -msgid "// not a unique item\n" +#: src/smart-pointers/trait-objects.md +msgid "" +"The data for the `Dog` named Fido is the `name` and `age` fields. The `Cat` " +"has a `lives` field." msgstr "" -#: src/smart-pointers/solution.md src/testing/googletest.md -msgid "\"bar\"" -msgstr "\"bar\"" - -#: src/welcome-day-3-afternoon.md -msgid "[Borrowing](./borrowing.md) (1 hour)" +#: src/smart-pointers/trait-objects.md +msgid "Compare these outputs in the above example:" msgstr "" -#: src/welcome-day-3-afternoon.md +#: src/smart-pointers/trait-objects.md +msgid "\"{} {}\"" +msgstr "\"{} {}\"" + +#: src/smart-pointers/trait-objects.md src/modules/exercise.md +#: src/modules/solution.md src/android/build-rules/library.md +#: src/android/interoperability/cpp/rust-bridge.md +#: src/concurrency/async-pitfalls/cancellation.md +msgid "\"{}\"" +msgstr "\"{}\"" + +#: src/smart-pointers/exercise.md msgid "" -"[Slices and Lifetimes](./slices-and-lifetimes.md) (1 hour and 10 minutes)" +"A binary tree is a tree-type data structure where every node has two " +"children (left and right). We will create a tree where each node stores a " +"value. For a given node N, all nodes in a N's left subtree contain smaller " +"values, and all nodes in N's right subtree will contain larger values. A " +"given value should only be stored in the tree once, i.e. no duplicate nodes." msgstr "" -#: src/welcome-day-3-afternoon.md -msgid "" -"Including 10 minute breaks, this session should take about 2 hours and 20 " -"minutes" +#: src/smart-pointers/exercise.md +msgid "Implement the following types, so that the given tests pass." +msgstr "" + +#: src/smart-pointers/exercise.md src/smart-pointers/solution.md +msgid "/// A node in the binary tree.\n" +msgstr "" + +#: src/smart-pointers/exercise.md src/smart-pointers/solution.md +msgid "/// A possibly-empty subtree.\n" msgstr "" -#: src/borrowing.md -msgid "[Borrowing a Value](./borrowing/shared.md) (10 minutes)" +#: src/smart-pointers/exercise.md src/smart-pointers/solution.md +msgid "" +"/// A container storing a set of values, using a binary tree.\n" +"///\n" +"/// If the same value is added multiple times, it is only stored once.\n" msgstr "" -#: src/borrowing.md -msgid "[Borrow Checking](./borrowing/borrowck.md) (10 minutes)" +#: src/smart-pointers/exercise.md +msgid "// Implement `new`, `insert`, `len`, and `has` for `Subtree`.\n" msgstr "" -#: src/borrowing.md -msgid "[Interior Mutability](./borrowing/interior-mutability.md) (10 minutes)" +#: src/smart-pointers/exercise.md src/smart-pointers/solution.md +msgid "// not a unique item\n" msgstr "" -#: src/borrowing.md -msgid "[Exercise: Health Statistics](./borrowing/exercise.md) (30 minutes)" +#: src/welcome-day-3-afternoon.md +msgid "" +"Including 10 minute breaks, this session should take about 1 hour and 55 " +"minutes. It contains:" msgstr "" #: src/borrowing/shared.md @@ -7827,36 +8384,45 @@ msgid "" msgstr "" #: src/borrowing/shared.md -msgid "Notes on stack returns:" +msgid "Notes on stack returns and inlining:" msgstr "" #: src/borrowing/shared.md 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](https://play.rust-lang.org/?" -"version=stable&mode=release&edition=2021&gist=0cb13be1c05d7e3446686ad9947c4671) " +"eliminate the copy operation, by inlining the call to add into main. Change " +"the above code to print stack addresses and run it on the [Playground]" +"(https://play.rust-lang.org/?" +"version=stable&mode=release&edition=2024&gist=0cb13be1c05d7e3446686ad9947c4671) " "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/borrowing/shared.md -msgid "The Rust compiler can do return value optimization (RVO)." +msgid "" +"The Rust compiler can do automatic inlining, that can be disabled on a " +"function level with `#[inline(never)]`." msgstr "" #: src/borrowing/shared.md 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." +"Once disabled, the printed address will change on all optimization levels. " +"Looking at Godbolt or Playground, one can see that in this case, the return " +"of the value depends on the ABI, e.g. on amd64 the two i32 that is making up " +"the point will be returned in 2 registers (eax and edx)." msgstr "" #: src/borrowing/borrowck.md msgid "" "Rust's _borrow checker_ puts constraints on the ways you can borrow values. " -"For a given value, at any time:" +"We've already seen that a reference cannot _outlive_ the value it borrows:" +msgstr "" + +#: src/borrowing/borrowck.md +msgid "" +"There's also a second main rule that the borrow checker enforces: The " +"_aliasing_ rule. For a given value, at any time:" msgstr "" #: src/borrowing/borrowck.md @@ -7869,8 +8435,9 @@ msgstr "" #: src/borrowing/borrowck.md msgid "" -"Note that the requirement is that conflicting references not _exist_ at the " -"same point. It does not matter where the reference is dereferenced." +"The \"outlives\" rule was demonstrated previously when we first looked at " +"references. We review it here to show students that the borrow checking is " +"following a few different rules to validate borrowing." msgstr "" #: src/borrowing/borrowck.md @@ -7881,323 +8448,217 @@ msgstr "" #: src/borrowing/borrowck.md msgid "" -"Move the `println!` statement for `b` before the scope that introduces `c` " -"to make the code compile." +"Note that the requirement is that conflicting references not _exist_ at the " +"same point. It does not matter where the reference is dereferenced. Try " +"commenting out `*c = 20` and show that the compiler error still occurs even " +"if we never use `c`." msgstr "" #: src/borrowing/borrowck.md 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\"." +"Note that the intermediate reference `c` isn't necessary to trigger a borrow " +"conflict. Replace `c` with a direct mutation of `a` and demonstrate that " +"this produces a similar error. This is because direct mutation of a value " +"effectively creates a temporary mutable reference." msgstr "" #: src/borrowing/borrowck.md msgid "" -"The exclusive reference constraint is quite strong. Rust uses it to ensure " -"that data races do not occur. Rust also _relies_ on this constraint to " -"optimize code. For example, a value behind a shared reference can be safely " -"cached in a register for the lifetime of that reference." +"Move the `dbg!` statement for `b` before the scope that introduces `c` to " +"make the code compile." msgstr "" #: src/borrowing/borrowck.md msgid "" -"The borrow checker is designed to accommodate many common patterns, such as " -"taking exclusive references to different fields in a struct at the same " -"time. But, there are some situations where it doesn't quite \"get it\" and " -"this often results in \"fighting with the borrow checker.\"" +"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/borrowing/interior-mutability.md +#: src/borrowing/borrowck.md msgid "" -"In some situations, it's necessary to modify data behind a shared (read-" -"only) reference. For example, a shared data structure might have an internal " -"cache, and wish to update that cache from read-only methods." +"Technically, multiple mutable references to a piece of data can exist at the " +"same time via re-borrowing. This is what allows you to pass a mutable " +"reference into a function without invalidating the original reference. [This " +"playground example](https://play.rust-lang.org/?" +"version=stable&mode=debug&edition=2024&gist=8f5896878611566845fe3b0f4dc5af68) " +"demonstrates that behavior." msgstr "" -#: src/borrowing/interior-mutability.md +#: src/borrowing/borrowck.md msgid "" -"The \"interior mutability\" pattern allows exclusive (mutable) access behind " -"a shared reference. The standard library provides several ways to do this, " -"all while still ensuring safety, typically by performing a runtime check." -msgstr "" - -#: src/borrowing/interior-mutability.md -#, fuzzy -msgid "`RefCell`" -msgstr "`RefCell`" - -#: src/borrowing/interior-mutability.md -msgid "\"graph: {root:#?}\"" +"Rust uses the exclusive reference constraint to ensure that data races do " +"not occur in multi-threaded code, since only one thread can have mutable " +"access to a piece of data at a time." msgstr "" -#: src/borrowing/interior-mutability.md -msgid "\"graph sum: {}\"" -msgstr "" - -#: src/borrowing/interior-mutability.md -#, fuzzy -msgid "`Cell`" -msgstr "`Cell`" - -#: src/borrowing/interior-mutability.md +#: src/borrowing/borrowck.md msgid "" -"`Cell` wraps a value and allows getting or setting the value, even with a " -"shared reference to the `Cell`. However, it does not allow any references to " -"the value. Since there are no references, borrowing rules cannot be broken." +"Rust also uses this constraint to optimize code. For example, a value behind " +"a shared reference can be safely cached in a register for the lifetime of " +"that reference." msgstr "" -#: src/borrowing/interior-mutability.md +#: src/borrowing/borrowck.md msgid "" -"The main thing to take away from this slide is that Rust provides _safe_ " -"ways to modify data behind a shared reference. There are a variety of ways " -"to ensure that safety, and `RefCell` and `Cell` are two of them." +"Fields of a struct can be borrowed independently of each other, but calling " +"a method on a struct will borrow the whole struct, potentially invalidating " +"references to individual fields. See [this playground snippet](https://" +"play.rust-lang.org/?" +"version=stable&mode=debug&edition=2024&gist=f293a31f2d4d0d31770486247c2e8437) " +"for an example of this." msgstr "" -#: src/borrowing/interior-mutability.md +#: src/borrowing/examples.md msgid "" -"`RefCell` enforces Rust's usual borrowing rules (either multiple shared " -"references or a single exclusive reference) with a runtime check. In this " -"case, all borrows are very short and never overlap, so the checks always " -"succeed." +"As a concrete example of how these borrowing rules prevent memory errors, " +"consider the case of modifying a collection while there are references to " +"its elements:" msgstr "" -#: src/borrowing/interior-mutability.md -msgid "" -"`Rc` only allows shared (read-only) access to its contents, since its " -"purpose is to allow (and count) many references. But we want to modify the " -"value, so we need interior mutability." +#: src/borrowing/examples.md +msgid "Similarly, consider the case of iterator invalidation:" msgstr "" -#: src/borrowing/interior-mutability.md +#: src/borrowing/examples.md msgid "" -"`Cell` is a simpler means to ensure safety: it has a `set` method that takes " -"`&self`. This needs no runtime check, but requires moving values, which can " -"have its own cost." +"In both of these cases, modifying the collection by pushing new elements " +"into it can potentially invalidate existing references to the collection's " +"elements if the collection has to reallocate." msgstr "" #: src/borrowing/interior-mutability.md msgid "" -"Demonstrate that reference loops can be created by adding `root` to `subtree." -"children`." +"In some situations, it's necessary to modify data behind a shared (read-" +"only) reference. For example, a shared data structure might have an internal " +"cache, and wish to update that cache from read-only methods." msgstr "" #: src/borrowing/interior-mutability.md msgid "" -"To demonstrate a runtime panic, add a `fn inc(&mut self)` that increments " -"`self.value` and calls the same method on its children. This will panic in " -"the presence of the reference loop, with `thread 'main' panicked at 'already " -"borrowed: BorrowMutError'`." -msgstr "" - -#: src/borrowing/exercise.md -msgid "" -"You're working on implementing a health-monitoring system. As part of that, " -"you need to keep track of users' health statistics." -msgstr "" - -#: src/borrowing/exercise.md -msgid "" -"You'll start with a stubbed function in an `impl` block as well as a `User` " -"struct definition. Your goal is to implement the stubbed out method on the " -"`User` `struct` defined in the `impl` block." -msgstr "" - -#: src/borrowing/exercise.md -msgid "" -"Copy the code below to and fill in the missing " -"method:" -msgstr "" - -#: src/borrowing/exercise.md -msgid "" -"\"Update a user's statistics based on measurements from a visit to the " -"doctor\"" -msgstr "" - -#: src/borrowing/exercise.md src/borrowing/solution.md -#: src/android/build-rules/library.md src/android/aidl/client.md -msgid "\"Bob\"" -msgstr "\"Bob\"" - -#: src/borrowing/exercise.md src/borrowing/solution.md -msgid "\"I'm {} and my age is {}\"" -msgstr "" - -#: src/slices-and-lifetimes.md -msgid "[Slices: &\\[T\\]](./slices-and-lifetimes/slices.md) (10 minutes)" -msgstr "" - -#: src/slices-and-lifetimes.md -msgid "[String References](./slices-and-lifetimes/str.md) (10 minutes)" -msgstr "" - -#: src/slices-and-lifetimes.md -msgid "" -"[Lifetime Annotations](./slices-and-lifetimes/lifetime-annotations.md) (10 " -"minutes)" -msgstr "" - -#: src/slices-and-lifetimes.md -msgid "" -"[Lifetime Elision](./slices-and-lifetimes/lifetime-elision.md) (5 minutes)" +"The \"interior mutability\" pattern allows exclusive (mutable) access behind " +"a shared reference. The standard library provides several ways to do this, " +"all while still ensuring safety, typically by performing a runtime check." msgstr "" -#: src/slices-and-lifetimes.md +#: src/borrowing/interior-mutability.md msgid "" -"[Struct Lifetimes](./slices-and-lifetimes/struct-lifetimes.md) (5 minutes)" +"The main thing to take away from this slide is that Rust provides _safe_ " +"ways to modify data behind a shared reference. There are a variety of ways " +"to ensure that safety, and the next sub-slides present a few of them." msgstr "" -#: src/slices-and-lifetimes.md +#: src/borrowing/interior-mutability/cell.md msgid "" -"[Exercise: Protobuf Parsing](./slices-and-lifetimes/exercise.md) (30 minutes)" -msgstr "" - -#: src/slices-and-lifetimes/slices.md -msgid "Slices" -msgstr "Arraysegmenter" - -#: src/slices-and-lifetimes/slices.md -msgid "A slice gives you a view into a larger collection:" -msgstr "" - -#: src/slices-and-lifetimes/slices.md -msgid "Slices borrow data from the sliced type." -msgstr "" - -#: src/slices-and-lifetimes/slices.md -msgid "Question: What happens if you modify `a[3]` right before printing `s`?" +"`Cell` wraps a value and allows getting or setting the value using only a " +"shared reference to the `Cell`. However, it does not allow any references to " +"the inner value. Since there are no references, borrowing rules cannot be " +"broken." msgstr "" -#: src/slices-and-lifetimes/slices.md -msgid "" -"We create a slice by borrowing `a` and specifying the starting and ending " -"indexes in brackets." +#: src/borrowing/interior-mutability/cell.md +#: src/borrowing/interior-mutability/refcell.md +msgid "// Note that `cell` is NOT declared as mutable.\n" msgstr "" -#: src/slices-and-lifetimes/slices.md +#: src/borrowing/interior-mutability/cell.md 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." +"`Cell` is a simple means to ensure safety: it has a `set` method that takes " +"`&self`. This needs no runtime check, but requires moving values, which can " +"have its own cost." msgstr "" -#: src/slices-and-lifetimes/slices.md +#: src/borrowing/interior-mutability/refcell.md msgid "" -"The same is true for the last index, so `&a[2..a.len()]` and `&a[2..]` are " -"identical." +"`RefCell` allows accessing and mutating a wrapped value by providing " +"alternative types `Ref` and `RefMut` that emulate `&T`/`&mut T` without " +"actually being Rust references." msgstr "" -#: src/slices-and-lifetimes/slices.md +#: src/borrowing/interior-mutability/refcell.md msgid "" -"To easily create a slice of the full array, we can therefore use `&a[..]`." +"These types perform dynamic checks using a counter in the `RefCell` to " +"prevent existence of a `RefMut` alongside another `Ref`/`RefMut`." msgstr "" -#: src/slices-and-lifetimes/slices.md +#: src/borrowing/interior-mutability/refcell.md 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." +"By implementing `Deref` (and `DerefMut` for `RefMut`), these types allow " +"calling methods on the inner value without allowing references to escape." msgstr "" -#: src/slices-and-lifetimes/slices.md +#: src/borrowing/interior-mutability/refcell.md 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." +"// This triggers an error at runtime.\n" +" // let other = cell.borrow();\n" +" // println!(\"{}\", other);\n" msgstr "" -#: src/slices-and-lifetimes/slices.md -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." -msgstr "" +#: src/borrowing/interior-mutability/refcell.md +#, fuzzy +msgid "\"{cell:?}\"" +msgstr "\"{:?}\"" -#: src/slices-and-lifetimes/str.md +#: src/borrowing/interior-mutability/refcell.md msgid "" -"We can now understand the two string types in Rust: `&str` is almost like " -"`&[char]`, but with its data stored in a variable-length encoding (UTF-8)." -msgstr "" - -#: src/slices-and-lifetimes/str.md -msgid "\"s1: {s1}\"" -msgstr "\"s1: {s1}\"" - -#: src/slices-and-lifetimes/str.md -msgid "\"Hello \"" -msgstr "\"Hallo \"" - -#: src/slices-and-lifetimes/str.md -msgid "\"s3: {s3}\"" -msgstr "\"s3: {s3}\"" - -#: src/slices-and-lifetimes/str.md -msgid "Rust terminology:" -msgstr "" - -#: src/slices-and-lifetimes/str.md -msgid "`&str` an immutable reference to a string slice." -msgstr "" - -#: src/slices-and-lifetimes/str.md -msgid "`String` a mutable string buffer." +"`RefCell` enforces Rust's usual borrowing rules (either multiple shared " +"references or a single exclusive reference) with a runtime check. In this " +"case, all borrows are very short and never overlap, so the checks always " +"succeed." msgstr "" -#: src/slices-and-lifetimes/str.md +#: src/borrowing/interior-mutability/refcell.md msgid "" -"`&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." +"The extra block in the example is to end the borrow created by the call to " +"`borrow_mut` before we print the cell. Trying to print a borrowed `RefCell` " +"just shows the message `\"{borrowed}\"`." msgstr "" -#: src/slices-and-lifetimes/str.md +#: src/borrowing/interior-mutability/refcell.md msgid "" -"Rust’s `String` type is a wrapper around a vector of bytes. As with a " -"`Vec`, it is owned." +"There are also `OnceCell` and `OnceLock`, which allow initialization on " +"first use. Making these useful requires some more knowledge than students " +"have at this time." msgstr "" -#: src/slices-and-lifetimes/str.md +#: src/borrowing/exercise.md 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." +"You're working on implementing a health-monitoring system. As part of that, " +"you need to keep track of users' health statistics." msgstr "" -#: src/slices-and-lifetimes/str.md +#: src/borrowing/exercise.md msgid "" -"The `format!()` macro is a convenient way to generate an owned string from " -"dynamic values. It accepts the same format specification as `println!()`." +"You'll start with a stubbed function in an `impl` block as well as a `User` " +"struct definition. Your goal is to implement the stubbed out method on the " +"`User` `struct` defined in the `impl` block." msgstr "" -#: src/slices-and-lifetimes/str.md +#: src/borrowing/exercise.md msgid "" -"You can borrow `&str` slices from `String` via `&` and optionally range " -"selection. If you select a byte range that is not aligned to character " -"boundaries, the expression will panic. The `chars` iterator iterates over " -"characters and is preferred over trying to get character boundaries right." +"Copy the code below to and fill in the missing " +"method:" msgstr "" -#: src/slices-and-lifetimes/str.md +#: src/borrowing/exercise.md msgid "" -"For C++ programmers: think of `&str` as `std::string_view` 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)." +"\"Update a user's statistics based on measurements from a visit to the " +"doctor\"" msgstr "" -#: src/slices-and-lifetimes/str.md -msgid "Byte strings literals allow you to create a `&[u8]` value directly:" -msgstr "" +#: src/borrowing/exercise.md src/borrowing/solution.md +#: src/android/build-rules/library.md +#: src/android/aidl/example-service/client.md +msgid "\"Bob\"" +msgstr "\"Bob\"" -#: src/slices-and-lifetimes/lifetime-annotations.md +#: src/lifetimes/lifetime-annotations.md msgid "" "A reference has a _lifetime_, which must not \"outlive\" the value it refers " "to. This is verified by the borrow checker." msgstr "" -#: src/slices-and-lifetimes/lifetime-annotations.md +#: src/lifetimes/lifetime-annotations.md msgid "" "The lifetime can be implicit - this is what we have seen so far. Lifetimes " "can also be explicit: `&'a Point`, `&'document str`. Lifetimes start with " @@ -8205,57 +8666,56 @@ msgid "" "`Point` which is valid for at least the lifetime `a`\"." msgstr "" -#: src/slices-and-lifetimes/lifetime-annotations.md +#: src/lifetimes/lifetime-annotations.md msgid "" -"Lifetimes are always inferred by the compiler: you cannot assign a lifetime " -"yourself. Explicit lifetime annotations create constraints where there is " -"ambiguity; the compiler verifies that there is a valid solution." +"Only ownership, not lifetime annotations, control when values are destroyed " +"and determine the concrete lifetime of a given value. The borrow checker " +"just validates that borrows never extend beyond the concrete lifetime of the " +"value." msgstr "" -#: src/slices-and-lifetimes/lifetime-annotations.md +#: src/lifetimes/lifetime-annotations.md msgid "" -"Lifetimes become more complicated when considering passing values to and " -"returning values from functions." +"Explicit lifetime annotations, like types, are required on function " +"signatures (but can be elided in common cases). These provide information " +"for inference at callsites and within the function body, helping the borrow " +"checker to do its job." msgstr "" -#: src/slices-and-lifetimes/lifetime-annotations.md +#: src/lifetimes/lifetime-annotations.md msgid "// What is the lifetime of p3?\n" msgstr "" -#: src/slices-and-lifetimes/lifetime-annotations.md -#, fuzzy -msgid "\"p3: {p3:?}\"" -msgstr "\"v: {:?}\"" - -#: src/slices-and-lifetimes/lifetime-annotations.md +#: src/lifetimes/lifetime-annotations.md msgid "" -"In this example, the the compiler does not know what lifetime to infer for " -"`p3`. Looking inside the function body shows that it can only safely assume " -"that `p3`'s lifetime is the shorter of `p1` and `p2`. But just like types, " -"Rust requires explicit annotations of lifetimes on function arguments and " -"return values." +"In this example, the compiler does not know what lifetime to infer for `p3`. " +"Looking inside the function body shows that it can only safely assume that " +"`p3`'s lifetime is the shorter of `p1` and `p2`. But just like types, Rust " +"requires explicit annotations of lifetimes on function arguments and return " +"values." msgstr "" -#: src/slices-and-lifetimes/lifetime-annotations.md +#: src/lifetimes/lifetime-annotations.md msgid "Add `'a` appropriately to `left_most`:" msgstr "" -#: src/slices-and-lifetimes/lifetime-annotations.md +#: src/lifetimes/lifetime-annotations.md msgid "" -"This says, \"given p1 and p2 which both outlive `'a`, the return value lives " -"for at least `'a`." +"This says there is some lifetime `'a` which both `p1` and `p2` outlive, and " +"which outlives the return value. The borrow checker verifies this within the " +"function body, and uses this information in `main` to determine a lifetime " +"for `p3`." msgstr "" -#: src/slices-and-lifetimes/lifetime-annotations.md -msgid "" -"In common cases, lifetimes can be elided, as described on the next slide." +#: src/lifetimes/lifetime-annotations.md +msgid "Try dropping `p2` in `main` before printing `p3`." msgstr "" -#: src/slices-and-lifetimes/lifetime-elision.md +#: src/lifetimes/lifetime-elision.md msgid "Lifetimes in Function Calls" msgstr "Livstider i funktionskald" -#: src/slices-and-lifetimes/lifetime-elision.md +#: src/lifetimes/lifetime-elision.md 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 " @@ -8263,44 +8723,45 @@ msgid "" "inference -- it is just a syntactic shorthand." msgstr "" -#: src/slices-and-lifetimes/lifetime-elision.md +#: src/lifetimes/lifetime-elision.md msgid "Each argument which does not have a lifetime annotation is given one." msgstr "" -#: src/slices-and-lifetimes/lifetime-elision.md +#: src/lifetimes/lifetime-elision.md msgid "" "If there is only one argument lifetime, it is given to all un-annotated " "return values." msgstr "" -#: src/slices-and-lifetimes/lifetime-elision.md +#: src/lifetimes/lifetime-elision.md msgid "" "If there are multiple argument lifetimes, but the first one is for `self`, " "that lifetime is given to all un-annotated return values." msgstr "" -#: src/slices-and-lifetimes/lifetime-elision.md +#: src/lifetimes/lifetime-elision.md msgid "In this example, `cab_distance` is trivially elided." msgstr "" -#: src/slices-and-lifetimes/lifetime-elision.md +#: src/lifetimes/lifetime-elision.md msgid "" "The `nearest` function provides another example of a function with multiple " -"references in its arguments that requires explicit annotation." +"references in its arguments that requires explicit annotation. In `main`, " +"the return value is allowed to outlive the query." msgstr "" -#: src/slices-and-lifetimes/lifetime-elision.md +#: src/lifetimes/lifetime-elision.md msgid "Try adjusting the signature to \"lie\" about the lifetimes returned:" msgstr "" -#: src/slices-and-lifetimes/lifetime-elision.md +#: src/lifetimes/lifetime-elision.md msgid "" "This won't compile, demonstrating that the annotations are checked for " "validity by the compiler. Note that this is not the case for raw pointers " "(unsafe), and this is a common source of errors with unsafe Rust." msgstr "" -#: src/slices-and-lifetimes/lifetime-elision.md +#: src/lifetimes/lifetime-elision.md msgid "" "Students may ask when to use lifetimes. Rust borrows _always_ have " "lifetimes. Most of the time, elision and type inference mean these don't " @@ -8309,60 +8770,45 @@ msgid "" "just work with owned data by cloning values where necessary." msgstr "" -#: src/slices-and-lifetimes/struct-lifetimes.md -msgid "Lifetimes in Data Structures" -msgstr "Livstider i datastrukturer" - -#: src/slices-and-lifetimes/struct-lifetimes.md +#: src/lifetimes/struct-lifetimes.md msgid "" "If a data type stores borrowed data, it must be annotated with a lifetime:" msgstr "" -#: src/slices-and-lifetimes/struct-lifetimes.md -msgid "\"Bye {text}!\"" -msgstr "\"Farvel {text}!\"" - -#: src/slices-and-lifetimes/struct-lifetimes.md +#: src/lifetimes/struct-lifetimes.md msgid "\"The quick brown fox jumps over the lazy dog.\"" msgstr "" -#: src/slices-and-lifetimes/struct-lifetimes.md -msgid "// erase(text);\n" -msgstr "// erase(text);\n" - -#: src/slices-and-lifetimes/struct-lifetimes.md -msgid "\"{fox:?}\"" -msgstr "\"{fox:?}\"" - -#: src/slices-and-lifetimes/struct-lifetimes.md -msgid "\"{dog:?}\"" -msgstr "\"{dog:?}\"" +#: src/lifetimes/struct-lifetimes.md +msgid "// drop(doc);\n" +msgstr "" -#: src/slices-and-lifetimes/struct-lifetimes.md +#: src/lifetimes/struct-lifetimes.md 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." +"`Highlight` that uses that data. A struct cannot live longer than the data " +"it references." msgstr "" -#: src/slices-and-lifetimes/struct-lifetimes.md +#: src/lifetimes/struct-lifetimes.md msgid "" -"If `text` is consumed before the end of the lifetime of `fox` (or `dog`), " -"the borrow checker throws an error." +"If `doc` is dropped before the end of the lifetime of `noun` or `verb`, the " +"borrow checker throws an error." msgstr "" -#: src/slices-and-lifetimes/struct-lifetimes.md +#: src/lifetimes/struct-lifetimes.md 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/slices-and-lifetimes/struct-lifetimes.md +#: src/lifetimes/struct-lifetimes.md msgid "When possible, make data structures own their data directly." msgstr "" -#: src/slices-and-lifetimes/struct-lifetimes.md +#: src/lifetimes/struct-lifetimes.md msgid "" "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 " @@ -8370,7 +8816,7 @@ msgid "" "of the struct itself. Those are very advanced use cases." msgstr "" -#: src/slices-and-lifetimes/exercise.md +#: src/lifetimes/exercise.md msgid "" "In this exercise, you will build a parser for the [protobuf binary encoding]" "(https://protobuf.dev/programming-guides/encoding/). Don't worry, it's " @@ -8378,7 +8824,7 @@ msgid "" "slices of data. The underlying data itself is never copied." msgstr "" -#: src/slices-and-lifetimes/exercise.md +#: src/lifetimes/exercise.md msgid "" "Fully parsing a protobuf message requires knowing the types of the fields, " "indexed by their field numbers. That is typically provided in a `proto` " @@ -8386,128 +8832,187 @@ msgid "" "statements in functions that get called for each field." msgstr "" -#: src/slices-and-lifetimes/exercise.md +#: src/lifetimes/exercise.md msgid "We'll use the following proto:" msgstr "" -#: src/slices-and-lifetimes/exercise.md +#: src/lifetimes/exercise.md +#, fuzzy +msgid "Messages" +msgstr "\"Besked {i}\"" + +#: src/lifetimes/exercise.md msgid "" "A proto message is encoded as a series of fields, one after the next. Each " "is implemented as a \"tag\" followed by the value. The tag contains a field " "number (e.g., `2` for the `id` field of a `Person` message) and a wire type " -"defining how the payload should be determined from the byte stream." +"defining how the payload should be determined from the byte stream. These " +"are combined into a single integer, as decoded in `unpack_tag` below." +msgstr "" + +#: src/lifetimes/exercise.md +msgid "Varint" msgstr "" -#: src/slices-and-lifetimes/exercise.md +#: src/lifetimes/exercise.md msgid "" "Integers, including the tag, are represented with a variable-length encoding " -"called VARINT. Luckily, `parse_varint` is defined for you below. The given " -"code also defines callbacks to handle `Person` and `PhoneNumber` fields, and " -"to parse a message into a series of calls to those callbacks." +"called VARINT. Luckily, `parse_varint` is defined for you below." msgstr "" -#: src/slices-and-lifetimes/exercise.md -msgid "" -"What remains for you is to implement the `parse_field` function and the " -"`ProtoMessage` trait for `Person` and `PhoneNumber`." -msgstr "" - -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md -msgid "\"Invalid varint\"" -msgstr "" +#: src/lifetimes/exercise.md +#, fuzzy +msgid "Wire Types" +msgstr "Skalartyper" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md -msgid "\"Invalid wire-type\"" +#: src/lifetimes/exercise.md +msgid "" +"Proto defines several wire types, only two of which are used in this " +"exercise." msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md -msgid "\"Unexpected EOF\"" +#: src/lifetimes/exercise.md +msgid "" +"The `Varint` wire type contains a single varint, and is used to encode proto " +"values of type `int32` such as `Person.id`." msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md -msgid "\"Invalid length\"" +#: src/lifetimes/exercise.md +msgid "" +"The `Len` wire type contains a length expressed as a varint, followed by a " +"payload of that number of bytes. This is used to encode proto values of type " +"`string` such as `Person.name`. It is also used to encode proto values " +"containing sub-messages such as `Person.phones`, where the payload contains " +"an encoding of the sub-message." msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md -msgid "\"Unexpected wire-type)\"" +#: src/lifetimes/exercise.md +msgid "" +"The given code also defines callbacks to handle `Person` and `PhoneNumber` " +"fields, and to parse a message into a series of calls to those callbacks." msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md -msgid "\"Invalid string (not UTF-8)\"" +#: src/lifetimes/exercise.md +msgid "" +"What remains for you is to implement the `parse_field` function and the " +"`ProtoMessage` trait for `Person` and `PhoneNumber`." msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "/// A wire type as seen on the wire.\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "/// The Varint WireType indicates the value is a single VARINT.\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "" -"//I64, -- not needed for this exercise\n" +"// The I64 WireType indicates that the value is precisely 8 bytes in\n" +" // little-endian order containing a 64-bit signed integer or double " +"type.\n" +" //I64, -- not needed for this exercise\n" " /// The Len WireType indicates that the value is a length represented as " "a\n" " /// VARINT followed by exactly that number of bytes.\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "" -"/// The I32 WireType indicates that the value is precisely 4 bytes in\n" -" /// little-endian order containing a 32-bit signed integer.\n" +"// The I32 WireType indicates that the value is precisely 4 bytes in\n" +" // little-endian order containing a 32-bit signed integer or float " +"type.\n" +" //I32, -- not needed for this exercise\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "/// A field's value, typed based on the wire type.\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "//I64(i64), -- not needed for this exercise\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "//I32(i32), -- not needed for this exercise\n" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "/// A field, containing the field number and its value.\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "//1 => WireType::I64, -- not needed for this exercise\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "//5 => WireType::I32, -- not needed for this exercise\n" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +#, fuzzy +msgid "\"Invalid wire type: {value}\"" +msgstr "\"int: {}\"" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"Expected string to be a `Len` field\"" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +#, fuzzy +msgid "\"Invalid string\"" +msgstr "\"En streng\"" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"Expected bytes to be a `Len` field\"" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"Expected `u64` to be a `Varint` field\"" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "" "/// Parse a VARINT, returning the parsed value and the remaining bytes.\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"Not enough bytes for varint\"" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "" "// This is the last byte of the VARINT, so convert it to\n" " // a u64 and return it.\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "// More than 7 bytes is invalid.\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"Too many bytes for varint\"" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "/// Convert a tag into a field number and a WireType.\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "/// Parse a field, returning the remaining bytes\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md +#: src/lifetimes/exercise.md msgid "" "\"Based on the wire type, build a Field, consuming as many bytes as " "necessary.\"" msgstr "" -#: src/slices-and-lifetimes/exercise.md +#: src/lifetimes/exercise.md msgid "\"Return the field, and any un-consumed bytes.\"" msgstr "" -#: src/slices-and-lifetimes/exercise.md src/slices-and-lifetimes/solution.md +#: src/lifetimes/exercise.md src/lifetimes/solution.md msgid "" "/// Parse a message in the given data, calling `T::add_field` for each field " "in\n" @@ -8516,22 +9021,71 @@ msgid "" "/// The entire input is consumed.\n" msgstr "" -#: src/slices-and-lifetimes/exercise.md +#: src/lifetimes/exercise.md msgid "// TODO: Implement ProtoMessage for Person and PhoneNumber.\n" msgstr "" -#: src/slices-and-lifetimes/solution.md -msgid "// Unwrap error because `value` is definitely 4 bytes long.\n" +#: src/lifetimes/exercise.md src/lifetimes/solution.md src/modules/exercise.md +#: src/modules/solution.md src/testing/unit-tests.md src/testing/solution.md +msgid "\"\"" +msgstr "\"\"" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"beautiful name\"" msgstr "" -#: src/slices-and-lifetimes/solution.md -msgid "// skip everything else\n" +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"Evan\"" msgstr "" -#: src/slices-and-lifetimes/solution.md -#, fuzzy -msgid "b\"hello\"" -msgstr "\"hallo\"" +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"+1234-777-9090\"" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"home\"" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "// Put that all together into a single parse.\n" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"maxwell\"" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"+1202-555-1212\"" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"+1800-867-5308\"" +msgstr "" + +#: src/lifetimes/exercise.md src/lifetimes/solution.md +msgid "\"mobile\"" +msgstr "" + +#: src/lifetimes/exercise.md +msgid "" +"In this exercise there are various cases where protobuf parsing might fail, " +"e.g. if you try to parse an `i32` when there are fewer than 4 bytes left in " +"the data buffer. In normal Rust code we'd handle this with the `Result` " +"enum, but for simplicity in this exercise we panic if any errors are " +"encountered. On day 4 we'll cover error handling in Rust in more detail." +msgstr "" + +#: src/lifetimes/solution.md +msgid "\"len not a valid `usize`\"" +msgstr "" + +#: src/lifetimes/solution.md +msgid "\"Unexpected EOF\"" +msgstr "" + +#: src/lifetimes/solution.md +msgid "// skip everything else\n" +msgstr "" #: src/welcome-day-4.md #, fuzzy @@ -8564,66 +9118,260 @@ msgid "" "Unsafe Rust: the escape hatch when you can't express yourself in safe Rust." msgstr "" -#: src/welcome-day-4.md -msgid "[Welcome](./welcome-day-4.md) (3 minutes)" +#: src/iterators.md +#, fuzzy +msgid "Iterator Trait" +msgstr "Iteratorer" + +#: src/iterators.md +#, fuzzy +msgid "Iterator Helper Methods" +msgstr "`Iterator`" + +#: src/iterators.md +#, fuzzy +msgid "collect" +msgstr "Select" + +#: src/iterators.md +#, fuzzy +msgid "IntoIterator" +msgstr "`IntoIterator`" + +#: src/iterators/motivation.md +#, fuzzy +msgid "Motivating Iterators" +msgstr "Iteratorer" + +#: src/iterators/motivation.md +msgid "" +"If you want to iterate over the contents of an array, you'll need to define:" msgstr "" -#: src/welcome-day-4.md -msgid "[Iterators](./iterators.md) (45 minutes)" +#: src/iterators/motivation.md +msgid "" +"Some state to keep track of where you are in the iteration process, e.g. an " +"index." msgstr "" -#: src/welcome-day-4.md -msgid "[Modules](./modules.md) (40 minutes)" +#: src/iterators/motivation.md +msgid "A condition to determine when iteration is done." msgstr "" -#: src/welcome-day-4.md -msgid "[Testing](./testing.md) (1 hour and 5 minutes)" +#: src/iterators/motivation.md +msgid "Logic for updating the state of iteration each loop." msgstr "" -#: src/iterators.md -msgid "[Iterator](./iterators/iterator.md) (5 minutes)" +#: src/iterators/motivation.md +msgid "Logic for fetching each element using that iteration state." msgstr "" -#: src/iterators.md -msgid "[IntoIterator](./iterators/intoiterator.md) (5 minutes)" +#: src/iterators/motivation.md +msgid "In a C-style for loop you declare these things directly:" msgstr "" -#: src/iterators.md -msgid "[FromIterator](./iterators/fromiterator.md) (5 minutes)" +#: src/iterators/motivation.md +msgid "" +"In Rust we bundle this state and logic together into an object known as an " +"\"iterator\"." msgstr "" -#: src/iterators.md +#: src/iterators/motivation.md msgid "" -"[Exercise: Iterator Method Chaining](./iterators/exercise.md) (30 minutes)" +"This slide provides context for what Rust iterators do under the hood. We " +"use the (hopefully) familiar construct of a C-style `for` loop to show how " +"iteration requires some state and some logic, that way on the next slide we " +"can show how an iterator bundles these together." +msgstr "" + +#: src/iterators/motivation.md +msgid "" +"Rust doesn't have a C-style `for` loop, but we can express the same thing " +"with `while`:" +msgstr "" + +#: src/iterators/motivation.md +msgid "" +"There's another way to express array iteration using `for` in C and C++: You " +"can use a pointer to the front and a pointer to the end of the array and " +"then compare those pointers to determine when the loop should end." +msgstr "" + +#: src/iterators/motivation.md +msgid "" +"If students ask, you can point out that this is how Rust's slice and array " +"iterators work under the hood (though implemented as a Rust iterator)." msgstr "" #: src/iterators/iterator.md msgid "" "The [`Iterator`](https://doc.rust-lang.org/std/iter/trait.Iterator.html) " -"trait supports iterating over values in a collection. It requires a `next` " -"method and provides lots of methods. Many standard library types implement " -"`Iterator`, and you can implement it yourself, too:" +"trait defines how an object can be used to produce a sequence of values. For " +"example, if we wanted to create an iterator that can produce the elements of " +"a slice it might look something like this:" msgstr "" #: src/iterators/iterator.md -msgid "\"fib({i}): {n}\"" -msgstr "\"fib({i}): {n}\"" +msgid "" +"The `SliceIter` example implements the same logic as the C-style `for` loop " +"demonstrated on the last slide." +msgstr "" + +#: src/iterators/iterator.md +msgid "" +"Point out to the students that iterators are lazy: Creating the iterator " +"just initializes the struct but does not otherwise do any work. No work " +"happens until the `next` method is called." +msgstr "" #: src/iterators/iterator.md msgid "" +"Iterators don't need to be finite! It's entirely valid to have an iterator " +"that will produce values forever. For example, a half open range like `0..` " +"will keep going until integer overflow occurs." +msgstr "" + +#: src/iterators/iterator.md +msgid "" +"The \"real\" version of `SliceIter` is the [`slice::Iter`](https://doc.rust-" +"lang.org/stable/std/slice/struct.Iter.html) type in the standard library, " +"however the real version uses pointers under the hood instead of an index in " +"order to eliminate bounds checks." +msgstr "" + +#: src/iterators/iterator.md +msgid "" +"The `SliceIter` example is a good example of a struct that contains a " +"reference and therefore uses lifetime annotations." +msgstr "" + +#: src/iterators/iterator.md +msgid "" +"You can also demonstrate adding a generic parameter to `SliceIter` to allow " +"it to work with any kind of slice (not just `&[i32]`)." +msgstr "" + +#: src/iterators/helpers.md +msgid "" +"In addition to the `next` method that defines how an iterator behaves, the " +"`Iterator` trait provides 70+ helper methods that can be used to build " +"customized iterators." +msgstr "" + +#: src/iterators/helpers.md +#, fuzzy +msgid "// Create a range from 1 to 10\n" +msgstr "/// Break error.\n" + +#: src/iterators/helpers.md +#, fuzzy +msgid "// Keep only even numbers\n" +msgstr "/// Analyze the numbers.\n" + +#: src/iterators/helpers.md +#, fuzzy +msgid "// Square each number\n" +msgstr "/// Analyze the numbers.\n" + +#: src/iterators/helpers.md +#, fuzzy +msgid "// Sum up all the squared numbers\n" +msgstr "/// Analyze the numbers.\n" + +#: src/iterators/helpers.md +msgid "\"The sum of squares of even numbers from 1 to 10 is: {}\"" +msgstr "" + +#: src/iterators/helpers.md +msgid "" "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." +"the trait where you can find all the documentation about them." msgstr "" -#: src/iterators/iterator.md +#: src/iterators/helpers.md 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." +"Many of these helper methods take the original iterator and produce a new " +"iterator with different behavior. These are know as \"iterator adapter " +"methods\"." +msgstr "" + +#: src/iterators/helpers.md +msgid "" +"Some methods, like `sum` and `count`, consume the iterator and pull all of " +"the elements out of it." +msgstr "" + +#: src/iterators/helpers.md +msgid "" +"These methods are designed to be chained together so that it's easy to build " +"a custom iterator that does exactly what you need." +msgstr "" + +#: src/iterators/helpers.md +msgid "" +"Rust's iterators are extremely efficient and highly optimizable. Even " +"complex iterators made by combining many adapter methods will still result " +"in code as efficient as equivalent imperative implementations." +msgstr "" + +#: src/iterators/collect.md +msgid "" +"The [`collect`](https://doc.rust-lang.org/std/iter/" +"trait.Iterator.html#method.collect) method lets you build a collection from " +"an [`Iterator`](https://doc.rust-lang.org/std/iter/trait.Iterator.html)." +msgstr "" + +#: src/iterators/collect.md +msgid "\"prime_squares: {prime_squares:?}\"" +msgstr "" + +#: src/iterators/collect.md +msgid "" +"Any iterator can be collected in to a `Vec`, `VecDeque`, or `HashSet`. " +"Iterators that produce key-value pairs (i.e. a two-element tuple) can also " +"be collected into `HashMap` and `BTreeMap`." +msgstr "" + +#: src/iterators/collect.md +msgid "" +"Show the students the definition for `collect` in the standard library docs. " +"There are two ways to specify the generic type `B` for this method:" +msgstr "" + +#: src/iterators/collect.md +msgid "" +"With the \"turbofish\": `some_iterator.collect::()`, as " +"shown. The `_` shorthand used here lets Rust infer the type of the `Vec` " +"elements." +msgstr "" + +#: src/iterators/collect.md +msgid "" +"With type inference: `let prime_squares: Vec<_> = some_iterator.collect()`. " +"Rewrite the example to use this form." +msgstr "" + +#: src/iterators/collect.md +msgid "" +"If students are curious about how this works, you can bring up the " +"[`FromIterator`](https://doc.rust-lang.org/std/iter/trait.FromIterator.html) " +"trait, which defines how each type of collection gets built from an iterator." +msgstr "" + +#: src/iterators/collect.md +msgid "" +"In addition to the basic implementations of `FromIterator` for `Vec`, " +"`HashMap`, etc., there are also more specialized implementations which let " +"you do cool things like convert an `Iterator>` into a " +"`Result, E>`." +msgstr "" + +#: src/iterators/collect.md +msgid "" +"The reason type annotations are often needed with `collect` is because it's " +"generic over its return type. This makes it harder for the compiler to infer " +"the correct type in a lot of cases." msgstr "" #: src/iterators/intoiterator.md @@ -8638,6 +9386,14 @@ msgstr "" msgid "\"point = {x}, {y}\"" msgstr "" +#: src/iterators/intoiterator.md +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/iterators/intoiterator.md msgid "" "Click through to the docs for `IntoIterator`. Every implementation of " @@ -8670,8 +9426,10 @@ msgstr "" #: src/iterators/intoiterator.md msgid "" -"Fix this issue by implementing `IntoIterator` for `&Grid` and storing a " -"reference to the `Grid` in `GridIter`." +"Fix this issue by implementing `IntoIterator` for `&Grid` and creating a " +"`GridRefIter` that iterates by reference. A version with both `GridIter` and " +"`GridRefIter` is available [in this playground](https://play.rust-lang.org/?" +"version=stable&mode=debug&edition=2024&gist=947e371c7295af758504f01f149023a1)." msgstr "" #: src/iterators/intoiterator.md @@ -8682,50 +9440,6 @@ msgid "" "over references to elements of `some_vector`." msgstr "" -#: src/iterators/fromiterator.md -msgid "FromIterator" -msgstr "" - -#: src/iterators/fromiterator.md -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/iterators/fromiterator.md -msgid "\"prime_squares: {prime_squares:?}\"" -msgstr "" - -#: src/iterators/fromiterator.md -#, fuzzy -msgid "`Iterator` implements" -msgstr "`Iterator`" - -#: src/iterators/fromiterator.md -msgid "There are two ways to specify `B` for this method:" -msgstr "" - -#: src/iterators/fromiterator.md -msgid "" -"With the \"turbofish\": `some_iterator.collect::()`, as " -"shown. The `_` shorthand used here lets Rust infer the type of the `Vec` " -"elements." -msgstr "" - -#: src/iterators/fromiterator.md -msgid "" -"With type inference: `let prime_squares: Vec<_> = some_iterator.collect()`. " -"Rewrite the example to use this form." -msgstr "" - -#: src/iterators/fromiterator.md -msgid "" -"There are basic implementations of `FromIterator` for `Vec`, `HashMap`, etc. " -"There are also more specialized implementations which let you do cool things " -"like convert an `Iterator>` into a `Result, E>`." -msgstr "" - #: src/iterators/exercise.md msgid "" "In this exercise, you will need to find and use some of the provided methods " @@ -8749,29 +9463,8 @@ msgid "" "/// Element `n` of the result is `values[(n+offset)%len] - values[n]`.\n" msgstr "" -#: src/modules.md -msgid "[Modules](./modules/modules.md) (5 minutes)" -msgstr "" - -#: src/modules.md -msgid "[Filesystem Hierarchy](./modules/filesystem.md) (5 minutes)" -msgstr "" - -#: src/modules.md -msgid "[Visibility](./modules/visibility.md) (5 minutes)" -msgstr "" - -#: src/modules.md -msgid "[use, super, self](./modules/paths.md) (10 minutes)" -msgstr "" - -#: src/modules.md -msgid "" -"[Exercise: Modules for a GUI Library](./modules/exercise.md) (15 minutes)" -msgstr "" - -#: src/modules.md -msgid "This segment should take about 40 minutes" +#: src/modules.md src/modules/paths.md +msgid "use, super, self" msgstr "" #: src/modules/modules.md @@ -8813,9 +9506,9 @@ msgstr "" #: src/modules/filesystem.md msgid "" -"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`." +"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 @@ -8864,8 +9557,9 @@ msgstr "" #: src/modules/filesystem.md 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." +"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 @@ -8952,26 +9646,100 @@ msgid "" "its descendants)." msgstr "" -#: src/modules/paths.md -msgid "use, super, self" +#: src/modules/encapsulation.md +msgid "Visibility and Encapsulation" msgstr "" -#: src/modules/paths.md +#: src/modules/encapsulation.md msgid "" -"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:" +"Like with items in a module, struct fields are also private by default. " +"Private fields are likewise visible within the rest of the module (including " +"child modules). This allows us to encapsulate implementation details of " +"struct, controlling what data and functionality is visible externally." msgstr "" -#: src/modules/paths.md -msgid "Paths" -msgstr "" +#: src/modules/encapsulation.md +#, fuzzy +msgid "\"Is {} big? {}\"" +msgstr "\"{} {}\"" -#: src/modules/paths.md -msgid "Paths are resolved as follows:" +#: src/modules/encapsulation.md +#, fuzzy +msgid "\"foo.val = {}\"" +msgstr "\"bool: {}\"" + +#: src/modules/encapsulation.md +msgid "// let foo = Foo { val: 42, is_big: true };\n" msgstr "" -#: src/modules/paths.md -msgid "As a relative path:" +#: src/modules/encapsulation.md +msgid "// println!(\"Is {} big? {}\", foo.val, foo.is_big);\n" +msgstr "" + +#: src/modules/encapsulation.md +msgid "" +"This slide demonstrates how privacy in structs is module-based. Students " +"coming from object-oriented languages may be used to types being the " +"encapsulation boundary, so this demonstrates how Rust behaves differently " +"while showing how we can still achieve encapsulation." +msgstr "" + +#: src/modules/encapsulation.md +msgid "" +"Note how the `is_big` field is fully controlled by `Foo`, allowing `Foo` to " +"control how it's initialized and enforce any invariants it needs to (e.g. " +"that `is_big` is only `true` if `val > 100`)." +msgstr "" + +#: src/modules/encapsulation.md +msgid "" +"Point out how helper functions can be defined in the same module (including " +"child modules) in order to get access to the type's private fields/methods." +msgstr "" + +#: src/modules/encapsulation.md +msgid "" +"The first commented out line demonstrates that you cannot initialize a " +"struct with private fields. The second one demonstrates that you also can't " +"directly access private fields." +msgstr "" + +#: src/modules/encapsulation.md +msgid "" +"Enums do not support privacy: Variants and data within those variants is " +"always public." +msgstr "" + +#: src/modules/encapsulation.md +msgid "" +"If students want more information about privacy (or lack thereof) in enums, " +"you can bring up `#[doc_hidden]` and `#[non_exhaustive]` and show how " +"they're used to limit what can be done with an enum." +msgstr "" + +#: src/modules/encapsulation.md +msgid "" +"Module privacy still applies when there are `impl` blocks in other modules " +"[(example in the playground)](https://play.rust-lang.org/?" +"version=stable&mode=debug&edition=2024&gist=3e61f43c88de12bcdf69c1d6df9ab3da)." +msgstr "" + +#: src/modules/paths.md +msgid "" +"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 +msgid "Paths" +msgstr "" + +#: src/modules/paths.md +msgid "Paths are resolved as follows:" +msgstr "" + +#: src/modules/paths.md +msgid "As a relative path:" msgstr "" #: src/modules/paths.md @@ -9090,11 +9858,6 @@ msgstr "" msgid "\"+-{:-` as long as it implements `std::" -"process:Termination`. In practice, this means that `E` implements `Debug`. " -"The executable will print the `Err` variant and return a nonzero exit status " -"on error." +"Note that `main` can return a `Result<(), E>` as long as it implements " +"`std::process::Termination`. In practice, this means that `E` implements " +"`Debug`. The executable will print the `Err` variant and return a nonzero " +"exit status on error." msgstr "" #: src/error-handling/try-conversions.md @@ -9830,7 +10409,8 @@ msgid "" msgstr "" #: src/error-handling/try-conversions.md -msgid "\"IO error: {e}\"" +#, fuzzy +msgid "\"I/O error: {e}\"" msgstr "\"IO-fejl: {e}\"" #: src/error-handling/try-conversions.md @@ -9838,8 +10418,8 @@ msgid "\"Found no username in {path}\"" msgstr "" #: src/error-handling/try-conversions.md -#: src/error-handling/thiserror-and-anyhow.md -msgid "//fs::write(\"config.dat\", \"\").unwrap();\n" +#, fuzzy +msgid "//std::fs::write(\"config.dat\", \"\").unwrap();\n" msgstr "//fs::write(\"config.dat\", \"\").unwrap();\n" #: src/error-handling/try-conversions.md @@ -9878,9 +10458,9 @@ msgstr "" #: src/error-handling/error.md msgid "" "Sometimes we want to allow any type of error to be returned without writing " -"our own enum covering all the different possibilities. The `std::error::" -"Error` trait makes it easy to create a trait object that can contain any " -"error." +"our own enum covering all the different possibilities. The " +"`std::error::Error` trait makes it easy to create a trait object that can " +"contain any error." msgstr "" #: src/error-handling/error.md @@ -9919,243 +10499,139 @@ msgstr "" #: src/error-handling/error.md msgid "" "Make sure to implement the `std::error::Error` trait when defining a custom " -"error type so it can be boxed. But if you need to support the `no_std` " -"attribute, keep in mind that the `std::error::Error` trait is currently " -"compatible with `no_std` in [nightly](https://github.com/rust-lang/rust/" -"issues/103765) only." -msgstr "" - -#: src/error-handling/thiserror-and-anyhow.md -msgid "" -"The [`thiserror`](https://docs.rs/thiserror/) and [`anyhow`](https://docs.rs/" -"anyhow/) crates are widely used to simplify error handling." +"error type so it can be boxed." msgstr "" -#: src/error-handling/thiserror-and-anyhow.md +#: src/error-handling/thiserror.md msgid "" -"`thiserror` is often used in libraries to create custom error types that " -"implement `From`." +"The [`thiserror`](https://docs.rs/thiserror/) crate provides macros to help " +"avoid boilerplate when defining error types. It provides derive macros that " +"assist in implementing `From`, `Display`, and the `Error` trait." msgstr "" -#: src/error-handling/thiserror-and-anyhow.md -msgid "" -"`anyhow` is often used by applications to help with error handling in " -"functions, including adding contextual information to your errors." -msgstr "" +#: src/error-handling/thiserror.md +#, fuzzy +msgid "\"I/O error: {0}\"" +msgstr "\"IO-fejl: {e}\"" -#: src/error-handling/thiserror-and-anyhow.md +#: src/error-handling/thiserror.md src/error-handling/anyhow.md msgid "\"Found no username in {0}\"" msgstr "" -#: src/error-handling/thiserror-and-anyhow.md -msgid "\"Failed to open {path}\"" -msgstr "" - -#: src/error-handling/thiserror-and-anyhow.md -msgid "\"Failed to read\"" -msgstr "" +#: src/error-handling/thiserror.md src/error-handling/anyhow.md +msgid "//fs::write(\"config.dat\", \"\").unwrap();\n" +msgstr "//fs::write(\"config.dat\", \"\").unwrap();\n" -#: src/error-handling/thiserror-and-anyhow.md +#: src/error-handling/thiserror.md src/error-handling/anyhow.md msgid "\"Username: {username}\"" msgstr "" -#: src/error-handling/thiserror-and-anyhow.md +#: src/error-handling/thiserror.md src/error-handling/anyhow.md msgid "\"Error: {err:?}\"" msgstr "\"Fejl: {err:?}\"" -#: src/error-handling/thiserror-and-anyhow.md -#, fuzzy -msgid "`thiserror`" -msgstr "`Error`" - -#: src/error-handling/thiserror-and-anyhow.md +#: src/error-handling/thiserror.md msgid "" "The `Error` derive macro is provided by `thiserror`, and has lots of useful " "attributes to help define error types in a compact way." msgstr "" -#: src/error-handling/thiserror-and-anyhow.md -msgid "The `std::error::Error` trait is derived automatically." +#: src/error-handling/thiserror.md +msgid "The message from `#[error]` is used to derive the `Display` trait." msgstr "" -#: src/error-handling/thiserror-and-anyhow.md -msgid "The message from `#[error]` is used to derive the `Display` trait." +#: src/error-handling/thiserror.md +msgid "" +"Note that the (`thiserror::`)`Error` derive macro, while it has the effect " +"of implementing the (`std::error::`)`Error` trait, is not the same this; " +"traits and macros do not share a namespace." msgstr "" -#: src/error-handling/thiserror-and-anyhow.md -msgid "`anyhow`" +#: src/error-handling/anyhow.md +msgid "" +"The [`anyhow`](https://docs.rs/anyhow/) crate provides a rich error type " +"with support for carrying additional contextual information, which can be " +"used to provide a semantic trace of what the program was doing leading up to " +"the error." +msgstr "" + +#: src/error-handling/anyhow.md +msgid "" +"This can be combined with the convenience macros from [`thiserror`](https://" +"docs.rs/thiserror/) to avoid writing out trait impls explicitly for custom " +"error types." +msgstr "" + +#: src/error-handling/anyhow.md +msgid "\"Failed to open {path}\"" msgstr "" -#: src/error-handling/thiserror-and-anyhow.md +#: src/error-handling/anyhow.md +msgid "\"Failed to read\"" +msgstr "" + +#: src/error-handling/anyhow.md msgid "" "`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/error-handling/thiserror-and-anyhow.md +#: src/error-handling/anyhow.md msgid "`anyhow::Result` is a type alias for `Result`." msgstr "" -#: src/error-handling/thiserror-and-anyhow.md -msgid "" -"Actual error type inside of it can be extracted for examination if necessary." -msgstr "" - -#: src/error-handling/thiserror-and-anyhow.md +#: src/error-handling/anyhow.md 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." +"Functionality provided by `anyhow::Error` may be familiar to Go developers, " +"as it provides similar behavior to the Go `error` type and `Result` is much like a Go `(T, error)` (with the convention that " +"only one element of the pair is meaningful)." msgstr "" -#: src/error-handling/thiserror-and-anyhow.md +#: src/error-handling/anyhow.md msgid "" "`anyhow::Context` is a trait implemented for the standard `Result` and " "`Option` types. `use anyhow::Context` is necessary to enable `.context()` " "and `.with_context()` on those types." msgstr "" -#: src/error-handling/exercise.md -msgid "Exercise: Rewriting with Result" -msgstr "" - -#: src/error-handling/exercise.md +#: src/error-handling/anyhow.md msgid "" -"The following implements a very simple parser for an expression language. " -"However, it handles errors by panicking. Rewrite it to instead use idiomatic " -"error handling and propagate errors to a return from `main`. Feel free to " -"use `thiserror` and `anyhow`." +"`anyhow::Error` has support for downcasting, much like `std::any::Any`; the " +"specific error type stored inside can be extracted for examination if " +"desired with [`Error::downcast`](https://docs.rs/anyhow/latest/anyhow/" +"struct.Error.html#method.downcast)." msgstr "" #: src/error-handling/exercise.md msgid "" -"HINT: start by fixing error handling in the `parse` function. Once that is " -"working correctly, update `Tokenizer` to implement " -"`Iterator>` and handle that in the parser." -msgstr "" - -#: src/error-handling/exercise.md src/error-handling/solution.md -#, fuzzy -msgid "/// An arithmetic operator.\n" -msgstr "/// Parity error.\n" - -#: src/error-handling/exercise.md src/error-handling/solution.md -msgid "/// A token in the expression language.\n" -msgstr "" - -#: src/error-handling/exercise.md src/error-handling/solution.md -msgid "/// An expression in the expression language.\n" +"In this exercise we're revisiting the expression evaluator exercise that we " +"did in day 2. Our initial solution ignores a possible error case: Dividing " +"by zero! Rewrite `eval` to instead use idiomatic error handling to handle " +"this error case and return an error when it occurs. We provide a simple " +"`DivideByZeroError` type to use as the error type for `eval`." msgstr "" -#: src/error-handling/exercise.md src/error-handling/solution.md -msgid "/// A reference to a variable.\n" -msgstr "" - -#: src/error-handling/exercise.md src/error-handling/solution.md -#, fuzzy -msgid "/// A literal number.\n" -msgstr "/// Analyze the numbers.\n" - -#: src/error-handling/exercise.md src/error-handling/solution.md -#, fuzzy -msgid "/// A binary operation.\n" -msgstr "/// Parity error.\n" - -#: src/error-handling/exercise.md src/error-handling/solution.md -#, fuzzy -msgid "'z'" -msgstr "'x'" - -#: src/error-handling/exercise.md src/error-handling/solution.md -#, fuzzy -msgid "'_'" -msgstr "'x'" - -#: src/error-handling/exercise.md src/error-handling/solution.md -#, fuzzy -msgid "'+'" -msgstr "'x'" - -#: src/error-handling/exercise.md src/error-handling/solution.md -#, fuzzy -msgid "'-'" -msgstr "'x'" - #: src/error-handling/exercise.md -msgid "\"Unexpected character {c}\"" -msgstr "" - -#: src/error-handling/exercise.md src/error-handling/solution.md -msgid "\"Unexpected end of input\"" +msgid "" +"// The original implementation of the expression evaluator. Update this to\n" +"// return a `Result` and produce an error when dividing by 0.\n" msgstr "" #: src/error-handling/exercise.md -msgid "\"Invalid 32-bit integer'\"" +msgid "\"Cannot divide by zero!\"" msgstr "" #: src/error-handling/exercise.md -msgid "\"Unexpected token {tok:?}\"" -msgstr "" - -#: src/error-handling/exercise.md src/error-handling/solution.md -msgid "// Look ahead to parse a binary operation if present.\n" -msgstr "" - -#: src/error-handling/exercise.md src/error-handling/solution.md -msgid "\"10+foo+20-30\"" -msgstr "" - -#: src/error-handling/exercise.md src/error-handling/solution.md -#, fuzzy -msgid "\"{expr:?}\"" -msgstr "\"expr: {:?}\"" - -#: src/error-handling/solution.md -msgid "\"Unexpected character '{0}' in input\"" -msgstr "" - -#: src/error-handling/solution.md -#, fuzzy -msgid "\"Tokenizer error: {0}\"" -msgstr "\"IO-fejl: {e}\"" - -#: src/error-handling/solution.md -msgid "\"Unexpected token {0:?}\"" -msgstr "" - -#: src/error-handling/solution.md -#, fuzzy -msgid "\"Invalid number\"" -msgstr "\"analyze_numbers\"" - -#: src/unsafe-rust.md -msgid "[Unsafe](./unsafe-rust/unsafe.md) (5 minutes)" -msgstr "" - -#: src/unsafe-rust.md msgid "" -"[Dereferencing Raw Pointers](./unsafe-rust/dereferencing.md) (10 minutes)" -msgstr "" - -#: src/unsafe-rust.md -msgid "[Mutable Static Variables](./unsafe-rust/mutable-static.md) (5 minutes)" +"The starting code here isn't exactly the same as the previous exercise's " +"solution: We've added in an explicit panic to show students where the error " +"case is. Point this out if students get confused." msgstr "" #: src/unsafe-rust.md -msgid "[Unions](./unsafe-rust/unions.md) (5 minutes)" -msgstr "" - -#: src/unsafe-rust.md -msgid "[Unsafe Functions](./unsafe-rust/unsafe-functions.md) (5 minutes)" -msgstr "" - -#: src/unsafe-rust.md -msgid "[Unsafe Traits](./unsafe-rust/unsafe-traits.md) (5 minutes)" -msgstr "" - -#: src/unsafe-rust.md -msgid "[Exercise: FFI Wrapper](./unsafe-rust/exercise.md) (30 minutes)" +msgid "This segment should take about 1 hour and 15 minutes. It contains:" msgstr "" #: src/unsafe-rust/unsafe.md @@ -10227,39 +10703,34 @@ msgstr "" msgid "Creating pointers is safe, but dereferencing them requires `unsafe`:" msgstr "" -#: src/unsafe-rust/dereferencing.md -msgid "\"careful!\"" -msgstr "" - #: src/unsafe-rust/dereferencing.md msgid "" -"// 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" -" // 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" +"// SAFETY: p1 and p2 were created by taking raw pointers to a local, so " +"they\n" +" // are guaranteed to be non-null, aligned, and point into a single " +"(stack-)\n" +" // allocated object.\n" +" //\n" +" // The object underlying the raw pointers lives for the entire function, " +"so\n" +" // it is not deallocated while the raw pointers still exist. It is not\n" +" // accessed through references while the raw pointers exist, nor is it\n" +" // accessed from other threads concurrently.\n" msgstr "" #: src/unsafe-rust/dereferencing.md -msgid "\"r1 is: {}\"" -msgstr "\"r1 er: {}\"" - -#: src/unsafe-rust/dereferencing.md -msgid "\"uhoh\"" +msgid "// Mutation may soundly be observed through a raw pointer, like in C.\n" msgstr "" -#: src/unsafe-rust/dereferencing.md -msgid "\"r2 is: {}\"" -msgstr "\"r2 er: {}\"" - #: src/unsafe-rust/dereferencing.md msgid "" -"// NOT SAFE. DO NOT DO THIS.\n" +"// UNSOUND. DO NOT DO THIS.\n" " /*\n" -" let r3: &String = unsafe { &*r1 };\n" -" drop(s);\n" -" println!(\"r3 is: {}\", *r3);\n" +" let r: &i32 = unsafe { &*p1 };\n" +" dbg!(r);\n" +" x = 50;\n" +" dbg!(r); // Object underlying the reference has been mutated. This is " +"UB.\n" " */" msgstr "" @@ -10306,9 +10777,12 @@ msgstr "" #: src/unsafe-rust/dereferencing.md msgid "" -"The \"NOT SAFE\" section gives an example of a common kind of UB bug: `*r1` " -"has the `'static` lifetime, so `r3` has type `&'static String`, and thus " -"outlives `s`. Creating a reference from a pointer requires _great care_." +"The \"UNSOUND\" section gives an example of a common kind of UB bug: naïvely " +"taking a reference to the dereference of a raw pointer sidesteps the " +"compiler's knowledge of what object the reference is actually pointing to. " +"As such, the borrow checker does not freeze `x` and so we are able to modify " +"it despite the existence of a reference to it. Creating a reference from a " +"pointer requires _great care_." msgstr "" #: src/unsafe-rust/mutable-static.md @@ -10325,27 +10799,47 @@ msgstr "\"HELLO_WORLD: {HELLO_WORLD}\"" #: src/unsafe-rust/mutable-static.md msgid "" -"However, since data races can occur, it is unsafe to read and write mutable " -"static variables:" +"However, mutable static variables are unsafe to read and write because " +"multiple threads could do so concurrently without synchronization, " +"constituting a data race." +msgstr "" + +#: src/unsafe-rust/mutable-static.md +msgid "" +"Using mutable statics soundly requires reasoning about concurrency without " +"the compiler's help:" +msgstr "" + +#: src/unsafe-rust/mutable-static.md +msgid "" +"// SAFETY: There are no other threads which could be accessing `COUNTER`.\n" +msgstr "" + +#: src/unsafe-rust/mutable-static.md +msgid "" +"The program here is sound because it is single-threaded. However, the Rust " +"compiler reasons about functions individually so can't assume that. Try " +"removing the `unsafe` and see how the compiler explains that it is undefined " +"behavior to access a mutable static from multiple threads." msgstr "" #: src/unsafe-rust/mutable-static.md -msgid "\"COUNTER: {COUNTER}\"" -msgstr "\"COUNTER: {COUNTER}\"" +msgid "" +"The 2024 Rust edition goes further and makes accessing a mutable static by " +"reference an error by default." +msgstr "" #: src/unsafe-rust/mutable-static.md msgid "" -"The program here is safe because it is single-threaded. However, the Rust " -"compiler is conservative and will assume the worst. Try removing the " -"`unsafe` and see how the compiler explains that it is undefined behavior to " -"mutate a static from multiple threads." +"Using a mutable static is almost always a bad idea, you should use interior " +"mutability instead." msgstr "" #: src/unsafe-rust/mutable-static.md msgid "" -"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." +"There are some cases where it might be necessary in low-level `no_std` code, " +"such as implementing a heap allocator or working with some C APIs. In this " +"case you should use pointers rather than references." msgstr "" #: src/unsafe-rust/unions.md @@ -10373,151 +10867,243 @@ msgstr "" #: src/unsafe-rust/unions.md msgid "" "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-rust/unsafe-functions.md -msgid "Calling Unsafe Functions" +"[`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-rust/unsafe-functions.md msgid "" "A function or method can be marked `unsafe` if it has extra preconditions " -"you must uphold to avoid undefined behaviour:" -msgstr "" - -#: src/unsafe-rust/unsafe-functions.md src/unsafe-rust/exercise.md -#: src/unsafe-rust/solution.md src/android/interoperability/with-c.md -#: src/android/interoperability/with-c/rust.md -#: src/android/interoperability/cpp/cpp-bridge.md -#: src/exercises/chromium/build-rules.md src/bare-metal/aps/inline-assembly.md -#: src/bare-metal/aps/better-uart/using.md src/bare-metal/aps/logging/using.md -#: src/exercises/bare-metal/rtc.md -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "\"C\"" -msgstr "\"C\"" - -#: src/unsafe-rust/unsafe-functions.md -msgid "\"🗻∈🌏\"" -msgstr "\"🗻∈🌏\"" - -#: src/unsafe-rust/unsafe-functions.md -msgid "" -"// 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" -msgstr "" - -#: src/unsafe-rust/unsafe-functions.md -msgid "\"emoji: {}\"" -msgstr "\"emoji: {}\"" - -#: src/unsafe-rust/unsafe-functions.md -msgid "\"char count: {}\"" +"you must uphold to avoid undefined behaviour." msgstr "" #: src/unsafe-rust/unsafe-functions.md -msgid "// Undefined behavior if abs misbehaves.\n" +msgid "Unsafe functions may come from two places:" msgstr "" #: src/unsafe-rust/unsafe-functions.md -msgid "\"Absolute value of -3 according to C: {}\"" +msgid "Rust functions declared unsafe." msgstr "" #: src/unsafe-rust/unsafe-functions.md -msgid "" -"// 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 {\n" -" // emojis.get_unchecked(0..3) }));\n" +msgid "Unsafe foreign functions in `extern \"C\"` blocks." msgstr "" #: src/unsafe-rust/unsafe-functions.md -msgid "Writing Unsafe Functions" +msgid "We will look at the two kinds of unsafe functions next." msgstr "" -#: src/unsafe-rust/unsafe-functions.md +#: src/unsafe-rust/unsafe-functions/rust.md msgid "" "You can mark your own functions as `unsafe` if they require particular " -"conditions to avoid undefined behaviour." +"preconditions to avoid undefined behaviour." msgstr "" -#: src/unsafe-rust/unsafe-functions.md +#: src/unsafe-rust/unsafe-functions/rust.md msgid "" "/// Swaps the values pointed to by the given pointers.\n" "///\n" "/// # Safety\n" "///\n" -"/// The pointers must be valid and properly aligned.\n" -msgstr "" - -#: src/unsafe-rust/unsafe-functions.md -msgid "// Safe because ...\n" +"/// The pointers must be valid, properly aligned, and not otherwise accessed " +"for\n" +"/// the duration of the function call.\n" msgstr "" -#: src/unsafe-rust/unsafe-functions.md -msgid "\"a = {}, b = {}\"" +#: src/unsafe-rust/unsafe-functions/rust.md +msgid "" +"// SAFETY: Our caller promised that the pointers are valid, properly " +"aligned\n" +" // and have no other access.\n" msgstr "" -#: src/unsafe-rust/unsafe-functions.md +#: src/unsafe-rust/unsafe-functions/rust.md msgid "" -"`get_unchecked`, like most `_unchecked` functions, is unsafe, because it can " -"create UB if the range is incorrect. `abs` is incorrect for a different " -"reason: it is an external function (FFI). Calling external functions is " -"usually only a problem when those functions 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." +"// SAFETY: The pointers must be valid, aligned and unique because they came\n" +" // from references.\n" msgstr "" -#: src/unsafe-rust/unsafe-functions.md -msgid "" -"The `\"C\"` in this example is the ABI; [other ABIs are available too]" -"(https://doc.rust-lang.org/reference/items/external-blocks.html)." +#: src/unsafe-rust/unsafe-functions/rust.md +msgid "\"a = {}, b = {}\"" msgstr "" -#: src/unsafe-rust/unsafe-functions.md +#: src/unsafe-rust/unsafe-functions/rust.md msgid "" -"We wouldn't actually use pointers for a `swap` function - it can be done " +"We wouldn't actually use pointers for a `swap` function --- it can be done " "safely with references." msgstr "" -#: src/unsafe-rust/unsafe-functions.md +#: src/unsafe-rust/unsafe-functions/rust.md msgid "" -"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. This will likely change in a future Rust " -"edition." -msgstr "" - -#: src/unsafe-rust/unsafe-traits.md -msgid "Implementing Unsafe Traits" +"Note that Rust 2021 and earlier allow unsafe code within an unsafe function " +"without an `unsafe` block. This changed in the 2024 edition. We can prohibit " +"it in older editions with `#[deny(unsafe_op_in_unsafe_fn)]`. Try adding it " +"and see what happens." msgstr "" -#: src/unsafe-rust/unsafe-traits.md +#: src/unsafe-rust/unsafe-functions/extern-c.md msgid "" -"Like with functions, you can mark a trait as `unsafe` if the implementation " -"must guarantee particular conditions to avoid undefined behaviour." +"You can declare foreign functions for access from Rust with `unsafe extern`. " +"This is unsafe because the compiler has to way to reason about their " +"behavior. Functions declared in an `extern` block must be marked as `safe` " +"or `unsafe`, depending on whether they have preconditions for safe use:" msgstr "" -#: src/unsafe-rust/unsafe-traits.md +#: src/unsafe-rust/unsafe-functions/extern-c.md src/unsafe-rust/exercise.md +#: src/unsafe-rust/solution.md src/android/interoperability/with-c.md +#: src/android/interoperability/with-c/rust-library.md +#: src/android/interoperability/cpp/cpp-bridge.md +#: src/exercises/chromium/build-rules.md src/bare-metal/aps/inline-assembly.md +#: src/bare-metal/aps/uart/using.md src/bare-metal/aps/safemmio/using.md +#: src/bare-metal/aps/logging/using.md +#: src/unsafe-deep-dive/motivations/interop.md +msgid "\"C\"" +msgstr "\"C\"" + +#: src/unsafe-rust/unsafe-functions/extern-c.md msgid "" -"For example, the `zerocopy` crate has an unsafe trait that looks [something " -"like this](https://docs.rs/zerocopy/latest/zerocopy/trait.AsBytes.html):" +"// `abs` doesn't deal with pointers and doesn't have any safety " +"requirements.\n" msgstr "" -#: src/unsafe-rust/unsafe-traits.md +#: src/unsafe-rust/unsafe-functions/extern-c.md msgid "" -"/// ...\n" "/// # Safety\n" -"/// The type must have a defined representation and no padding.\n" +" ///\n" +" /// `s` must be a pointer to a NUL-terminated C string which is valid " +"and\n" +" /// not modified for the duration of this function call.\n" msgstr "" -#: src/unsafe-rust/unsafe-traits.md -msgid "// Safe because u32 has a defined representation and no padding.\n" +#: src/unsafe-rust/unsafe-functions/extern-c.md +msgid "\"Absolute value of -3 according to C: {}\"" msgstr "" -#: src/unsafe-rust/unsafe-traits.md +#: src/unsafe-rust/unsafe-functions/extern-c.md +msgid "" +"// SAFETY: We pass a pointer to a C string literal which is valid for\n" +" // the duration of the program.\n" +msgstr "" + +#: src/unsafe-rust/unsafe-functions/extern-c.md +#, fuzzy +msgid "\"String length: {}\"" +msgstr "\"Længde: {}\"" + +#: src/unsafe-rust/unsafe-functions/extern-c.md +#, fuzzy +msgid "\"String\"" +msgstr "\"En streng\"" + +#: src/unsafe-rust/unsafe-functions/extern-c.md +msgid "" +"Rust used to consider all extern functions unsafe, but this changed in Rust " +"1.82 with `unsafe extern` blocks." +msgstr "" + +#: src/unsafe-rust/unsafe-functions/extern-c.md +msgid "" +"`abs` must be explicitly marked as `safe` because it is an external function " +"(FFI). Calling external functions is usually only a problem when those " +"functions 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-rust/unsafe-functions/extern-c.md +msgid "" +"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-rust/unsafe-functions/extern-c.md +msgid "" +"Note that there is no verification that the Rust function signature matches " +"that of the function definition -- that's up to you!" +msgstr "" + +#: src/unsafe-rust/unsafe-functions/calling.md +msgid "Failing to uphold the safety requirements breaks memory safety!" +msgstr "" + +#: src/unsafe-rust/unsafe-functions/calling.md +msgid "// 8 bytes\n" +msgstr "" + +#: src/unsafe-rust/unsafe-functions/calling.md +#, fuzzy +msgid "\"{pk:?}\"" +msgstr "\"{:?}\"" + +#: src/unsafe-rust/unsafe-functions/calling.md +msgid "" +"Always include a safety comment for each `unsafe` block. It must explain why " +"the code is actually safe. This example is missing a safety comment and is " +"unsound." +msgstr "" + +#: src/unsafe-rust/unsafe-functions/calling.md +msgid "" +"The second argument to `slice::from_raw_parts` is the number of _elements_, " +"not bytes! This example demonstrates unexpected behavior by reading past the " +"end of one array and into another." +msgstr "" + +#: src/unsafe-rust/unsafe-functions/calling.md +msgid "" +"This is undefined behavior because we're reading past the end of the array " +"that the pointer was derived from." +msgstr "" + +#: src/unsafe-rust/unsafe-functions/calling.md +msgid "" +"`log_public_key` should be unsafe, because `pk_ptr` must meet certain " +"prerequisites to avoid undefined behaviour. A safe function which can cause " +"undefined behaviour is said to be `unsound`. What should its safety " +"documentation say?" +msgstr "" + +#: src/unsafe-rust/unsafe-functions/calling.md +msgid "" +"The standard library contains many low-level unsafe functions. Prefer the " +"safe alternatives when possible!" +msgstr "" + +#: src/unsafe-rust/unsafe-functions/calling.md +msgid "" +"If you use an unsafe function as an optimization, make sure to add a " +"benchmark to demonstrate the gain." +msgstr "" + +#: src/unsafe-rust/unsafe-traits.md +msgid "Implementing Unsafe Traits" +msgstr "" + +#: src/unsafe-rust/unsafe-traits.md +msgid "" +"Like with functions, you can mark a trait as `unsafe` if the implementation " +"must guarantee particular conditions to avoid undefined behaviour." +msgstr "" + +#: src/unsafe-rust/unsafe-traits.md +msgid "" +"For example, the `zerocopy` crate has an unsafe trait that looks [something " +"like this](https://docs.rs/zerocopy/latest/zerocopy/trait.IntoBytes.html):" +msgstr "" + +#: src/unsafe-rust/unsafe-traits.md +msgid "" +"/// ...\n" +"/// # Safety\n" +"/// The type must have a defined representation and no padding.\n" +msgstr "" + +#: src/unsafe-rust/unsafe-traits.md +msgid "// SAFETY: `u32` has a defined representation and no padding.\n" +msgstr "" + +#: src/unsafe-rust/unsafe-traits.md msgid "" "There should be a `# Safety` section on the Rustdoc for the trait explaining " "the requirements for the trait to be safely implemented." @@ -10525,7 +11111,7 @@ msgstr "" #: src/unsafe-rust/unsafe-traits.md msgid "" -"The actual safety section for `AsBytes` is rather longer and more " +"The actual safety section for `IntoBytes` is rather longer and more " "complicated." msgstr "" @@ -10667,6 +11253,10 @@ msgid "" "functions and methods:" msgstr "" +#: src/unsafe-rust/exercise.md +msgid "// TODO: remove this when you're done with your implementation.\n" +msgstr "" + #: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md msgid "\"macos\"" msgstr "\"macos\"" @@ -10715,12 +11305,12 @@ msgstr "" msgid "// Keep calling readdir until we get a NULL pointer back.\n" msgstr "" -#: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md +#: src/unsafe-rust/exercise.md msgid "// Call closedir as needed.\n" msgstr "" #: src/unsafe-rust/exercise.md src/unsafe-rust/solution.md -#: src/android/interoperability/with-c/rust.md +#: src/android/interoperability/with-c/rust-library.md msgid "\".\"" msgstr "\".\"" @@ -10728,6 +11318,13 @@ msgstr "\".\"" msgid "\"files: {:#?}\"" msgstr "" +#: src/unsafe-rust/exercise.md +msgid "" +"FFI binding code is typically generated by tools like [bindgen](https://" +"github.com/rust-lang/rust-bindgen), rather than being written manually as we " +"are doing here. However, bindgen can't run in an online playground." +msgstr "" + #: src/unsafe-rust/solution.md msgid "\"Invalid path: {err}\"" msgstr "" @@ -10737,7 +11334,7 @@ msgid "// SAFETY: path.as_ptr() cannot be NULL.\n" msgstr "" #: src/unsafe-rust/solution.md -msgid "\"Could not open {:?}\"" +msgid "\"Could not open {path:?}\"" msgstr "" #: src/unsafe-rust/solution.md @@ -10757,7 +11354,9 @@ msgid "" msgstr "" #: src/unsafe-rust/solution.md -msgid "// SAFETY: self.dir is not NULL.\n" +msgid "" +"// Call closedir as needed.\n" +" // SAFETY: self.dir is never NULL.\n" msgstr "" #: src/unsafe-rust/solution.md @@ -10811,14 +11410,6 @@ msgid "" "existing code as needed)." msgstr "" -#: src/android.md -msgid "" -"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.md msgid "" "The speaker may mention any of the following given the increased use of Rust " @@ -10828,25 +11419,25 @@ msgstr "" #: src/android.md msgid "" "Service example: [DNS over HTTP](https://security.googleblog.com/2022/07/dns-" -"over-http3-in-android.html)" +"over-http3-in-android.html)." msgstr "" #: src/android.md msgid "" "Libraries: [Rutabaga Virtual Graphics Interface](https://crosvm.dev/book/" -"appendix/rutabaga_gfx.html)" +"appendix/rutabaga_gfx.html)." msgstr "" #: src/android.md msgid "" "Kernel Drivers: [Binder](https://lore.kernel.org/rust-for-linux/20231101-" -"rust-binder-v1-0-08ba9197f637@google.com/)" +"rust-binder-v1-0-08ba9197f637@google.com/)." msgstr "" #: src/android.md msgid "" "Firmware: [pKVM firmware](https://security.googleblog.com/2023/10/bare-metal-" -"rust-in-android.html)" +"rust-in-android.html)." msgstr "" #: src/android/setup.md @@ -10861,6 +11452,14 @@ msgid "" "setup/start) for details." msgstr "" +#: src/android/setup.md +msgid "" +"The code on the following pages can be found in the [`src/android/` " +"directory](https://github.com/google/comprehensive-rust/tree/main/src/" +"android) of the course material. Please `git clone` the repository to follow " +"along." +msgstr "" + #: src/android/setup.md msgid "" "Cuttlefish is a reference Android device designed to work on generic Linux " @@ -10874,7 +11473,7 @@ msgid "" msgstr "" #: src/android/build-rules.md -msgid "The Android build system (Soong) supports Rust via a number of modules:" +msgid "The Android build system (Soong) supports Rust through several modules:" msgstr "" #: src/android/build-rules.md @@ -10962,37 +11561,25 @@ msgid "We will look at `rust_binary` and `rust_library` next." msgstr "" #: src/android/build-rules.md -msgid "Additional items speaker may mention:" +msgid "Additional items the speaker may mention:" msgstr "" #: src/android/build-rules.md msgid "" -"Cargo is not optimized for multi-language repos, and also downloads packages " -"from the internet." +"Cargo is not optimized for multi-language repositories, and also downloads " +"packages from the internet." msgstr "" #: src/android/build-rules.md msgid "" "For compliance and performance, Android must have crates in-tree. It must " -"also interop with C/C++/Java code. Soong fills that gap." +"also interoperate with C/C++/Java code. Soong fills that gap." msgstr "" #: src/android/build-rules.md msgid "" -"Soong has many similarities to Bazel, which is the open-source variant of " -"Blaze (used in google3)." -msgstr "" - -#: src/android/build-rules.md -msgid "" -"There is a plan to transition [Android](https://source.android.com/docs/" -"setup/build/bazel/introduction), [ChromeOS](https://chromium.googlesource." -"com/chromiumos/bazel/), and [Fuchsia](https://source.android.com/docs/setup/" -"build/bazel/introduction) to Bazel." -msgstr "" - -#: src/android/build-rules.md -msgid "Learning Bazel-like build rules is useful for all Rust OS developers." +"Soong has many similarities to [Bazel](https://bazel.build/), which is the " +"open-source variant of Blaze (used in google3)." msgstr "" #: src/android/build-rules.md @@ -11005,7 +11592,7 @@ msgstr "" #: src/android/build-rules/binary.md msgid "" -"Let us start with a simple application. At the root of an AOSP checkout, " +"Let's start with a simple application. At the root of an AOSP checkout, " "create the following files:" msgstr "" @@ -11057,6 +11644,24 @@ msgstr "" "adb shell /data/local/tmp/hello_rust\n" "```" +#: src/android/build-rules/binary.md src/android/build-rules/library.md +msgid "" +"Go through the build steps and demonstrate them running in your emulator." +msgstr "" + +#: src/android/build-rules/binary.md +msgid "" +"Notice the extensive documentation comments? The Android build rules enforce " +"that all modules have documentation. Try removing it and see what error you " +"get." +msgstr "" + +#: src/android/build-rules/binary.md +msgid "" +"Stress that the Rust build rules look like the other Soong rules. This is by " +"design, to make using Rust as easy as C++ or Java." +msgstr "" + #: src/android/build-rules/library.md msgid "Rust Libraries" msgstr "" @@ -11075,9 +11680,9 @@ msgstr "" #: src/android/build-rules/library.md msgid "" -"`libtextwrap`, which is a crate already vendored in [`external/rust/crates/`]" -"(https://cs.android.com/android/platform/superproject/+/master:external/rust/" -"crates/)." +"`libtextwrap`, which is a crate already vendored in [`external/rust/android-" +"crates-io/crates/`](https://cs.android.com/android/platform/superproject/" +"main/+/main:external/rust/android-crates-io/crates/)." msgstr "" #: src/android/build-rules/library.md @@ -11100,7 +11705,8 @@ msgstr "" msgid "\"greetings\"" msgstr "\"greetings\"" -#: src/android/build-rules/library.md src/android/aidl/implementation.md +#: src/android/build-rules/library.md +#: src/android/aidl/example-service/service.md src/android/testing.md #: src/android/interoperability/java.md msgid "\"src/lib.rs\"" msgstr "\"src/lib.rs\"" @@ -11142,153 +11748,296 @@ msgstr "" "adb shell /data/local/tmp/hello_rust_with_dep\n" "```" +#: src/android/build-rules/library.md +msgid "" +"A Rust crate named `greetings` must be built by a rule called " +"`libgreetings`. Note how the Rust code uses the crate name, as is normal in " +"Rust." +msgstr "" + +#: src/android/build-rules/library.md +msgid "" +"Again, the build rules enforce that we add documentation comments to all " +"public items." +msgstr "" + #: src/android/aidl.md msgid "" -"The [Android Interface Definition Language (AIDL)](https://developer.android." -"com/guide/components/aidl) is supported in Rust:" +"Rust supports the [Android Interface Definition Language (AIDL)](https://" +"developer.android.com/guide/components/aidl):" msgstr "" #: src/android/aidl.md -msgid "Rust code can call existing AIDL servers," +msgid "Rust code can call existing AIDL servers." msgstr "" #: src/android/aidl.md msgid "You can create new AIDL servers in Rust." msgstr "" -#: src/android/aidl/interface.md +#: src/android/aidl.md +msgid "AIDL enables Android apps to interact with each other." +msgstr "" + +#: src/android/aidl.md +msgid "" +"Since Rust is a first-class citizen in this ecosystem, other processes on " +"the device can call Rust services." +msgstr "" + +#: src/android/aidl/birthday-service.md +msgid "" +"To illustrate using Rust with Binder, we will create a Binder interface. " +"Then, we'll implement the service and write a client that talks to it." +msgstr "" + +#: src/android/aidl/example-service/interface.md msgid "AIDL Interfaces" msgstr "" -#: src/android/aidl/interface.md +#: src/android/aidl/example-service/interface.md msgid "You declare the API of your service using an AIDL interface:" msgstr "" -#: src/android/aidl/interface.md +#: src/android/aidl/example-service/interface.md +#: src/android/aidl/example-service/service-bindings.md +#: src/android/aidl/types/objects.md src/android/aidl/types/parcelables.md +#: src/android/aidl/types/file-descriptor.md msgid "" "_birthday_service/aidl/com/example/birthdayservice/IBirthdayService.aidl_:" msgstr "" "_birthday_service/aidl/com/example/birthdayservice/IBirthdayService.aidl_:" -#: src/android/aidl/interface.md src/android/aidl/changing.md +#: src/android/aidl/example-service/interface.md +#: src/android/aidl/example-service/service-bindings.md +#: src/android/aidl/example-service/changing-definition.md msgid "/** Birthday service interface. */" msgstr "" -#: src/android/aidl/interface.md src/android/aidl/changing.md +#: src/android/aidl/example-service/interface.md +#: src/android/aidl/example-service/service-bindings.md +#: src/android/aidl/example-service/changing-definition.md msgid "/** Generate a Happy Birthday message. */" msgstr "" -#: src/android/aidl/interface.md +#: src/android/aidl/example-service/interface.md msgid "_birthday_service/aidl/Android.bp_:" msgstr "_birthday_service/aidl/Android.bp_:" -#: src/android/aidl/interface.md +#: src/android/aidl/example-service/interface.md msgid "\"com.example.birthdayservice\"" msgstr "\"com.example.birthdayservice\"" -#: src/android/aidl/interface.md +#: src/android/aidl/example-service/interface.md msgid "\"com/example/birthdayservice/*.aidl\"" msgstr "\"com/example/birthdayservice/*.aidl\"" -#: src/android/aidl/interface.md +#: src/android/aidl/example-service/interface.md msgid "// Rust is not enabled by default\n" msgstr "" -#: src/android/aidl/interface.md +#: src/android/aidl/example-service/interface.md +msgid "" +"Note that the directory structure under the `aidl/` directory needs to match " +"the package name used in the AIDL file, i.e. the package is " +"`com.example.birthdayservice` and the file is at `aidl/com/example/" +"IBirthdayService.aidl`." +msgstr "" + +#: src/android/aidl/example-service/service-bindings.md +msgid "Generated Service API" +msgstr "" + +#: src/android/aidl/example-service/service-bindings.md +msgid "Binder generates a trait for each interface definition." +msgstr "" + +#: src/android/aidl/example-service/service-bindings.md +msgid "_out/soong/.intermediates/.../com_example_birthdayservice.rs_:" +msgstr "" + +#: src/android/aidl/example-service/service-bindings.md msgid "" -"Add `vendor_available: true` if your AIDL file is used by a binary in the " -"vendor partition." +"Your service will need to implement this trait, and your client will use " +"this trait to talk to the service." msgstr "" -#: src/android/aidl/implementation.md +#: src/android/aidl/example-service/service-bindings.md +msgid "" +"Point out how the generated function signature, specifically the argument " +"and return types, correspond to the interface definition." +msgstr "" + +#: src/android/aidl/example-service/service-bindings.md +msgid "" +"`String` for an argument results in a different Rust type than `String` as a " +"return type." +msgstr "" + +#: src/android/aidl/example-service/service.md msgid "Service Implementation" msgstr "" -#: src/android/aidl/implementation.md +#: src/android/aidl/example-service/service.md msgid "We can now implement the AIDL service:" msgstr "" -#: src/android/aidl/implementation.md +#: src/android/aidl/example-service/service.md +#: src/android/aidl/example-service/changing-implementation.md +#: src/android/aidl/types/file-descriptor.md msgid "_birthday_service/src/lib.rs_:" msgstr "_birthday_service/src/lib.rs_:" -#: src/android/aidl/implementation.md +#: src/android/aidl/example-service/service.md msgid "//! Implementation of the `IBirthdayService` AIDL interface.\n" msgstr "" -#: src/android/aidl/implementation.md +#: src/android/aidl/example-service/service.md msgid "/// The `IBirthdayService` implementation.\n" msgstr "" -#: src/android/aidl/implementation.md +#: src/android/aidl/example-service/service.md +#: src/android/aidl/example-service/changing-implementation.md +#: src/android/aidl/types/file-descriptor.md msgid "\"Happy Birthday {name}, congratulations with the {years} years!\"" msgstr "" -#: src/android/aidl/implementation.md src/android/aidl/server.md -#: src/android/aidl/client.md +#: src/android/aidl/example-service/service.md +#: src/android/aidl/example-service/server.md +#: src/android/aidl/example-service/client.md msgid "_birthday_service/Android.bp_:" msgstr "_birthday_service/Android.bp_:" -#: src/android/aidl/implementation.md src/android/aidl/server.md +#: src/android/aidl/example-service/service.md +#: src/android/aidl/example-service/server.md msgid "\"libbirthdayservice\"" msgstr "\"libbirthdayservice\"" -#: src/android/aidl/implementation.md src/android/aidl/server.md -#: src/android/aidl/client.md +#: src/android/aidl/example-service/service.md +#: src/android/aidl/example-service/server.md +#: src/android/aidl/example-service/client.md msgid "\"birthdayservice\"" msgstr "\"birthdayservice\"" -#: src/android/aidl/implementation.md src/android/aidl/server.md -#: src/android/aidl/client.md +#: src/android/aidl/example-service/service.md +#: src/android/aidl/example-service/server.md +#: src/android/aidl/example-service/client.md msgid "\"com.example.birthdayservice-rust\"" msgstr "\"com.example.birthdayservice-rust\"" -#: src/android/aidl/implementation.md src/android/aidl/server.md -#: src/android/aidl/client.md -msgid "\"libbinder_rs\"" -msgstr "\"libbinder_rs\"" +#: src/android/aidl/example-service/service.md +msgid "" +"Point out the path to the generated `IBirthdayService` trait, and explain " +"why each of the segments is necessary." +msgstr "" + +#: src/android/aidl/example-service/service.md +msgid "" +"Note that `wishHappyBirthday` and other AIDL IPC methods take `&self` " +"(instead of `&mut self`)." +msgstr "" + +#: src/android/aidl/example-service/service.md +msgid "" +"This is necessary because Binder responds to incoming requests on a thread " +"pool, allowing for multiple requests to be processed in parallel. This " +"requires that the service methods only get a shared reference to `self`." +msgstr "" + +#: src/android/aidl/example-service/service.md +msgid "" +"Any state that needs to be modified by the service will have to be put in " +"something like a `Mutex` to allow for safe mutation." +msgstr "" + +#: src/android/aidl/example-service/service.md +msgid "" +"The correct approach for managing service state depends heavily on the " +"details of your service." +msgstr "" + +#: src/android/aidl/example-service/service.md +msgid "" +"TODO: What does the `binder::Interface` trait do? Are there methods to " +"override? Where is the source?" +msgstr "" -#: src/android/aidl/server.md +#: src/android/aidl/example-service/server.md msgid "AIDL Server" msgstr "" -#: src/android/aidl/server.md +#: src/android/aidl/example-service/server.md msgid "Finally, we can create a server which exposes the service:" msgstr "" -#: src/android/aidl/server.md +#: src/android/aidl/example-service/server.md msgid "_birthday_service/src/server.rs_:" msgstr "_birthday_service/src/server.rs_:" -#: src/android/aidl/server.md src/android/aidl/client.md +#: src/android/aidl/example-service/server.md msgid "//! Birthday service.\n" msgstr "" -#: src/android/aidl/server.md +#: src/android/aidl/example-service/server.md msgid "/// Entry point for birthday service.\n" msgstr "" -#: src/android/aidl/server.md +#: src/android/aidl/example-service/server.md msgid "\"Failed to register service\"" msgstr "" -#: src/android/aidl/server.md +#: src/android/aidl/example-service/server.md msgid "\"birthday_server\"" msgstr "\"birthday_server\"" -#: src/android/aidl/server.md +#: src/android/aidl/example-service/server.md msgid "\"src/server.rs\"" msgstr "\"src/server.rs\"" -#: src/android/aidl/server.md src/android/aidl/client.md +#: src/android/aidl/example-service/server.md +#: src/android/aidl/example-service/client.md msgid "// To avoid dynamic link error.\n" msgstr "" -#: src/android/aidl/deploy.md +#: src/android/aidl/example-service/server.md +msgid "" +"The process for taking a user-defined service implementation (in this case, " +"the `BirthdayService` type, which implements the `IBirthdayService`) and " +"starting it as a Binder service has multiple steps. This may appear more " +"complicated than students are used to if they've used Binder from C++ or " +"another language. Explain to students why each step is necessary." +msgstr "" + +#: src/android/aidl/example-service/server.md +msgid "Create an instance of your service type (`BirthdayService`)." +msgstr "" + +#: src/android/aidl/example-service/server.md +msgid "" +"Wrap the service object in the corresponding `Bn*` type (`BnBirthdayService` " +"in this case). This type is generated by Binder and provides common Binder " +"functionality, similar to the `BnBinder` base class in C++. Since Rust " +"doesn't have inheritance, we use composition, putting our `BirthdayService` " +"within the generated `BnBinderService`." +msgstr "" + +#: src/android/aidl/example-service/server.md +msgid "" +"Call `add_service`, giving it a service identifier and your service object " +"(the `BnBirthdayService` object in the example)." +msgstr "" + +#: src/android/aidl/example-service/server.md +msgid "" +"Call `join_thread_pool` to add the current thread to Binder's thread pool " +"and start listening for connections." +msgstr "" + +#: src/android/aidl/example-service/deploy.md msgid "We can now build, push, and start the service:" msgstr "" -#: src/android/aidl/deploy.md +#: src/android/aidl/example-service/deploy.md #, fuzzy msgid "" "```shell\n" @@ -11306,59 +12055,65 @@ msgstr "" "adb shell /data/local/tmp/birthday_server\n" "```" -#: src/android/aidl/deploy.md +#: src/android/aidl/example-service/deploy.md msgid "In another terminal, check that the service runs:" msgstr "" -#: src/android/aidl/deploy.md +#: src/android/aidl/example-service/deploy.md msgid "You can also call the service with `service call`:" msgstr "" -#: src/android/aidl/client.md +#: src/android/aidl/example-service/client.md msgid "AIDL Client" msgstr "" -#: src/android/aidl/client.md +#: src/android/aidl/example-service/client.md msgid "Finally, we can create a Rust client for our new service." msgstr "" -#: src/android/aidl/client.md +#: src/android/aidl/example-service/client.md +#: src/android/aidl/example-service/changing-implementation.md +#: src/android/aidl/types/objects.md src/android/aidl/types/parcelables.md +#: src/android/aidl/types/file-descriptor.md msgid "_birthday_service/src/client.rs_:" msgstr "_birthday_service/src/client.rs_:" -#: src/android/aidl/client.md -msgid "/// Connect to the BirthdayService.\n" -msgstr "" - -#: src/android/aidl/client.md +#: src/android/aidl/example-service/client.md msgid "/// Call the birthday service.\n" msgstr "" -#: src/android/aidl/client.md +#: src/android/aidl/example-service/client.md src/android/aidl/types/objects.md +#: src/android/aidl/types/parcelables.md +#: src/android/aidl/types/file-descriptor.md msgid "\"Failed to connect to BirthdayService\"" msgstr "" -#: src/android/aidl/client.md +#: src/android/aidl/example-service/client.md +#, fuzzy +msgid "// Call the service.\n" +msgstr "/// Analyze the numbers.\n" + +#: src/android/aidl/example-service/client.md msgid "\"{msg}\"" msgstr "\"{msg}\"" -#: src/android/aidl/client.md +#: src/android/aidl/example-service/client.md msgid "\"birthday_client\"" msgstr "\"birthday_client\"" -#: src/android/aidl/client.md +#: src/android/aidl/example-service/client.md msgid "\"src/client.rs\"" msgstr "\"src/client.rs\"" -#: src/android/aidl/client.md +#: src/android/aidl/example-service/client.md msgid "Notice that the client does not depend on `libbirthdayservice`." msgstr "" -#: src/android/aidl/client.md +#: src/android/aidl/example-service/client.md msgid "Build, push, and run the client on your device:" msgstr "" -#: src/android/aidl/client.md +#: src/android/aidl/example-service/client.md #, fuzzy msgid "" "```shell\n" @@ -11375,7931 +12130,9748 @@ msgstr "" "adb shell /data/local/tmp/birthday_client Charlie 60\n" "```" -#: src/android/aidl/changing.md +#: src/android/aidl/example-service/client.md msgid "" -"Let us extend the API with more functionality: we want to let clients " -"specify a list of lines for the birthday card:" +"`Strong` is the trait object representing the service " +"that the client has connected to." msgstr "" -#: src/android/logging.md +#: src/android/aidl/example-service/client.md msgid "" -"You should use the `log` crate to automatically log to `logcat` (on-device) " -"or `stdout` (on-host):" +"`Strong` is a custom smart pointer type for Binder. It handles both an in-" +"process ref count for the service trait object, and the global Binder ref " +"count that tracks how many processes have a reference to the object." msgstr "" -#: src/android/logging.md -msgid "_hello_rust_logs/Android.bp_:" -msgstr "_hello_rust_logs/Android.bp_:" +#: src/android/aidl/example-service/client.md +msgid "" +"Note that the trait object that the client uses to talk to the service uses " +"the exact same trait that the server implements. For a given Binder " +"interface, there is a single Rust trait generated that both client and " +"server use." +msgstr "" -#: src/android/logging.md -msgid "\"hello_rust_logs\"" -msgstr "\"hello_rust_logs\"" +#: src/android/aidl/example-service/client.md +msgid "" +"Use the same service identifier used when registering the service. This " +"should ideally be defined in a common crate that both the client and server " +"can depend on." +msgstr "" -#: src/android/logging.md -msgid "\"liblog_rust\"" -msgstr "\"liblog_rust\"" +#: src/android/aidl/example-service/changing-definition.md +msgid "" +"Let's extend the API: we'll let clients specify a list of lines for the " +"birthday card:" +msgstr "" -#: src/android/logging.md -msgid "\"liblogger\"" -msgstr "\"liblogger\"" +#: src/android/aidl/example-service/changing-definition.md +msgid "This results in an updated trait definition for `IBirthdayService`:" +msgstr "" -#: src/android/logging.md -msgid "_hello_rust_logs/src/main.rs_:" -msgstr "_hello_rust_logs/src/main.rs_:" +#: src/android/aidl/example-service/changing-definition.md +msgid "" +"Note how the `String[]` in the AIDL definition is translated as a " +"`&[String]` in Rust, i.e. that idiomatic Rust types are used in the " +"generated bindings wherever possible:" +msgstr "" -#: src/android/logging.md -msgid "//! Rust logging demo.\n" +#: src/android/aidl/example-service/changing-definition.md +msgid "`in` array arguments are translated to slices." msgstr "" -#: src/android/logging.md -msgid "/// Logs a greeting.\n" +#: src/android/aidl/example-service/changing-definition.md +msgid "`out` and `inout` args are translated to `&mut Vec`." msgstr "" -#: src/android/logging.md -msgid "\"rust\"" -msgstr "\"rust\"" +#: src/android/aidl/example-service/changing-definition.md +msgid "Return values are translated to returning a `Vec`." +msgstr "" -#: src/android/logging.md -msgid "\"Starting program.\"" +#: src/android/aidl/example-service/changing-implementation.md +msgid "Updating Client and Service" msgstr "" -#: src/android/logging.md -msgid "\"Things are going fine.\"" +#: src/android/aidl/example-service/changing-implementation.md +msgid "Update the client and server code to account for the new API." msgstr "" -#: src/android/logging.md -msgid "\"Something went wrong!\"" +#: src/android/aidl/example-service/changing-implementation.md +msgid "'\\n'" msgstr "" -#: src/android/logging.md src/android/interoperability/with-c/bindgen.md -#: src/android/interoperability/with-c/rust.md -msgid "Build, push, and run the binary on your device:" +#: src/android/aidl/example-service/changing-implementation.md +msgid "\"Habby birfday to yuuuuu\"" msgstr "" -#: src/android/logging.md -#, fuzzy +#: src/android/aidl/example-service/changing-implementation.md +msgid "\"And also: many more\"" +msgstr "" + +#: src/android/aidl/example-service/changing-implementation.md msgid "" -"```shell\n" -"m hello_rust_logs\n" -"adb push \"$ANDROID_PRODUCT_OUT/system/bin/hello_rust_logs\" /data/local/" -"tmp\n" -"adb shell /data/local/tmp/hello_rust_logs\n" -"```" +"TODO: Move code snippets into project files where they'll actually be built?" msgstr "" -"```shell\n" -"m hello_rust_logs\n" -"adb push \"$ANDROID_PRODUCT_OUT/system/bin/hello_rust_logs /data/local/" -"tmp\"\n" -"adb shell /data/local/tmp/hello_rust_logs\n" -"```" -#: src/android/logging.md -msgid "The logs show up in `adb logcat`:" +#: src/android/aidl/types.md +msgid "Working With AIDL Types" msgstr "" -#: src/android/interoperability.md -msgid "" -"Rust has excellent support for interoperability with other languages. This " -"means that you can:" +#: src/android/aidl/types.md +msgid "AIDL types translate into the appropriate idiomatic Rust type:" msgstr "" -#: src/android/interoperability.md -msgid "Call Rust functions from other languages." +#: src/android/aidl/types.md +msgid "Primitive types map (mostly) to idiomatic Rust types." msgstr "" -#: src/android/interoperability.md -msgid "Call functions written in other languages from Rust." +#: src/android/aidl/types.md +msgid "Collection types like slices, `Vec`s and string types are supported." msgstr "" -#: src/android/interoperability.md +#: src/android/aidl/types.md msgid "" -"When you call functions in a foreign language we say that you're using a " -"_foreign function interface_, also known as FFI." +"References to AIDL objects and file handles can be sent between clients and " +"services." msgstr "" -#: src/android/interoperability/with-c.md -msgid "Interoperability with C" +#: src/android/aidl/types.md +msgid "File handles and parcelables are fully supported." msgstr "" -#: src/android/interoperability/with-c.md -msgid "" -"Rust has full support for linking object files with a C calling convention. " -"Similarly, you can export Rust functions and call them from C." +#: src/android/aidl/types/primitives.md +msgid "Primitive types map (mostly) idiomatically:" msgstr "" -#: src/android/interoperability/with-c.md -msgid "You can do it by hand if you want:" +#: src/android/aidl/types/primitives.md +msgid "AIDL Type" msgstr "" -#: src/android/interoperability/with-c.md -msgid "\"{x}, {abs_x}\"" -msgstr "\"{x}, {abs_x}\"" +#: src/android/aidl/types/primitives.md src/android/aidl/types/arrays.md +#: src/android/interoperability/cpp/type-mapping.md +#, fuzzy +msgid "Rust Type" +msgstr "Rust by Example" -#: src/android/interoperability/with-c.md -msgid "" -"We already saw this in the [Safe FFI Wrapper exercise](../../exercises/day-3/" -"safe-ffi-wrapper.md)." +#: src/android/aidl/types/primitives.md +msgid "Note" msgstr "" -#: src/android/interoperability/with-c.md -msgid "" -"This assumes full knowledge of the target platform. Not recommended for " -"production." +#: src/android/aidl/types/primitives.md +msgid "`boolean`" msgstr "" -#: src/android/interoperability/with-c.md -msgid "We will look at better options next." +#: src/android/aidl/types/primitives.md +msgid "`byte`" msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "Using Bindgen" +#: src/android/aidl/types/primitives.md +msgid "`i8`" msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "" -"The [bindgen](https://rust-lang.github.io/rust-bindgen/introduction.html) " -"tool can auto-generate bindings from a C header file." +#: src/android/aidl/types/primitives.md +msgid "Note that bytes are signed." msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "First create a small C library:" +#: src/android/aidl/types/primitives.md +msgid "`u16`" msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "_interoperability/bindgen/libbirthday.h_:" -msgstr "_interoperability/bindgen/libbirthday.h_:" - -#: src/android/interoperability/with-c/bindgen.md -msgid "_interoperability/bindgen/libbirthday.c_:" -msgstr "_interoperability/bindgen/libbirthday.c_:" - -#: src/android/interoperability/with-c/bindgen.md -msgid "" -msgstr "" +#: src/android/aidl/types/primitives.md +msgid "Note the usage of `u16`, NOT `u32`." +msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "\"libbirthday.h\"" -msgstr "\"libbirthday.h\"" +#: src/android/aidl/types/primitives.md +msgid "`int`" +msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "\"+--------------\\n\"" -msgstr "\"+--------------\\n\"" +#: src/android/aidl/types/primitives.md +msgid "`i32`" +msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "\"| Happy Birthday %s!\\n\"" +#: src/android/aidl/types/primitives.md +msgid "`long`" msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "\"| Congratulations with the %i years!\\n\"" +#: src/android/aidl/types/primitives.md +msgid "`i64`" msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "Add this to your `Android.bp` file:" +#: src/android/aidl/types/primitives.md +msgid "`float`" msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "_interoperability/bindgen/Android.bp_:" -msgstr "_interoperability/bindgen/Android.bp_:" +#: src/android/aidl/types/primitives.md +msgid "`f32`" +msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "\"libbirthday\"" -msgstr "\"libbirthday\"" +#: src/android/aidl/types/primitives.md +msgid "`double`" +msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "\"libbirthday.c\"" -msgstr "\"libbirthday.c\"" +#: src/android/aidl/types/primitives.md +msgid "`f64`" +msgstr "" -#: src/android/interoperability/with-c/bindgen.md +#: src/android/aidl/types/arrays.md msgid "" -"Create a wrapper header file for the library (not strictly needed in this " -"example):" +"The array types (`T[]`, `byte[]`, and `List`) are translated to the " +"appropriate Rust array type depending on how they are used in the function " +"signature:" msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "_interoperability/bindgen/libbirthday_wrapper.h_:" -msgstr "_interoperability/bindgen/libbirthday_wrapper.h_:" +#: src/android/aidl/types/arrays.md +#, fuzzy +msgid "Position" +msgstr "Løsninger" -#: src/android/interoperability/with-c/bindgen.md -msgid "You can now auto-generate the bindings:" +#: src/android/aidl/types/arrays.md +msgid "`in` argument" msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "\"libbirthday_bindgen\"" -msgstr "\"libbirthday_bindgen\"" - -#: src/android/interoperability/with-c/bindgen.md -msgid "\"birthday_bindgen\"" -msgstr "\"birthday_bindgen\"" +#: src/android/aidl/types/arrays.md +#, fuzzy +msgid "`&[T]`" +msgstr "Arraysegmenter" -#: src/android/interoperability/with-c/bindgen.md -msgid "\"libbirthday_wrapper.h\"" -msgstr "\"libbirthday_wrapper.h\"" +#: src/android/aidl/types/arrays.md +msgid "`out`/`inout` argument" +msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "\"bindings\"" -msgstr "\"bindings\"" +#: src/android/aidl/types/arrays.md +#, fuzzy +msgid "`&mut Vec`" +msgstr "`Vec`" -#: src/android/interoperability/with-c/bindgen.md -msgid "Finally, we can use the bindings in our Rust program:" +#: src/android/aidl/types/arrays.md +msgid "Return" msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "\"print_birthday_card\"" -msgstr "\"print_birthday_card\"" - -#: src/android/interoperability/with-c/bindgen.md -msgid "\"main.rs\"" -msgstr "\"main.rs\"" +#: src/android/aidl/types/arrays.md +#: src/android/interoperability/cpp/type-mapping.md +#, fuzzy +msgid "`Vec`" +msgstr "`Vec`" -#: src/android/interoperability/with-c/bindgen.md -msgid "_interoperability/bindgen/main.rs_:" -msgstr "_interoperability/bindgen/main.rs_:" +#: src/android/aidl/types/arrays.md +msgid "" +"In Android 13 or higher, fixed-size arrays are supported, i.e. `T[N]` " +"becomes `[T; N]`. Fixed-size arrays can have multiple dimensions (e.g. " +"`int[3][4]`). In the Java backend, fixed-size arrays are represented as " +"array types." +msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "//! Bindgen demo.\n" -msgstr "//! Bindgen-demo.\n" +#: src/android/aidl/types/arrays.md +msgid "Arrays in parcelable fields always get translated to `Vec`." +msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "// SAFETY: `print_card` is safe to call with a valid `card` pointer.\n" +#: src/android/aidl/types/objects.md +msgid "" +"AIDL objects can be sent either as a concrete AIDL type or as the type-" +"erased `IBinder` interface:" msgstr "" -#: src/android/interoperability/with-c/bindgen.md +#: src/android/aidl/types/objects.md #, fuzzy msgid "" -"```shell\n" -"m print_birthday_card\n" -"adb push \"$ANDROID_PRODUCT_OUT/system/bin/print_birthday_card\" /data/local/" -"tmp\n" -"adb shell /data/local/tmp/print_birthday_card\n" -"```" +"_birthday_service/aidl/com/example/birthdayservice/" +"IBirthdayInfoProvider.aidl_:" msgstr "" -"```shell\n" -"m print_birthday_card\n" -"adb push \"$ANDROID_PRODUCT_OUT/system/bin/print_birthday_card /data/local/" -"tmp\"\n" -"adb shell /data/local/tmp/print_birthday_card\n" -"```" +"_birthday_service/aidl/com/example/birthdayservice/IBirthdayService.aidl_:" -#: src/android/interoperability/with-c/bindgen.md -msgid "Finally, we can run auto-generated tests to ensure the bindings work:" +#: src/android/aidl/types/objects.md +msgid "/** The same thing, but using a binder object. */" msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "\"libbirthday_bindgen_test\"" -msgstr "\"libbirthday_bindgen_test\"" - -#: src/android/interoperability/with-c/bindgen.md -msgid "\":libbirthday_bindgen\"" -msgstr "\":libbirthday_bindgen\"" - -#: src/android/interoperability/with-c/bindgen.md -msgid "\"general-tests\"" -msgstr "\"general-tests\"" - -#: src/android/interoperability/with-c/bindgen.md -msgid "\"none\"" -msgstr "\"none\"" +#: src/android/aidl/types/objects.md +msgid "/** The same thing, but using `IBinder`. */" +msgstr "" -#: src/android/interoperability/with-c/bindgen.md -msgid "// Generated file, skip linting\n" +#: src/android/aidl/types/objects.md +msgid "/// Rust struct implementing the `IBirthdayInfoProvider` interface.\n" msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "Calling Rust" +#: src/android/aidl/types/objects.md +msgid "// Create a binder object for the `IBirthdayInfoProvider` interface.\n" msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "Exporting Rust functions and types to C is easy:" +#: src/android/aidl/types/objects.md +msgid "// Send the binder object to the service.\n" msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "_interoperability/rust/libanalyze/analyze.rs_" -msgstr "_interoperability/rust/libanalyze/analyze.rs_" +#: src/android/aidl/types/objects.md +msgid "" +"// Perform the same operation but passing the provider as an `SpIBinder`.\n" +msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "//! Rust FFI demo.\n" -msgstr "//! Rust FFI-demo.\n" +#: src/android/aidl/types/objects.md +msgid "" +"Note the usage of `BnBirthdayInfoProvider`. This serves the same purpose as " +"`BnBirthdayService` that we saw previously." +msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "/// Analyze the numbers.\n" -msgstr "/// Analyze the numbers.\n" +#: src/android/aidl/types/parcelables.md +msgid "Binder for Rust supports sending parcelables directly:" +msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "\"x ({x}) is smallest!\"" -msgstr "\"x ({x}) er mindst!\"" +#: src/android/aidl/types/parcelables.md +#, fuzzy +msgid "_birthday_service/aidl/com/example/birthdayservice/BirthdayInfo.aidl_:" +msgstr "" +"_birthday_service/aidl/com/example/birthdayservice/IBirthdayService.aidl_:" -#: src/android/interoperability/with-c/rust.md -msgid "\"y ({y}) is probably larger than x ({x})\"" -msgstr "\"y ({y}) er muligvis større end x ({x})\"" +#: src/android/aidl/types/parcelables.md +msgid "/** The same thing, but with a parcelable. */" +msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "_interoperability/rust/libanalyze/analyze.h_" -msgstr "_interoperability/rust/libanalyze/analyze.h_" +#: src/android/aidl/types/file-descriptor.md +msgid "" +"Files can be sent between Binder clients/servers using the " +"`ParcelFileDescriptor` type:" +msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "_interoperability/rust/libanalyze/Android.bp_" -msgstr "_interoperability/rust/libanalyze/Android.bp_" +#: src/android/aidl/types/file-descriptor.md +msgid "/** The same thing, but loads info from a file. */" +msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "\"libanalyze_ffi\"" -msgstr "\"libanalyze_ffi\"" +#: src/android/aidl/types/file-descriptor.md +msgid "// Open a file and put the birthday info in it.\n" +msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "\"analyze_ffi\"" -msgstr "\"analyze_ffi\"" +#: src/android/aidl/types/file-descriptor.md +msgid "\"/data/local/tmp/birthday.info\"" +msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "\"analyze.rs\"" -msgstr "\"analyze.rs\"" +#: src/android/aidl/types/file-descriptor.md +#, fuzzy +msgid "\"{name}\"" +msgstr "\"nyt areal: {}\"" -#: src/android/interoperability/with-c/rust.md -msgid "We can now call this from a C binary:" +#: src/android/aidl/types/file-descriptor.md +msgid "\"{years}\"" msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "_interoperability/rust/analyze/main.c_" -msgstr "_interoperability/rust/analyze/main.c_" - -#: src/android/interoperability/with-c/rust.md -msgid "\"analyze.h\"" -msgstr "\"analyze.h\"" +#: src/android/aidl/types/file-descriptor.md +msgid "// Create a `ParcelFileDescriptor` from the file and send it.\n" +msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "_interoperability/rust/analyze/Android.bp_" -msgstr "_interoperability/rust/analyze/Android.bp_" +#: src/android/aidl/types/file-descriptor.md +msgid "" +"// Convert the file descriptor to a `File`. `ParcelFileDescriptor` wraps\n" +" // an `OwnedFd`, which can be cloned and then used to create a " +"`File`\n" +" // object.\n" +msgstr "" -#: src/android/interoperability/with-c/rust.md -msgid "\"analyze_numbers\"" +#: src/android/aidl/types/file-descriptor.md +#, fuzzy +msgid "\"Invalid file handle\"" msgstr "\"analyze_numbers\"" -#: src/android/interoperability/with-c/rust.md -msgid "\"main.c\"" -msgstr "\"main.c\"" - -#: src/android/interoperability/with-c/rust.md -#, fuzzy +#: src/android/aidl/types/file-descriptor.md msgid "" -"```shell\n" -"m analyze_numbers\n" -"adb push \"$ANDROID_PRODUCT_OUT/system/bin/analyze_numbers\" /data/local/" -"tmp\n" -"adb shell /data/local/tmp/analyze_numbers\n" -"```" +"`ParcelFileDescriptor` wraps an `OwnedFd`, and so can be created from a " +"`File` (or any other type that wraps an `OwnedFd`), and can be used to " +"create a new `File` handle on the other side." msgstr "" -"```shell\n" -"m analyze_numbers\n" -"adb push \"$ANDROID_PRODUCT_OUT/system/bin/analyze_numbers /data/local/" -"tmp\"\n" -"adb shell /data/local/tmp/analyze_numbers\n" -"```" -#: src/android/interoperability/with-c/rust.md +#: src/android/aidl/types/file-descriptor.md msgid "" -"`#[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." +"Other types of file descriptors can be wrapped and sent, e.g. TCP, UDP, and " +"UNIX sockets." msgstr "" -#: src/android/interoperability/cpp.md +#: src/android/testing.md +#, fuzzy +msgid "Testing in Android" +msgstr "Rust i Android" + +#: src/android/testing.md msgid "" -"The [CXX crate](https://cxx.rs/) makes it possible to do safe " -"interoperability between Rust and C++." +"Building on [Testing](../testing.md), we will now look at how unit tests " +"work in AOSP. Use the `rust_test` module for your unit tests:" msgstr "" -#: src/android/interoperability/cpp.md -msgid "The overall approach looks like this:" -msgstr "" +#: src/android/testing.md +#, fuzzy +msgid "_testing/Android.bp_:" +msgstr "_hello_rust/Android.bp_:" -#: src/android/interoperability/cpp/bridge.md -msgid "" -"CXX relies on a description of the function signatures that will be exposed " -"from each language to the other. You provide this description using extern " -"blocks in a Rust module annotated with the `#[cxx::bridge]` attribute macro." -msgstr "" +#: src/android/testing.md +#, fuzzy +msgid "\"libleftpad\"" +msgstr "\"libtextwrap\"" -#: src/android/interoperability/cpp/bridge.md -msgid "\"org::blobstore\"" +#: src/android/testing.md +msgid "\"leftpad\"" msgstr "" -#: src/android/interoperability/cpp/bridge.md -msgid "// Shared structs with fields visible to both languages.\n" -msgstr "" +#: src/android/testing.md +#, fuzzy +msgid "\"libleftpad_test\"" +msgstr "\"libbirthday_bindgen_test\"" -#: src/android/interoperability/cpp/bridge.md -#: src/android/interoperability/cpp/generated-cpp.md -msgid "// Rust types and signatures exposed to C++.\n" +#: src/android/testing.md +msgid "\"leftpad_test\"" msgstr "" -#: src/android/interoperability/cpp/bridge.md -#: src/android/interoperability/cpp/rust-bridge.md -#: src/android/interoperability/cpp/generated-cpp.md -#: src/android/interoperability/cpp/rust-result.md -#: src/chromium/interoperability-with-cpp/example-bindings.md -#: src/chromium/interoperability-with-cpp/error-handling-qr.md -#: src/chromium/interoperability-with-cpp/error-handling-png.md -#, fuzzy -msgid "\"Rust\"" -msgstr "\"rust\"" +#: src/android/testing.md src/android/interoperability/with-c/run-our-binary.md +msgid "\"general-tests\"" +msgstr "\"general-tests\"" -#: src/android/interoperability/cpp/bridge.md -#: src/android/interoperability/cpp/cpp-bridge.md -msgid "// C++ types and signatures exposed to Rust.\n" +#: src/android/testing.md +msgid "\"libgoogletest_example\"" msgstr "" -#: src/android/interoperability/cpp/bridge.md -#: src/android/interoperability/cpp/cpp-bridge.md -#: src/android/interoperability/cpp/cpp-exception.md -#: src/chromium/interoperability-with-cpp/example-bindings.md -msgid "\"C++\"" +#: src/android/testing.md +msgid "\"googletest_example\"" msgstr "" -#: src/android/interoperability/cpp/bridge.md -#: src/android/interoperability/cpp/cpp-bridge.md -msgid "\"include/blobstore.h\"" -msgstr "" +#: src/android/testing.md +#, fuzzy +msgid "\"googletest.rs\"" +msgstr "\"general-tests\"" -#: src/android/interoperability/cpp/bridge.md -msgid "The bridge is generally declared in an `ffi` module within your crate." -msgstr "" +#: src/android/testing.md +#, fuzzy +msgid "\"libgoogletest_rust\"" +msgstr "\"liblog_rust\"" -#: src/android/interoperability/cpp/bridge.md -msgid "" -"From the declarations made in the bridge module, CXX will generate matching " -"Rust and C++ type/function definitions in order to expose those items to " -"both languages." +#: src/android/testing.md +msgid "\"libmockall_example\"" msgstr "" -#: src/android/interoperability/cpp/bridge.md -msgid "" -"To view the generated Rust code, use [cargo-expand](https://github.com/" -"dtolnay/cargo-expand) to view the expanded proc macro. For most of the " -"examples you would use `cargo expand ::ffi` to expand just the `ffi` module " -"(though this doesn't apply for Android projects)." +#: src/android/testing.md +msgid "\"mockall_example\"" msgstr "" -#: src/android/interoperability/cpp/bridge.md -msgid "To view the generated C++ code, look in `target/cxxbridge`." -msgstr "" +#: src/android/testing.md +#, fuzzy +msgid "\"mockall.rs\"" +msgstr "\"crab.rs\"" -#: src/android/interoperability/cpp/rust-bridge.md -msgid "Rust Bridge Declarations" -msgstr "" +#: src/android/testing.md +#, fuzzy +msgid "\"libmockall\"" +msgstr "\"libjni\"" -#: src/android/interoperability/cpp/rust-bridge.md -msgid "// Opaque type\n" +#: src/android/testing.md +#, fuzzy +msgid "_testing/src/lib.rs_:" +msgstr "_hello_rust/src/lib.rs_:" + +#: src/android/testing.md +msgid "//! Left-padding library.\n" msgstr "" -#: src/android/interoperability/cpp/rust-bridge.md -msgid "// Method on `MyType`\n" +#: src/android/testing.md +msgid "/// Left-pad `s` to `width`.\n" msgstr "" -#: src/android/interoperability/cpp/rust-bridge.md +#: src/android/testing.md #, fuzzy -msgid "// Free function\n" -msgstr "Funktioner" +msgid "\"{s:>width$}\"" +msgstr "\"|{:^width$}|\"" -#: src/android/interoperability/cpp/rust-bridge.md -msgid "" -"Items declared in the `extern \"Rust\"` reference items that are in scope in " -"the parent module." +#: src/android/testing.md +#, fuzzy +msgid "\" foo\"" +msgstr "\"foo\"" + +#: src/android/testing.md +#, fuzzy +msgid "\"foobar\"" +msgstr "\"foo\"" + +#: src/android/testing.md +msgid "You can now run the test with" msgstr "" -#: src/android/interoperability/cpp/rust-bridge.md -msgid "" -"The CXX code generator uses your `extern \"Rust\"` section(s) to produce a C+" -"+ header file containing the corresponding C++ declarations. The generated " -"header has the same path as the Rust source file containing the bridge, " -"except with a .rs.h file extension." +#: src/android/testing.md +msgid "The output looks like this:" msgstr "" -#: src/android/interoperability/cpp/generated-cpp.md -msgid "Results in (roughly) the following C++:" +#: src/android/testing.md +msgid "" +"```text\n" +"INFO: Elapsed time: 2.666s, Critical Path: 2.40s\n" +"INFO: 3 processes: 2 internal, 1 linux-sandbox.\n" +"INFO: Build completed successfully, 3 total actions\n" +"//comprehensive-rust-android/testing:libleftpad_test_host PASSED " +"in 2.3s\n" +" PASSED libleftpad_test.tests::long_string (0.0s)\n" +" PASSED libleftpad_test.tests::short_string (0.0s)\n" +"Test cases: finished with 2 passing and 0 failing out of 2 test cases\n" +"```" msgstr "" -#: src/android/interoperability/cpp/cpp-bridge.md -msgid "C++ Bridge Declarations" +#: src/android/testing.md +msgid "" +"Notice how you only mention the root of the library crate. Tests are found " +"recursively in nested modules." msgstr "" -#: src/android/interoperability/cpp/cpp-bridge.md -msgid "Results in (roughly) the following Rust:" +#: src/android/testing/googletest.md +msgid "" +"The [GoogleTest](https://docs.rs/googletest/) crate allows for flexible test " +"assertions using _matchers_:" msgstr "" -#: src/android/interoperability/cpp/cpp-bridge.md -msgid "\"org$blobstore$cxxbridge1$new_blobstore_client\"" +#: src/android/testing/googletest.md +msgid "\"bar\"" +msgstr "\"bar\"" + +#: src/android/testing/googletest.md +msgid "\"baz\"" msgstr "" -#: src/android/interoperability/cpp/cpp-bridge.md -msgid "\"org$blobstore$cxxbridge1$BlobstoreClient$put\"" +#: src/android/testing/googletest.md +msgid "\"xyz\"" msgstr "" -#: src/android/interoperability/cpp/cpp-bridge.md +#: src/android/testing/googletest.md msgid "" -"The programmer does not need to promise that the signatures they have typed " -"in are accurate. CXX performs static assertions that the signatures exactly " -"correspond with what is declared in C++." +"If we change the last element to `\"!\"`, the test fails with a structured " +"error message pin-pointing the error:" msgstr "" -#: src/android/interoperability/cpp/cpp-bridge.md +#: src/android/testing/googletest.md msgid "" -"`unsafe extern` blocks allow you to declare C++ functions that are safe to " -"call from Rust." +"GoogleTest is not part of the Rust Playground, so you need to run this " +"example in a local environment. Use `cargo add googletest` to quickly add it " +"to an existing Cargo project." msgstr "" -#: src/android/interoperability/cpp/shared-types.md -msgid "// A=1, J=11, Q=12, K=13\n" +#: src/android/testing/googletest.md +msgid "" +"The `use googletest::prelude::*;` line imports a number of [commonly used " +"macros and types](https://docs.rs/googletest/latest/googletest/prelude/" +"index.html)." msgstr "" -#: src/android/interoperability/cpp/shared-types.md -msgid "Only C-like (unit) enums are supported." +#: src/android/testing/googletest.md +msgid "" +"This just scratches the surface, there are many builtin matchers. Consider " +"going through the first chapter of [\"Advanced testing for Rust " +"applications\"](https://rust-exercises.com/advanced-testing/), a self-guided " +"Rust course: it provides a guided introduction to the library, with " +"exercises to help you get comfortable with `googletest` macros, its matchers " +"and its overall philosophy." msgstr "" -#: src/android/interoperability/cpp/shared-types.md +#: src/android/testing/googletest.md msgid "" -"A limited number of traits are supported for `#[derive()]` on shared types. " -"Corresponding functionality is also generated for the C++ code, e.g. if you " -"derive `Hash` also generates an implementation of `std::hash` for the " -"corresponding C++ type." +"A particularly nice feature is that mismatches in multi-line strings are " +"shown as a diff:" msgstr "" -#: src/android/interoperability/cpp/shared-enums.md -#, fuzzy -msgid "Generated Rust:" -msgstr "\"general-tests\"" - -#: src/android/interoperability/cpp/shared-enums.md -msgid "Generated C++:" +#: src/android/testing/googletest.md +msgid "" +"\"Memory safety found,\\n\\\n" +" Rust's strong typing guides the way,\\n\\\n" +" Secure code you'll write.\"" msgstr "" -#: src/android/interoperability/cpp/shared-enums.md +#: src/android/testing/googletest.md msgid "" -"On the Rust side, the code generated for shared enums is actually a struct " -"wrapping a numeric value. This is because it is not UB in C++ for an enum " -"class to hold a value different from all of the listed variants, and our " -"Rust representation needs to have the same behavior." +"\"Memory safety found,\\n\\\n" +" Rust's silly humor guides the way,\\n\\\n" +" Secure code you'll write.\"" msgstr "" -#: src/android/interoperability/cpp/rust-result.md -msgid "\"fallible1 requires depth > 0\"" +#: src/android/testing/googletest.md +msgid "shows a color-coded diff (colors not shown here):" msgstr "" -#: src/android/interoperability/cpp/rust-result.md -msgid "\"Success!\"" +#: src/android/testing/googletest.md +msgid "" +"The crate is a Rust port of [GoogleTest for C++](https://google.github.io/" +"googletest/)." msgstr "" -#: src/android/interoperability/cpp/rust-result.md +#: src/android/testing/mocking.md msgid "" -"Rust functions that return `Result` are translated to exceptions on the C++ " -"side." +"For mocking, [Mockall](https://docs.rs/mockall/) is a widely used library. " +"You need to refactor your code to use traits, which you can then quickly " +"mock:" msgstr "" -#: src/android/interoperability/cpp/rust-result.md +#: src/android/testing/mocking.md msgid "" -"The exception thrown will always be of type `rust::Error`, which primarily " -"exposes a way to get the error message string. The error message will come " -"from the error type's `Display` impl." +"Mockall is the recommended mocking library in Android (AOSP). There are " +"other [mocking libraries available on crates.io](https://crates.io/keywords/" +"mock), in particular in the area of mocking HTTP services. The other mocking " +"libraries work in a similar fashion as Mockall, meaning that they make it " +"easy to get a mock implementation of a given trait." msgstr "" -#: src/android/interoperability/cpp/rust-result.md +#: src/android/testing/mocking.md msgid "" -"A panic unwinding from Rust to C++ will always cause the process to " -"immediately terminate." +"Note that mocking is somewhat _controversial_: mocks allow you to completely " +"isolate a test from its dependencies. The immediate result is faster and " +"more stable test execution. On the other hand, the mocks can be configured " +"wrongly and return output different from what the real dependencies would do." msgstr "" -#: src/android/interoperability/cpp/cpp-exception.md -msgid "\"example/include/example.h\"" +#: src/android/testing/mocking.md +msgid "" +"If at all possible, it is recommended that you use the real dependencies. As " +"an example, many databases allow you to configure an in-memory backend. This " +"means that you get the correct behavior in your tests, plus they are fast " +"and will automatically clean up after themselves." msgstr "" -#: src/android/interoperability/cpp/cpp-exception.md -#, fuzzy -msgid "\"Error: {}\"" -msgstr "\"Fejl: {err}\"" +#: src/android/testing/mocking.md +msgid "" +"Similarly, many web frameworks allow you to start an in-process server which " +"binds to a random port on `localhost`. Always prefer this over mocking away " +"the framework since it helps you test your code in the real environment." +msgstr "" -#: src/android/interoperability/cpp/cpp-exception.md +#: src/android/testing/mocking.md msgid "" -"C++ functions declared to return a `Result` will catch any thrown exception " -"on the C++ side and return it as an `Err` value to the calling Rust function." +"Mockall is not part of the Rust Playground, so you need to run this example " +"in a local environment. Use `cargo add mockall` to quickly add Mockall to an " +"existing Cargo project." msgstr "" -#: src/android/interoperability/cpp/cpp-exception.md +#: src/android/testing/mocking.md msgid "" -"If an exception is thrown from an extern \"C++\" function that is not " -"declared by the CXX bridge to return `Result`, the program calls C++'s `std::" -"terminate`. The behavior is equivalent to the same exception being thrown " -"through a `noexcept` C++ function." +"Mockall has a lot more functionality. In particular, you can set up " +"expectations which depend on the arguments passed. Here we use this to mock " +"a cat which becomes hungry 3 hours after the last time it was fed:" msgstr "" -#: src/android/interoperability/cpp/type-mapping.md -#, fuzzy -msgid "Rust Type" -msgstr "Rust by Example" +#: src/android/testing/mocking.md +msgid "" +"You can use `.times(n)` to limit the number of times a mock method can be " +"called to `n` --- the mock will automatically panic when dropped if this " +"isn't satisfied." +msgstr "" -#: src/android/interoperability/cpp/type-mapping.md -msgid "C++ Type" +#: src/android/logging.md +msgid "" +"You should use the `log` crate to automatically log to `logcat` (on-device) " +"or `stdout` (on-host):" msgstr "" -#: src/android/interoperability/cpp/type-mapping.md -#, fuzzy -msgid "`rust::String`" -msgstr "`rust_bindgen`" +#: src/android/logging.md +msgid "_hello_rust_logs/Android.bp_:" +msgstr "_hello_rust_logs/Android.bp_:" -#: src/android/interoperability/cpp/type-mapping.md -msgid "`&str`" -msgstr "" +#: src/android/logging.md +msgid "\"hello_rust_logs\"" +msgstr "\"hello_rust_logs\"" -#: src/android/interoperability/cpp/type-mapping.md -#, fuzzy -msgid "`rust::Str`" -msgstr "`rust_test`" +#: src/android/logging.md +msgid "\"liblog_rust\"" +msgstr "\"liblog_rust\"" -#: src/android/interoperability/cpp/type-mapping.md -msgid "`CxxString`" -msgstr "" +#: src/android/logging.md +msgid "\"liblogger\"" +msgstr "\"liblogger\"" -#: src/android/interoperability/cpp/type-mapping.md -msgid "`std::string`" +#: src/android/logging.md +msgid "_hello_rust_logs/src/main.rs_:" +msgstr "_hello_rust_logs/src/main.rs_:" + +#: src/android/logging.md +msgid "//! Rust logging demo.\n" msgstr "" -#: src/android/interoperability/cpp/type-mapping.md -msgid "`&[T]`/`&mut [T]`" +#: src/android/logging.md +msgid "/// Logs a greeting.\n" msgstr "" -#: src/android/interoperability/cpp/type-mapping.md -#, fuzzy -msgid "`rust::Slice`" -msgstr "`rust_ffi`" +#: src/android/logging.md +msgid "\"rust\"" +msgstr "\"rust\"" -#: src/android/interoperability/cpp/type-mapping.md -msgid "`rust::Box`" +#: src/android/logging.md +msgid "\"Starting program.\"" msgstr "" -#: src/android/interoperability/cpp/type-mapping.md -msgid "`UniquePtr`" +#: src/android/logging.md +msgid "\"Things are going fine.\"" msgstr "" -#: src/android/interoperability/cpp/type-mapping.md -msgid "`std::unique_ptr`" +#: src/android/logging.md +msgid "\"Something went wrong!\"" msgstr "" -#: src/android/interoperability/cpp/type-mapping.md -#, fuzzy -msgid "`Vec`" -msgstr "`Vec`" - -#: src/android/interoperability/cpp/type-mapping.md -#, fuzzy -msgid "`rust::Vec`" -msgstr "`mpsc::Receiver`" - -#: src/android/interoperability/cpp/type-mapping.md -#, fuzzy -msgid "`CxxVector`" -msgstr "`Cell`" +#: src/android/logging.md src/android/interoperability/with-c/run-our-binary.md +#: src/android/interoperability/with-c/rust.md +msgid "Build, push, and run the binary on your device:" +msgstr "" -#: src/android/interoperability/cpp/type-mapping.md +#: src/android/logging.md #, fuzzy -msgid "`std::vector`" -msgstr "`mpsc::Receiver`" - -#: src/android/interoperability/cpp/type-mapping.md msgid "" -"These types can be used in the fields of shared structs and the arguments " -"and returns of extern functions." +"```shell\n" +"m hello_rust_logs\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 "" +"```shell\n" +"m hello_rust_logs\n" +"adb push \"$ANDROID_PRODUCT_OUT/system/bin/hello_rust_logs /data/local/" +"tmp\"\n" +"adb shell /data/local/tmp/hello_rust_logs\n" +"```" -#: src/android/interoperability/cpp/type-mapping.md -msgid "" -"Note that Rust's `String` does not map directly to `std::string`. There are " -"a few reasons for this:" +#: src/android/logging.md +msgid "The logs show up in `adb logcat`:" msgstr "" -#: src/android/interoperability/cpp/type-mapping.md +#: src/android/logging.md msgid "" -"`std::string` does not uphold the UTF-8 invariant that `String` requires." +"The logger implementation in `liblogger` is only needed in the final binary, " +"if you're logging from a library you only need the `log` facade crate." msgstr "" -#: src/android/interoperability/cpp/type-mapping.md +#: src/android/interoperability.md msgid "" -"The two types have different layouts in memory and so can't be passed " -"directly between languages." +"Rust has excellent support for interoperability with other languages. This " +"means that you can:" msgstr "" -#: src/android/interoperability/cpp/type-mapping.md -msgid "" -"`std::string` requires move constructors that don't match Rust's move " -"semantics, so a `std::string` can't be passed by value to Rust." +#: src/android/interoperability.md +msgid "Call Rust functions from other languages." msgstr "" -#: src/android/interoperability/cpp/android-build-cpp.md -#: src/android/interoperability/cpp/android-cpp-genrules.md -#: src/android/interoperability/cpp/android-build-rust.md -#, fuzzy -msgid "Building in Android" -msgstr "Rust i Android" +#: src/android/interoperability.md +msgid "Call functions written in other languages from Rust." +msgstr "" -#: src/android/interoperability/cpp/android-build-cpp.md +#: src/android/interoperability.md msgid "" -"Create a `cc_library_static` to build the C++ library, including the CXX " -"generated header and source file." +"When you call functions in a foreign language, you're using a _foreign " +"function interface_, also known as FFI." msgstr "" -#: src/android/interoperability/cpp/android-build-cpp.md -#: src/android/interoperability/cpp/android-build-rust.md -#, fuzzy -msgid "\"libcxx_test_cpp\"" -msgstr "\"libtextwrap\"" - -#: src/android/interoperability/cpp/android-build-cpp.md -msgid "\"cxx_test.cpp\"" +#: src/android/interoperability.md +msgid "" +"This is a key ability of Rust: compiled code becomes indistinguishable from " +"compiled C or C++ code." msgstr "" -#: src/android/interoperability/cpp/android-build-cpp.md -msgid "\"cxx-bridge-header\"" +#: src/android/interoperability.md +msgid "" +"Technically, we say that Rust can be compiled to the same [ABI](https://" +"en.wikipedia.org/wiki/Application_binary_interface) (application binary " +"interface) as C code." msgstr "" -#: src/android/interoperability/cpp/android-build-cpp.md -#: src/android/interoperability/cpp/android-cpp-genrules.md -msgid "\"libcxx_test_bridge_header\"" +#: src/android/interoperability/with-c.md +msgid "Interoperability with C" msgstr "" -#: src/android/interoperability/cpp/android-build-cpp.md -#: src/android/interoperability/cpp/android-cpp-genrules.md -msgid "\"libcxx_test_bridge_code\"" +#: src/android/interoperability/with-c.md +msgid "" +"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 "" -#: src/android/interoperability/cpp/android-build-cpp.md -msgid "" -"Point out that `libcxx_test_bridge_header` and `libcxx_test_bridge_code` are " -"the dependencies for the CXX-generated C++ bindings. We'll show how these " -"are setup on the next slide." +#: src/android/interoperability/with-c.md +msgid "You can do it by hand if you want:" msgstr "" -#: src/android/interoperability/cpp/android-build-cpp.md +#: src/android/interoperability/with-c.md +msgid "\"{x}, {abs_x}\"" +msgstr "\"{x}, {abs_x}\"" + +#: src/android/interoperability/with-c.md msgid "" -"Note that you also need to depend on the `cxx-bridge-header` library in " -"order to pull in common CXX definitions." +"We already saw this in the [Safe FFI Wrapper exercise](../../unsafe-rust/" +"exercise.md)." msgstr "" -#: src/android/interoperability/cpp/android-build-cpp.md +#: src/android/interoperability/with-c.md msgid "" -"Full docs for using CXX in Android can be found in [the Android docs]" -"(https://source.android.com/docs/setup/build/rust/building-rust-modules/" -"android-rust-patterns#rust-cpp-interop-using-cxx). You may want to share " -"that link with the class so that students know where they can find these " -"instructions again in the future." +"This assumes full knowledge of the target platform. Not recommended for " +"production." msgstr "" -#: src/android/interoperability/cpp/android-cpp-genrules.md -msgid "" -"Create two genrules: One to generate the CXX header, and one to generate the " -"CXX source file. These are then used as inputs to the `cc_library_static`." +#: src/android/interoperability/with-c.md +msgid "We will look at better options next." msgstr "" -#: src/android/interoperability/cpp/android-cpp-genrules.md +#: src/android/interoperability/with-c.md msgid "" -"// Generate a C++ header containing the C++ bindings\n" -"// to the Rust exported functions in lib.rs.\n" +"The [`\"C\"` part](https://doc.rust-lang.org/reference/items/external-" +"blocks.html#abi) of the `extern` block tells Rust that `abs` can be called " +"using the C [ABI](https://en.wikipedia.org/wiki/" +"Application_binary_interface) (application binary interface)." msgstr "" -#: src/android/interoperability/cpp/android-cpp-genrules.md -msgid "\"cxxbridge\"" +#: src/android/interoperability/with-c.md +msgid "" +"The `safe fn abs` part tells Rust that `abs` is a safe function. By default, " +"extern functions are unsafe, but since `abs(x)` can't trigger undefined " +"behavior with any `x`, we can declare it safe." msgstr "" -#: src/android/interoperability/cpp/android-cpp-genrules.md -msgid "\"$(location cxxbridge) $(in) --header > $(out)\"" +#: src/android/interoperability/with-c/c-library.md +msgid "Let's first create a small C library:" msgstr "" -#: src/android/interoperability/cpp/android-cpp-genrules.md -#: src/android/interoperability/cpp/android-build-rust.md -#, fuzzy -msgid "\"lib.rs\"" -msgstr "\"src/lib.rs\"" +#: src/android/interoperability/with-c/c-library.md +msgid "_interoperability/bindgen/libbirthday.h_:" +msgstr "_interoperability/bindgen/libbirthday.h_:" -#: src/android/interoperability/cpp/android-cpp-genrules.md -#, fuzzy -msgid "\"lib.rs.h\"" -msgstr "\"src/lib.rs\"" +#: src/android/interoperability/with-c/c-library.md +msgid "_interoperability/bindgen/libbirthday.c_:" +msgstr "_interoperability/bindgen/libbirthday.c_:" -#: src/android/interoperability/cpp/android-cpp-genrules.md -msgid "// Generate the C++ code that Rust calls into.\n" -msgstr "" +#: src/android/interoperability/with-c/c-library.md +msgid "" +msgstr "" -#: src/android/interoperability/cpp/android-cpp-genrules.md -msgid "\"$(location cxxbridge) $(in) > $(out)\"" -msgstr "" +#: src/android/interoperability/with-c/c-library.md +#: src/android/interoperability/with-c/bindgen.md +msgid "\"libbirthday.h\"" +msgstr "\"libbirthday.h\"" -#: src/android/interoperability/cpp/android-cpp-genrules.md -#, fuzzy -msgid "\"lib.rs.cc\"" -msgstr "\"src/lib.rs\"" +#: src/android/interoperability/with-c/c-library.md +msgid "\"+--------------\\n\"" +msgstr "\"+--------------\\n\"" -#: src/android/interoperability/cpp/android-cpp-genrules.md -msgid "" -"The `cxxbridge` tool is a standalone tool that generates the C++ side of the " -"bridge module. It is included in Android and available as a Soong tool." +#: src/android/interoperability/with-c/c-library.md +msgid "\"| Happy Birthday %s!\\n\"" msgstr "" -#: src/android/interoperability/cpp/android-cpp-genrules.md -msgid "" -"By convention, if your Rust source file is `lib.rs` your header file will be " -"named `lib.rs.h` and your source file will be named `lib.rs.cc`. This naming " -"convention isn't enforced, though." +#: src/android/interoperability/with-c/c-library.md +msgid "\"| Congratulations with the %i years!\\n\"" msgstr "" -#: src/android/interoperability/cpp/android-build-rust.md -msgid "" -"Create a `rust_binary` that depends on `libcxx` and your `cc_library_static`." +#: src/android/interoperability/with-c/c-library.md +msgid "Add this to your `Android.bp` file:" msgstr "" -#: src/android/interoperability/cpp/android-build-rust.md -msgid "\"cxx_test\"" -msgstr "" +#: src/android/interoperability/with-c/c-library.md +#: src/android/interoperability/with-c/bindgen.md +#: src/android/interoperability/with-c/run-our-binary.md +msgid "_interoperability/bindgen/Android.bp_:" +msgstr "_interoperability/bindgen/Android.bp_:" -#: src/android/interoperability/cpp/android-build-rust.md -#, fuzzy -msgid "\"libcxx\"" -msgstr "\"libjni\"" +#: src/android/interoperability/with-c/c-library.md +#: src/android/interoperability/with-c/bindgen.md +msgid "\"libbirthday\"" +msgstr "\"libbirthday\"" -#: src/android/interoperability/java.md -msgid "Interoperability with Java" +#: src/android/interoperability/with-c/c-library.md +msgid "\"libbirthday.c\"" +msgstr "\"libbirthday.c\"" + +#: src/android/interoperability/with-c/bindgen.md +msgid "Using Bindgen" msgstr "" -#: src/android/interoperability/java.md +#: src/android/interoperability/with-c/bindgen.md msgid "" -"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." +"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/java.md -msgid "First, we create a Rust function to export to Java:" +#: src/android/interoperability/with-c/bindgen.md +msgid "" +"Create a wrapper header file for the library (not strictly needed in this " +"example):" msgstr "" -#: src/android/interoperability/java.md -msgid "_interoperability/java/src/lib.rs_:" -msgstr "" +#: src/android/interoperability/with-c/bindgen.md +msgid "_interoperability/bindgen/libbirthday_wrapper.h_:" +msgstr "_interoperability/bindgen/libbirthday_wrapper.h_:" -#: src/android/interoperability/java.md -msgid "//! Rust <-> Java FFI demo.\n" -msgstr "" +#: src/android/interoperability/with-c/bindgen.md +msgid "\"libbirthday_bindgen\"" +msgstr "\"libbirthday_bindgen\"" -#: src/android/interoperability/java.md -msgid "/// HelloWorld::hello method implementation.\n" -msgstr "" +#: src/android/interoperability/with-c/bindgen.md +msgid "\"birthday_bindgen\"" +msgstr "\"birthday_bindgen\"" -#: src/android/interoperability/java.md -msgid "\"system\"" -msgstr "\"system\"" +#: src/android/interoperability/with-c/bindgen.md +msgid "\"libbirthday_wrapper.h\"" +msgstr "\"libbirthday_wrapper.h\"" -#: src/android/interoperability/java.md -msgid "\"Hello, {input}!\"" +#: src/android/interoperability/with-c/bindgen.md +msgid "\"bindings\"" +msgstr "\"bindings\"" + +#: src/android/interoperability/with-c/bindgen.md +msgid "Finally, we can use the bindings in our Rust program:" msgstr "" -#: src/android/interoperability/java.md -msgid "_interoperability/java/Android.bp_:" -msgstr "_interoperability/java/Android.bp_:" +#: src/android/interoperability/with-c/bindgen.md +msgid "\"print_birthday_card\"" +msgstr "\"print_birthday_card\"" -#: src/android/interoperability/java.md -msgid "\"libhello_jni\"" -msgstr "\"libhello_jni\"" +#: src/android/interoperability/with-c/bindgen.md +msgid "\"main.rs\"" +msgstr "\"main.rs\"" -#: src/android/interoperability/java.md -msgid "\"hello_jni\"" -msgstr "\"hello_jni\"" +#: src/android/interoperability/with-c/bindgen.md +msgid "_interoperability/bindgen/main.rs_:" +msgstr "_interoperability/bindgen/main.rs_:" -#: src/android/interoperability/java.md -msgid "\"libjni\"" -msgstr "\"libjni\"" +#: src/android/interoperability/with-c/bindgen.md +msgid "//! Bindgen demo.\n" +msgstr "//! Bindgen-demo.\n" -#: src/android/interoperability/java.md -msgid "We then call this function from Java:" +#: src/android/interoperability/with-c/bindgen.md +msgid "" +"// SAFETY: The pointer we pass is valid because it came from a Rust\n" +" // reference, and the `name` it contains refers to `name` above which " +"also\n" +" // remains valid. `print_card` doesn't store either pointer to use " +"later\n" +" // after it returns.\n" msgstr "" -#: src/android/interoperability/java.md -msgid "_interoperability/java/HelloWorld.java_:" +#: src/android/interoperability/with-c/bindgen.md +msgid "" +"The Android build rules will automatically call `bindgen` for you behind the " +"scenes." msgstr "" -#: src/android/interoperability/java.md -msgid "\"helloworld_jni\"" -msgstr "\"helloworld_jni\"" - -#: src/android/interoperability/java.md -msgid "\"HelloWorld.java\"" -msgstr "\"HelloWorld.java\"" - -#: src/android/interoperability/java.md -msgid "\"HelloWorld\"" -msgstr "\"HelloWorld\"" - -#: src/android/interoperability/java.md -msgid "Finally, you can build, sync, and run the binary:" +#: src/android/interoperability/with-c/bindgen.md +msgid "" +"Notice that the Rust code in `main` is still hard to write. It is good " +"practice to encapsulate the output of `bindgen` in a Rust library which " +"exposes a safe interface to caller." msgstr "" -#: src/exercises/android/morning.md +#: src/android/interoperability/with-c/run-our-binary.md +#, fuzzy msgid "" -"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:" +"```shell\n" +"m print_birthday_card\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 "" +"```shell\n" +"m print_birthday_card\n" +"adb push \"$ANDROID_PRODUCT_OUT/system/bin/print_birthday_card /data/local/" +"tmp\"\n" +"adb shell /data/local/tmp/print_birthday_card\n" +"```" -#: src/exercises/android/morning.md -msgid "Call your AIDL service with a client written in Rust." +#: src/android/interoperability/with-c/run-our-binary.md +msgid "Finally, we can run auto-generated tests to ensure the bindings work:" msgstr "" -#: src/exercises/android/morning.md -msgid "Move a function from your project to Rust and call it." -msgstr "" +#: src/android/interoperability/with-c/run-our-binary.md +msgid "\"libbirthday_bindgen_test\"" +msgstr "\"libbirthday_bindgen_test\"" -#: src/exercises/android/morning.md -msgid "" -"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/android/interoperability/with-c/run-our-binary.md +msgid "\":libbirthday_bindgen\"" +msgstr "\":libbirthday_bindgen\"" -#: src/chromium.md -#, fuzzy -msgid "Welcome to Rust in Chromium" -msgstr "\"Velkommen til RustOS 3.14\"" +#: src/android/interoperability/with-c/run-our-binary.md +msgid "\"none\"" +msgstr "\"none\"" -#: src/chromium.md -msgid "" -"Rust is supported for third-party libraries in Chromium, with first-party " -"glue code to connect between Rust and existing Chromium C++ code." +#: src/android/interoperability/with-c/run-our-binary.md +msgid "// Generated file, skip linting\n" msgstr "" -#: src/chromium.md +#: src/android/interoperability/with-c/rust-library.md msgid "" -"Today, we'll call into Rust to do something silly with strings. If you've " -"got a corner of the code where you're displaying a UTF8 string to the user, " -"feel free to follow this recipe in your part of the codebase instead of the " -"exact part we talk about." +"Exporting Rust functions and types to C is easy. Here's a simple Rust " +"library:" msgstr "" -#: src/chromium/setup.md -msgid "" -"Make sure you can build and run Chromium. Any platform and set of build " -"flags is OK, so long as your code is relatively recent (commit position " -"1223636 onwards, corresponding to November 2023):" -msgstr "" +#: src/android/interoperability/with-c/rust-library.md +msgid "_interoperability/rust/libanalyze/analyze.rs_" +msgstr "_interoperability/rust/libanalyze/analyze.rs_" -#: src/chromium/setup.md -msgid "" -"(A component, debug build is recommended for quickest iteration time. This " -"is the default!)" -msgstr "" +#: src/android/interoperability/with-c/rust-library.md +msgid "//! Rust FFI demo.\n" +msgstr "//! Rust FFI-demo.\n" -#: src/chromium/setup.md +#: src/android/interoperability/with-c/rust-library.md msgid "" -"See [How to build Chromium](https://www.chromium.org/developers/how-tos/get-" -"the-code/) if you aren't already at that point. Be warned: setting up to " -"build Chromium takes time." +"/// Analyze the numbers.\n" +"// SAFETY: There is no other global function of this name.\n" msgstr "" -#: src/chromium/setup.md -msgid "It's also recommended that you have Visual Studio code installed." -msgstr "" +#: src/android/interoperability/with-c/rust-library.md +msgid "\"x ({x}) is smallest!\"" +msgstr "\"x ({x}) er mindst!\"" -#: src/chromium/setup.md -msgid "About the exercises" -msgstr "" +#: src/android/interoperability/with-c/rust-library.md +msgid "\"y ({y}) is probably larger than x ({x})\"" +msgstr "\"y ({y}) er muligvis større end x ({x})\"" -#: src/chromium/setup.md -msgid "" -"This part of the course has a series of exercises which build on each other. " -"We'll be doing them spread throughout the course instead of just at the end. " -"If you don't have time to complete a certain part, don't worry: you can " -"catch up in the next slot." -msgstr "" +#: src/android/interoperability/with-c/rust-library.md +msgid "_interoperability/rust/libanalyze/Android.bp_" +msgstr "_interoperability/rust/libanalyze/Android.bp_" -#: src/chromium/cargo.md -msgid "" -"Rust community typically uses `cargo` and libraries from [crates.io](https://" -"crates.io/). Chromium is built using `gn` and `ninja` and a curated set of " -"dependencies." -msgstr "" +#: src/android/interoperability/with-c/rust-library.md +#: src/android/interoperability/with-c/rust.md +msgid "\"libanalyze_ffi\"" +msgstr "\"libanalyze_ffi\"" -#: src/chromium/cargo.md -msgid "When writing code in Rust, your choices are:" -msgstr "" +#: src/android/interoperability/with-c/rust-library.md +msgid "\"analyze_ffi\"" +msgstr "\"analyze_ffi\"" -#: src/chromium/cargo.md -msgid "" -"Use `gn` and `ninja` with the help of the templates from `//build/rust/*." -"gni` (e.g. `rust_static_library` that we'll meet later). This uses " -"Chromium's audited toolchain and crates." -msgstr "" +#: src/android/interoperability/with-c/rust-library.md +msgid "\"analyze.rs\"" +msgstr "\"analyze.rs\"" -#: src/chromium/cargo.md +#: src/android/interoperability/with-c/rust-library.md msgid "" -"Use `cargo`, but [restrict yourself to Chromium's audited toolchain and " -"crates](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/" -"docs/rust.md#Using-cargo)" +"`#[unsafe(no_mangle)]` disables Rust's usual name mangling, so the exported " +"symbol will just be the name of the function. You can also use " +"`#[unsafe(export_name = \"some_name\")]` to specify whatever name you want." msgstr "" -#: src/chromium/cargo.md -msgid "" -"Use `cargo`, trusting a [toolchain](https://rustup.rs/) and/or [crates " -"downloaded from the internet](https://crates.io/)" +#: src/android/interoperability/with-c/rust.md +msgid "Calling Rust" msgstr "" -#: src/chromium/cargo.md -msgid "" -"From here on we'll be focusing on `gn` and `ninja`, because this is how Rust " -"code can be built into the Chromium browser. At the same time, Cargo is an " -"important part of the Rust ecosystem and you should keep it in your toolbox." +#: src/android/interoperability/with-c/rust.md +msgid "We can now call this from a C binary:" msgstr "" -#: src/chromium/cargo.md -#, fuzzy -msgid "Mini exercise" -msgstr "Øvelser" +#: src/android/interoperability/with-c/rust.md +msgid "_interoperability/rust/libanalyze/analyze.h_" +msgstr "_interoperability/rust/libanalyze/analyze.h_" -#: src/chromium/cargo.md -msgid "Split into small groups and:" -msgstr "" +#: src/android/interoperability/with-c/rust.md +msgid "_interoperability/rust/analyze/main.c_" +msgstr "_interoperability/rust/analyze/main.c_" -#: src/chromium/cargo.md -msgid "" -"Brainstorm scenarios where `cargo` may offer an advantage and assess the " -"risk profile of these scenarios." -msgstr "" +#: src/android/interoperability/with-c/rust.md +msgid "\"analyze.h\"" +msgstr "\"analyze.h\"" -#: src/chromium/cargo.md -msgid "" -"Discuss which tools, libraries, and groups of people need to be trusted when " -"using `gn` and `ninja`, offline `cargo`, etc." -msgstr "" +#: src/android/interoperability/with-c/rust.md +msgid "_interoperability/rust/analyze/Android.bp_" +msgstr "_interoperability/rust/analyze/Android.bp_" -#: src/chromium/cargo.md -msgid "" -"Ask students to avoid peeking at the speaker notes before completing the " -"exercise. Assuming folks taking the course are physically together, ask them " -"to discuss in small groups of 3-4 people." -msgstr "" +#: src/android/interoperability/with-c/rust.md +msgid "\"analyze_numbers\"" +msgstr "\"analyze_numbers\"" -#: src/chromium/cargo.md -msgid "" -"Notes/hints related to the first part of the exercise (\"scenarios where " -"Cargo may offer an advantage\"):" -msgstr "" +#: src/android/interoperability/with-c/rust.md +msgid "\"main.c\"" +msgstr "\"main.c\"" -#: src/chromium/cargo.md +#: src/android/interoperability/with-c/rust.md +#, fuzzy msgid "" -"It's fantastic that when writing a tool, or prototyping a part of Chromium, " -"one has access to the rich ecosystem of crates.io libraries. There is a " -"crate for almost anything and they are usually quite pleasant to use. " -"(`clap` for command-line parsing, `serde` for serializing/deserializing to/" -"from various formats, `itertools` for working with iterators, etc.)." +"```shell\n" +"m analyze_numbers\n" +"adb push \"$ANDROID_PRODUCT_OUT/system/bin/analyze_numbers\" /data/local/" +"tmp\n" +"adb shell /data/local/tmp/analyze_numbers\n" +"```" msgstr "" +"```shell\n" +"m analyze_numbers\n" +"adb push \"$ANDROID_PRODUCT_OUT/system/bin/analyze_numbers /data/local/" +"tmp\"\n" +"adb shell /data/local/tmp/analyze_numbers\n" +"```" -#: src/chromium/cargo.md +#: src/android/interoperability/cpp.md msgid "" -"`cargo` makes it easy to try a library (just add a single line to `Cargo." -"toml` and start writing code)" +"The [CXX crate](https://cxx.rs/) enables safe interoperability between Rust " +"and C++." msgstr "" -#: src/chromium/cargo.md -msgid "" -"It may be worth comparing how CPAN helped make `perl` a popular choice. Or " -"comparing with `python` + `pip`." +#: src/android/interoperability/cpp.md +msgid "The overall approach looks like this:" msgstr "" -#: src/chromium/cargo.md +#: src/android/interoperability/cpp/bridge.md msgid "" -"Development experience is made really nice not only by core Rust tools (e.g. " -"using `rustup` to switch to a different `rustc` version when testing a crate " -"that needs to work on nightly, current stable, and older stable) but also by " -"an ecosystem of third-party tools (e.g. Mozilla provides `cargo vet` for " -"streamlining and sharing security audits; `criterion` crate gives a " -"streamlined way to run benchmarks)." +"CXX relies on a description of the function signatures that will be exposed " +"from each language to the other. You provide this description using extern " +"blocks in a Rust module annotated with the `#[cxx::bridge]` attribute macro." msgstr "" -#: src/chromium/cargo.md -msgid "" -"`cargo` makes it easy to add a tool via `cargo install --locked cargo-vet`." +#: src/android/interoperability/cpp/bridge.md +msgid "\"org::blobstore\"" msgstr "" -#: src/chromium/cargo.md -msgid "It may be worth comparing with Chrome Extensions or VScode extensions." +#: src/android/interoperability/cpp/bridge.md +msgid "// Shared structs with fields visible to both languages.\n" msgstr "" -#: src/chromium/cargo.md -msgid "" -"Broad, generic examples of projects where `cargo` may be the right choice:" +#: src/android/interoperability/cpp/bridge.md +#: src/android/interoperability/cpp/generated-cpp.md +msgid "// Rust types and signatures exposed to C++.\n" msgstr "" -#: src/chromium/cargo.md -msgid "" -"Perhaps surprisingly, Rust is becoming increasingly popular in the industry " -"for writing command line tools. The breadth and ergonomics of libraries is " -"comparable to Python, while being more robust (thanks to the rich " -"typesystem) and running faster (as a compiled, rather than interpreted " -"language)." -msgstr "" +#: src/android/interoperability/cpp/bridge.md +#: src/android/interoperability/cpp/rust-bridge.md +#: src/android/interoperability/cpp/generated-cpp.md +#: src/android/interoperability/cpp/rust-result.md +#: src/chromium/interoperability-with-cpp/example-bindings.md +#: src/chromium/interoperability-with-cpp/error-handling-qr.md +#: src/chromium/interoperability-with-cpp/error-handling-png.md +#, fuzzy +msgid "\"Rust\"" +msgstr "\"rust\"" -#: src/chromium/cargo.md -msgid "" -"Participating in the Rust ecosystem requires using standard Rust tools like " -"Cargo. Libraries that want to get external contributions, and want to be " -"used outside of Chromium (e.g. in Bazel or Android/Soong build environments) " -"should probably use Cargo." +#: src/android/interoperability/cpp/bridge.md +#: src/android/interoperability/cpp/cpp-bridge.md +msgid "// C++ types and signatures exposed to Rust.\n" msgstr "" -#: src/chromium/cargo.md -msgid "Examples of Chromium-related projects that are `cargo`\\-based:" +#: src/android/interoperability/cpp/bridge.md +#: src/android/interoperability/cpp/cpp-bridge.md +#: src/android/interoperability/cpp/cpp-exception.md +#: src/chromium/interoperability-with-cpp/example-bindings.md +msgid "\"C++\"" msgstr "" -#: src/chromium/cargo.md -msgid "" -"`serde_json_lenient` (experimented with in other parts of Google which " -"resulted in PRs with performance improvements)" +#: src/android/interoperability/cpp/bridge.md +#: src/android/interoperability/cpp/cpp-bridge.md +msgid "\"include/blobstore.h\"" msgstr "" -#: src/chromium/cargo.md -msgid "Fontations libraries like `font-types`" +#: src/android/interoperability/cpp/bridge.md +msgid "The bridge is generally declared in an `ffi` module within your crate." msgstr "" -#: src/chromium/cargo.md +#: src/android/interoperability/cpp/bridge.md msgid "" -"`gnrt` tool (we will meet it later in the course) which depends on `clap` " -"for command-line parsing and on `toml` for configuration files." +"From the declarations made in the bridge module, CXX will generate matching " +"Rust and C++ type/function definitions in order to expose those items to " +"both languages." msgstr "" -#: src/chromium/cargo.md +#: src/android/interoperability/cpp/bridge.md msgid "" -"Disclaimer: a unique reason for using `cargo` was unavailability of `gn` " -"when building and bootstrapping Rust standard library when building Rust " -"toolchain.)" +"To view the generated Rust code, use [cargo-expand](https://github.com/" +"dtolnay/cargo-expand) to view the expanded proc macro. For most of the " +"examples you would use `cargo expand ::ffi` to expand just the `ffi` module " +"(though this doesn't apply for Android projects)." msgstr "" -#: src/chromium/cargo.md -msgid "" -"`run_gnrt.py` uses Chromium's copy of `cargo` and `rustc`. `gnrt` depends on " -"third-party libraries downloaded from the internet, by `run_gnrt.py` asks " -"`cargo` that only `--locked` content is allowed via `Cargo.lock`.)" +#: src/android/interoperability/cpp/bridge.md +msgid "To view the generated C++ code, look in `target/cxxbridge`." msgstr "" -#: src/chromium/cargo.md -msgid "" -"Students may identify the following items as being implicitly or explicitly " -"trusted:" +#: src/android/interoperability/cpp/rust-bridge.md +msgid "Rust Bridge Declarations" msgstr "" -#: src/chromium/cargo.md -msgid "" -"`rustc` (the Rust compiler) which in turn depends on the LLVM libraries, the " -"Clang compiler, the `rustc` sources (fetched from GitHub, reviewed by Rust " -"compiler team), binary Rust compiler downloaded for bootstrapping" +#: src/android/interoperability/cpp/rust-bridge.md +msgid "// Opaque type\n" msgstr "" -#: src/chromium/cargo.md -msgid "" -"`rustup` (it may be worth pointing out that `rustup` is developed under the " -"umbrella of the https://github.com/rust-lang/ organization - same as `rustc`)" +#: src/android/interoperability/cpp/rust-bridge.md +msgid "// Method on `MyType`\n" msgstr "" -#: src/chromium/cargo.md -msgid "`cargo`, `rustfmt`, etc." -msgstr "" +#: src/android/interoperability/cpp/rust-bridge.md +#, fuzzy +msgid "// Free function\n" +msgstr "Funktioner" -#: src/chromium/cargo.md +#: src/android/interoperability/cpp/rust-bridge.md msgid "" -"Various internal infrastructure (bots that build `rustc`, system for " -"distributing the prebuilt toolchain to Chromium engineers, etc.)" -msgstr "" - -#: src/chromium/cargo.md -msgid "Cargo tools like `cargo audit`, `cargo vet`, etc." +"Items declared in the `extern \"Rust\"` reference items that are in scope in " +"the parent module." msgstr "" -#: src/chromium/cargo.md +#: src/android/interoperability/cpp/rust-bridge.md msgid "" -"Rust libraries vendored into `//third_party/rust` (audited by " -"security@chromium.org)" +"The CXX code generator uses your `extern \"Rust\"` section(s) to produce a C+" +"+ header file containing the corresponding C++ declarations. The generated " +"header has the same path as the Rust source file containing the bridge, " +"except with a .rs.h file extension." msgstr "" -#: src/chromium/cargo.md -msgid "Other Rust libraries (some niche, some quite popular and commonly used)" +#: src/android/interoperability/cpp/generated-cpp.md +msgid "Results in (roughly) the following C++:" msgstr "" -#: src/chromium/policy.md -msgid "Chromium Rust policy" +#: src/android/interoperability/cpp/cpp-bridge.md +msgid "C++ Bridge Declarations" msgstr "" -#: src/chromium/policy.md -msgid "" -"Chromium does not yet allow first-party Rust except in rare cases as " -"approved by Chromium's [Area Tech Leads](https://source.chromium.org/" -"chromium/chromium/src/+/main:ATL_OWNERS)." +#: src/android/interoperability/cpp/cpp-bridge.md +msgid "Results in (roughly) the following Rust:" msgstr "" -#: src/chromium/policy.md -msgid "" -"Chromium's policy on third party libraries is outlined [here](https://" -"chromium.googlesource.com/chromium/src/+/main/docs/adding_to_third_party." -"md#rust) - Rust is allowed for third party libraries under various " -"circumstances, including if they're the best option for performance or for " -"security." +#: src/android/interoperability/cpp/cpp-bridge.md +msgid "\"org$blobstore$cxxbridge1$new_blobstore_client\"" msgstr "" -#: src/chromium/policy.md -msgid "" -"Very few Rust libraries directly expose a C/C++ API, so that means that " -"nearly all such libraries will require a small amount of first-party glue " -"code." +#: src/android/interoperability/cpp/cpp-bridge.md +msgid "\"org$blobstore$cxxbridge1$BlobstoreClient$put\"" msgstr "" -#: src/chromium/policy.md -#, fuzzy +#: src/android/interoperability/cpp/cpp-bridge.md msgid "" -"```bob\n" -"\"C++\" Rust\n" -".- - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - - " -"-.\n" -": : : :\n" -": Existing Chromium : : Chromium Rust Existing " -"Rust :\n" -": \"C++\" : : \"wrapper\" " -"crate :\n" -": +---------------+ : : +----------------+ +-------------" -"+ :\n" -": | | : : | | | " -"| :\n" -": | o-----+-+-----------+-+-> o-+----------+--> " -"| :\n" -": | | : Language : | | Crate | " -"| :\n" -": +---------------+ : boundary : +----------------+ API +-------------" -"+ :\n" -": : : :\n" -"`- - - - - - - - - -' `- - - - - - - - - - - - - - - - - - - - - - " -"-'\n" -"```" +"The programmer does not need to promise that the signatures they have typed " +"in are accurate. CXX performs static assertions that the signatures exactly " +"correspond with what is declared in C++." msgstr "" -"```bob\n" -" Stak Heap\n" -".- - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - - " -"-.\n" -": : : :\n" -": " -"list : : :\n" -": +----+----+ : : +----+----+ +----+------" -"+ :\n" -": | 1 | o--+-----------+-----+--->| 2 | o--+--->| // | null " -"| :\n" -": +----+----+ : : +----+----+ +----+------" -"+ :\n" -": : : :\n" -": : : :\n" -"`- - - - - - - - - - - - -' '- - - - - - - - - - - - - - - - - - - - - - " -"-'\n" -"```" -#: src/chromium/policy.md +#: src/android/interoperability/cpp/cpp-bridge.md msgid "" -"First-party Rust glue code for a particular third-party crate should " -"normally be kept in `third_party/rust///wrapper`." +"`unsafe extern` blocks allow you to declare C++ functions that are safe to " +"call from Rust." msgstr "" -#: src/chromium/policy.md -msgid "Because of this, today's course will be heavily focused on:" +#: src/android/interoperability/cpp/shared-types.md +msgid "// A=1, J=11, Q=12, K=13\n" msgstr "" -#: src/chromium/policy.md -msgid "Bringing in third-party Rust libraries (\"crates\")" +#: src/android/interoperability/cpp/shared-types.md +msgid "Only C-like (unit) enums are supported." msgstr "" -#: src/chromium/policy.md -msgid "Writing glue code to be able to use those crates from Chromium C++." +#: src/android/interoperability/cpp/shared-types.md +msgid "" +"A limited number of traits are supported for `#[derive()]` on shared types. " +"Corresponding functionality is also generated for the C++ code, e.g. if you " +"derive `Hash` also generates an implementation of `std::hash` for the " +"corresponding C++ type." msgstr "" -#: src/chromium/policy.md -msgid "If this policy changes over time, the course will evolve to keep up." -msgstr "" +#: src/android/interoperability/cpp/shared-enums.md +#, fuzzy +msgid "Generated Rust:" +msgstr "\"general-tests\"" -#: src/chromium/build-rules.md -msgid "Build rules" +#: src/android/interoperability/cpp/shared-enums.md +msgid "Generated C++:" msgstr "" -#: src/chromium/build-rules.md +#: src/android/interoperability/cpp/shared-enums.md msgid "" -"Rust code is usually built using `cargo`. Chromium builds with `gn` and " -"`ninja` for efficiency --- its static rules allow maximum parallelism. Rust " -"is no exception." +"On the Rust side, the code generated for shared enums is actually a struct " +"wrapping a numeric value. This is because it is not UB in C++ for an enum " +"class to hold a value different from all of the listed variants, and our " +"Rust representation needs to have the same behavior." msgstr "" -#: src/chromium/build-rules.md -msgid "Adding Rust code to Chromium" +#: src/android/interoperability/cpp/rust-result.md +msgid "\"fallible1 requires depth > 0\"" msgstr "" -#: src/chromium/build-rules.md -msgid "" -"In some existing Chromium `BUILD.gn` file, declare a `rust_static_library`:" +#: src/android/interoperability/cpp/rust-result.md +msgid "\"Success!\"" msgstr "" -#: src/chromium/build-rules.md +#: src/android/interoperability/cpp/rust-result.md msgid "" -"```gn\n" -"import(\"//build/rust/rust_static_library.gni\")\n" -"\n" -"rust_static_library(\"my_rust_lib\") {\n" -" crate_root = \"lib.rs\"\n" -" sources = [ \"lib.rs\" ]\n" -"}\n" -"```" +"Rust functions that return `Result` are translated to exceptions on the C++ " +"side." msgstr "" -#: src/chromium/build-rules.md +#: src/android/interoperability/cpp/rust-result.md msgid "" -"You can also add `deps` on other Rust targets. Later we'll use this to " -"depend upon third party code." +"The exception thrown will always be of type `rust::Error`, which primarily " +"exposes a way to get the error message string. The error message will come " +"from the error type's `Display` impl." msgstr "" -#: src/chromium/build-rules.md +#: src/android/interoperability/cpp/rust-result.md msgid "" -"You must specify _both_ the crate root, _and_ a full list of sources. The " -"`crate_root` is the file given to the Rust compiler representing the root " -"file of the compilation unit --- typically `lib.rs`. `sources` is a complete " -"list of all source files which `ninja` needs in order to determine when " -"rebuilds are necessary." +"A panic unwinding from Rust to C++ will always cause the process to " +"immediately terminate." msgstr "" -#: src/chromium/build-rules.md -msgid "" -"(There's no such thing as a Rust `source_set`, because in Rust, an entire " -"crate is a compilation unit. A `static_library` is the smallest unit.)" -msgstr "" - -#: src/chromium/build-rules.md -msgid "" -"Students might be wondering why we need a gn template, rather than using " -"[gn's built-in support for Rust static libraries](https://gn.googlesource." -"com/gn/+/main/docs/reference.md#func_static_library). The answer is that " -"this template provides support for CXX interop, Rust features, and unit " -"tests, some of which we'll use later." +#: src/android/interoperability/cpp/cpp-exception.md +msgid "\"example/include/example.h\"" msgstr "" -#: src/chromium/build-rules/unsafe.md -msgid "Including `unsafe` Rust Code" -msgstr "" +#: src/android/interoperability/cpp/cpp-exception.md +#, fuzzy +msgid "\"Error: {}\"" +msgstr "\"Fejl: {err}\"" -#: src/chromium/build-rules/unsafe.md +#: src/android/interoperability/cpp/cpp-exception.md msgid "" -"Unsafe Rust code is forbidden in `rust_static_library` by default --- it " -"won't compile. If you need unsafe Rust code, add `allow_unsafe = true` to " -"the gn target. (Later in the course we'll see circumstances where this is " -"necessary.)" +"C++ functions declared to return a `Result` will catch any thrown exception " +"on the C++ side and return it as an `Err` value to the calling Rust function." msgstr "" -#: src/chromium/build-rules/unsafe.md +#: src/android/interoperability/cpp/cpp-exception.md msgid "" -"```gn\n" -"import(\"//build/rust/rust_static_library.gni\")\n" -"\n" -"rust_static_library(\"my_rust_lib\") {\n" -" crate_root = \"lib.rs\"\n" -" sources = [\n" -" \"lib.rs\",\n" -" \"hippopotamus.rs\"\n" -" ]\n" -" allow_unsafe = true\n" -"}\n" -"```" +"If an exception is thrown from an extern \"C++\" function that is not " +"declared by the CXX bridge to return `Result`, the program calls C++'s " +"`std::terminate`. The behavior is equivalent to the same exception being " +"thrown through a `noexcept` C++ function." msgstr "" -#: src/chromium/build-rules/depending.md -msgid "Simply add the above target to the `deps` of some Chromium C++ target." +#: src/android/interoperability/cpp/type-mapping.md +msgid "C++ Type" msgstr "" -#: src/chromium/build-rules/depending.md -msgid "" -"```gn\n" -"import(\"//build/rust/rust_static_library.gni\")\n" -"\n" -"rust_static_library(\"my_rust_lib\") {\n" -" crate_root = \"lib.rs\"\n" -" sources = [ \"lib.rs\" ]\n" -"}\n" -"\n" -"# or source_set, static_library etc.\n" -"component(\"preexisting_cpp\") {\n" -" deps = [ \":my_rust_lib\" ]\n" -"}\n" -"```" -msgstr "" +#: src/android/interoperability/cpp/type-mapping.md +#, fuzzy +msgid "`rust::String`" +msgstr "`rust_bindgen`" -#: src/chromium/build-rules/vscode.md -msgid "" -"Types are elided in Rust code, which makes a good IDE even more useful than " -"for C++. Visual Studio code works well for Rust in Chromium. To use it," +#: src/android/interoperability/cpp/type-mapping.md +msgid "`&str`" msgstr "" -#: src/chromium/build-rules/vscode.md -msgid "" -"Ensure your VSCode has the `rust-analyzer` extension, not earlier forms of " -"Rust support" -msgstr "" +#: src/android/interoperability/cpp/type-mapping.md +#, fuzzy +msgid "`rust::Str`" +msgstr "`rust_test`" -#: src/chromium/build-rules/vscode.md -msgid "" -"`gn gen out/Debug --export-rust-project` (or equivalent for your output " -"directory)" +#: src/android/interoperability/cpp/type-mapping.md +msgid "`CxxString`" msgstr "" -#: src/chromium/build-rules/vscode.md -msgid "`ln -s out/Debug/rust-project.json rust-project.json`" +#: src/android/interoperability/cpp/type-mapping.md +msgid "`std::string`" msgstr "" -#: src/chromium/build-rules/vscode.md -msgid "" -"A demo of some of the code annotation and exploration features of rust-" -"analyzer might be beneficial if the audience are naturally skeptical of IDEs." +#: src/android/interoperability/cpp/type-mapping.md +msgid "`&[T]`/`&mut [T]`" msgstr "" -#: src/chromium/build-rules/vscode.md -msgid "" -"The following steps may help with the demo (but feel free to instead use a " -"piece of Chromium-related Rust that you are most familiar with):" +#: src/android/interoperability/cpp/type-mapping.md +#, fuzzy +msgid "`rust::Slice`" +msgstr "`rust_ffi`" + +#: src/android/interoperability/cpp/type-mapping.md +msgid "`rust::Box`" msgstr "" -#: src/chromium/build-rules/vscode.md -msgid "Open `components/qr_code_generator/qr_code_generator_ffi_glue.rs`" +#: src/android/interoperability/cpp/type-mapping.md +msgid "`UniquePtr`" msgstr "" -#: src/chromium/build-rules/vscode.md -msgid "" -"Place the cursor over the `QrCode::new` call (around line 26) in " -"\\`qr_code_generator_ffi_glue.rs" +#: src/android/interoperability/cpp/type-mapping.md +msgid "`std::unique_ptr`" msgstr "" -#: src/chromium/build-rules/vscode.md +#: src/android/interoperability/cpp/type-mapping.md +#, fuzzy +msgid "`rust::Vec`" +msgstr "`mpsc::Receiver`" + +#: src/android/interoperability/cpp/type-mapping.md +#, fuzzy +msgid "`CxxVector`" +msgstr "`Cell`" + +#: src/android/interoperability/cpp/type-mapping.md +#, fuzzy +msgid "`std::vector`" +msgstr "`mpsc::Receiver`" + +#: src/android/interoperability/cpp/type-mapping.md msgid "" -"Demo **show documentation** (typical bindings: vscode = ctrl k i; vim/CoC = " -"K)." +"These types can be used in the fields of shared structs and the arguments " +"and returns of extern functions." msgstr "" -#: src/chromium/build-rules/vscode.md +#: src/android/interoperability/cpp/type-mapping.md msgid "" -"Demo **go to definition** (typical bindings: vscode = F12; vim/CoC = g d). " -"(This will take you to `//third_party/rust/.../qr_code-.../src/lib.rs`.)" +"Note that Rust's `String` does not map directly to `std::string`. There are " +"a few reasons for this:" msgstr "" -#: src/chromium/build-rules/vscode.md +#: src/android/interoperability/cpp/type-mapping.md msgid "" -"Demo **outline** and navigate to the `QrCode::with_bits` method (around line " -"164; the outline is in the file explorer pane in vscode; typical vim/CoC " -"bindings = space o)" +"`std::string` does not uphold the UTF-8 invariant that `String` requires." msgstr "" -#: src/chromium/build-rules/vscode.md +#: src/android/interoperability/cpp/type-mapping.md msgid "" -"Demo **type annotations** (there are quote a few nice examples in the " -"`QrCode::with_bits` method)" +"The two types have different layouts in memory and so can't be passed " +"directly between languages." msgstr "" -#: src/chromium/build-rules/vscode.md +#: src/android/interoperability/cpp/type-mapping.md msgid "" -"It may be worth pointing out that `gn gen ... --export-rust-project` will " -"need to be rerun after editing `BUILD.gn` files (which we will do a few " -"times throughout the exercises in this session)." +"`std::string` requires move constructors that don't match Rust's move " +"semantics, so a `std::string` can't be passed by value to Rust." msgstr "" -#: src/exercises/chromium/build-rules.md -msgid "Build rules exercise" -msgstr "" +#: src/android/interoperability/cpp/android-cpp-genrules.md +#: src/android/interoperability/cpp/android-build-cpp.md +#: src/android/interoperability/cpp/android-build-rust.md +#, fuzzy +msgid "Building in Android" +msgstr "Rust i Android" -#: src/exercises/chromium/build-rules.md +#: src/android/interoperability/cpp/android-cpp-genrules.md msgid "" -"In your Chromium build, add a new Rust target to `//ui/base/BUILD.gn` " -"containing:" +"Create two genrules: One to generate the CXX header, and one to generate the " +"CXX source file. These are then used as inputs to the `cc_library_static`." msgstr "" -#: src/exercises/chromium/build-rules.md +#: src/android/interoperability/cpp/android-cpp-genrules.md msgid "" -"**Important**: note that `no_mangle` here is considered a type of unsafety " -"by the Rust compiler, so you'll need to to allow unsafe code in your `gn` " -"target." +"// Generate a C++ header containing the C++ bindings\n" +"// to the Rust exported functions in lib.rs.\n" msgstr "" -#: src/exercises/chromium/build-rules.md -msgid "" -"Add this new Rust target as a dependency of `//ui/base:base`. Declare this " -"function at the top of `ui/base/resource/resource_bundle.cc` (later, we'll " -"see how this can be automated by bindings generation tools):" +#: src/android/interoperability/cpp/android-cpp-genrules.md +#: src/android/interoperability/cpp/android-build-cpp.md +msgid "\"libcxx_test_bridge_header\"" msgstr "" -#: src/exercises/chromium/build-rules.md -msgid "" -"Call this function from somewhere in `ui/base/resource/resource_bundle.cc` - " -"we suggest the top of `ResourceBundle::MaybeMangleLocalizedString`. Build " -"and run Chromium, and ensure that \"Hello from Rust!\" is printed lots of " -"times." +#: src/android/interoperability/cpp/android-cpp-genrules.md +msgid "\"cxxbridge\"" msgstr "" -#: src/exercises/chromium/build-rules.md -msgid "" -"If you use VSCode, now set up Rust to work well in VSCode. It will be useful " -"in subsequent exercises. If you've succeeded, you will be able to use right-" -"click \"Go to definition\" on `println!`." +#: src/android/interoperability/cpp/android-cpp-genrules.md +msgid "\"$(location cxxbridge) $(in) --header > $(out)\"" msgstr "" -#: src/exercises/chromium/build-rules.md -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Where to find help" +#: src/android/interoperability/cpp/android-cpp-genrules.md +#: src/android/interoperability/cpp/android-build-rust.md +#, fuzzy +msgid "\"lib.rs\"" +msgstr "\"src/lib.rs\"" + +#: src/android/interoperability/cpp/android-cpp-genrules.md +#, fuzzy +msgid "\"lib.rs.h\"" +msgstr "\"src/lib.rs\"" + +#: src/android/interoperability/cpp/android-cpp-genrules.md +msgid "// Generate the C++ code that Rust calls into.\n" msgstr "" -#: src/exercises/chromium/build-rules.md -msgid "" -"The options available to the [`rust_static_library` gn template](https://" -"source.chromium.org/chromium/chromium/src/+/main:build/rust/" -"rust_static_library.gni;l=16)" +#: src/android/interoperability/cpp/android-cpp-genrules.md +#: src/android/interoperability/cpp/android-build-cpp.md +msgid "\"libcxx_test_bridge_code\"" msgstr "" -#: src/exercises/chromium/build-rules.md -msgid "" -"Information about [`#[no_mangle]`](https://doc.rust-lang.org/beta/reference/" -"abi.html#the-no_mangle-attribute)" +#: src/android/interoperability/cpp/android-cpp-genrules.md +msgid "\"$(location cxxbridge) $(in) > $(out)\"" msgstr "" -#: src/exercises/chromium/build-rules.md +#: src/android/interoperability/cpp/android-cpp-genrules.md +#, fuzzy +msgid "\"lib.rs.cc\"" +msgstr "\"src/lib.rs\"" + +#: src/android/interoperability/cpp/android-cpp-genrules.md msgid "" -"Information about [`extern \"C\"`](https://doc.rust-lang.org/std/keyword." -"extern.html)" +"The `cxxbridge` tool is a standalone tool that generates the C++ side of the " +"bridge module. It is included in Android and available as a Soong tool." msgstr "" -#: src/exercises/chromium/build-rules.md +#: src/android/interoperability/cpp/android-cpp-genrules.md msgid "" -"Information about gn's [`--export-rust-project`](https://gn.googlesource.com/" -"gn/+/main/docs/reference.md#compilation-database) switch" +"By convention, if your Rust source file is `lib.rs` your header file will be " +"named `lib.rs.h` and your source file will be named `lib.rs.cc`. This naming " +"convention isn't enforced, though." msgstr "" -#: src/exercises/chromium/build-rules.md +#: src/android/interoperability/cpp/android-build-cpp.md msgid "" -"[How to install rust-analyzer in VSCode](https://code.visualstudio.com/docs/" -"languages/rust)" +"Create a `cc_library_static` to build the C++ library, including the CXX " +"generated header and source file." msgstr "" -#: src/exercises/chromium/build-rules.md -msgid "" -"This example is unusual because it boils down to the lowest-common-" -"denominator interop language, C. Both C++ and Rust can natively declare and " -"call C ABI functions. Later in the course, we'll connect C++ directly to " -"Rust." +#: src/android/interoperability/cpp/android-build-cpp.md +#: src/android/interoperability/cpp/android-build-rust.md +#, fuzzy +msgid "\"libcxx_test_cpp\"" +msgstr "\"libtextwrap\"" + +#: src/android/interoperability/cpp/android-build-cpp.md +msgid "\"cxx_test.cpp\"" msgstr "" -#: src/exercises/chromium/build-rules.md -msgid "" -"`allow_unsafe = true` is required here because `#[no_mangle]` might allow " -"Rust to generate two functions with the same name, and Rust can no longer " -"guarantee that the right one is called." +#: src/android/interoperability/cpp/android-build-cpp.md +msgid "\"cxx-bridge-header\"" msgstr "" -#: src/exercises/chromium/build-rules.md +#: src/android/interoperability/cpp/android-build-cpp.md msgid "" -"If you need a pure Rust executable, you can also do that using the " -"`rust_executable` gn template." +"Point out that `libcxx_test_bridge_header` and `libcxx_test_bridge_code` are " +"the dependencies for the CXX-generated C++ bindings. We'll show how these " +"are setup on the next slide." msgstr "" -#: src/chromium/testing.md +#: src/android/interoperability/cpp/android-build-cpp.md msgid "" -"Rust community typically authors unit tests in a module placed in the same " -"source file as the code being tested. This was covered [earlier](../testing." -"md) in the course and looks like this:" +"Note that you also need to depend on the `cxx-bridge-header` library in " +"order to pull in common CXX definitions." msgstr "" -#: src/chromium/testing.md +#: src/android/interoperability/cpp/android-build-cpp.md msgid "" -"In Chromium we place unit tests in a separate source file and we continue to " -"follow this practice for Rust --- this makes tests consistently discoverable " -"and helps to avoid rebuilding `.rs` files a second time (in the `test` " -"configuration)." +"Full docs for using CXX in Android can be found in [the Android docs]" +"(https://source.android.com/docs/setup/build/rust/building-rust-modules/" +"android-rust-patterns#rust-cpp-interop-using-cxx). You may want to share " +"that link with the class so that students know where they can find these " +"instructions again in the future." msgstr "" -#: src/chromium/testing.md +#: src/android/interoperability/cpp/android-build-rust.md msgid "" -"This results in the following options for testing Rust code in Chromium:" +"Create a `rust_binary` that depends on `libcxx` and your `cc_library_static`." msgstr "" -#: src/chromium/testing.md -msgid "" -"Native Rust tests (i.e. `#[test]`). Discouraged outside of `//third_party/" -"rust`." +#: src/android/interoperability/cpp/android-build-rust.md +msgid "\"cxx_test\"" msgstr "" -#: src/chromium/testing.md -msgid "" -"`gtest` tests authored in C++ and exercising Rust via FFI calls. Sufficient " -"when Rust code is just a thin FFI layer and the existing unit tests provide " -"sufficient coverage for the feature." +#: src/android/interoperability/cpp/android-build-rust.md +#, fuzzy +msgid "\"libcxx\"" +msgstr "\"libjni\"" + +#: src/android/interoperability/java.md +msgid "Interoperability with Java" msgstr "" -#: src/chromium/testing.md +#: src/android/interoperability/java.md msgid "" -"`gtest` tests authored in Rust and using the crate under test through its " -"public API (using `pub mod for_testing { ... }` if needed). This is the " -"subject of the next few slides." +"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/chromium/testing.md -msgid "" -"Mention that native Rust tests of third-party crates should eventually be " -"exercised by Chromium bots. (Such testing is needed rarely --- only after " -"adding or updating third-party crates.)" +#: src/android/interoperability/java.md +msgid "First, we create a Rust function to export to Java:" msgstr "" -#: src/chromium/testing.md -msgid "" -"Some examples may help illustrate when C++ `gtest` vs Rust `gtest` should be " -"used:" +#: src/android/interoperability/java.md +msgid "_interoperability/java/src/lib.rs_:" msgstr "" -#: src/chromium/testing.md -msgid "" -"QR has very little functionality in the first-party Rust layer (it's just a " -"thin FFI glue) and therefore uses the existing C++ unit tests for testing " -"both the C++ and the Rust implementation (parameterizing the tests so they " -"enable or disable Rust using a `ScopedFeatureList`)." +#: src/android/interoperability/java.md +msgid "//! Rust <-> Java FFI demo.\n" msgstr "" -#: src/chromium/testing.md +#: src/android/interoperability/java.md msgid "" -"Hypothetical/WIP PNG integration may need to implement memory-safe " -"implementation of pixel transformations that are provided by `libpng` but " -"missing in the `png` crate - e.g. RGBA => BGRA, or gamma correction. Such " -"functionality may benefit from separate tests authored in Rust." +"/// HelloWorld::hello method implementation.\n" +"// SAFETY: There is no other global function of this name.\n" msgstr "" -#: src/chromium/testing/rust-gtest-interop.md -msgid "" -"The [`rust_gtest_interop`](https://chromium.googlesource.com/chromium/src/+/" -"main/testing/rust_gtest_interop/README.md) library provides a way to:" +#: src/android/interoperability/java.md +msgid "\"system\"" +msgstr "\"system\"" + +#: src/android/interoperability/java.md +msgid "\"Hello, {input}!\"" msgstr "" -#: src/chromium/testing/rust-gtest-interop.md +#: src/android/interoperability/java.md +msgid "_interoperability/java/Android.bp_:" +msgstr "_interoperability/java/Android.bp_:" + +#: src/android/interoperability/java.md +msgid "\"libhello_jni\"" +msgstr "\"libhello_jni\"" + +#: src/android/interoperability/java.md +msgid "\"hello_jni\"" +msgstr "\"hello_jni\"" + +#: src/android/interoperability/java.md +msgid "\"libjni\"" +msgstr "\"libjni\"" + +#: src/android/interoperability/java.md +msgid "We then call this function from Java:" +msgstr "" + +#: src/android/interoperability/java.md +msgid "_interoperability/java/HelloWorld.java_:" +msgstr "" + +#: src/android/interoperability/java.md +msgid "\"helloworld_jni\"" +msgstr "\"helloworld_jni\"" + +#: src/android/interoperability/java.md +msgid "\"HelloWorld.java\"" +msgstr "\"HelloWorld.java\"" + +#: src/android/interoperability/java.md +msgid "\"HelloWorld\"" +msgstr "\"HelloWorld\"" + +#: src/android/interoperability/java.md +msgid "Finally, you can build, sync, and run the binary:" +msgstr "" + +#: src/android/interoperability/java.md msgid "" -"Use a Rust function as a `gtest` testcase (using the `#[gtest(...)]` " -"attribute)" +"The `unsafe(no_mangle)` attribute instructs Rust to emit the " +"`Java_HelloWorld_hello` symbol exactly as written. This is important so that " +"Java can recognize the symbol as a `hello` method on the `HelloWorld` class." msgstr "" -#: src/chromium/testing/rust-gtest-interop.md +#: src/android/interoperability/java.md msgid "" -"Use `expect_eq!` and similar macros (similar to `assert_eq!` but not " -"panicking and not terminating the test when the assertion fails)." +"By default, Rust will mangle (rename) symbols so that a binary can link in " +"two versions of the same Rust crate." msgstr "" -#: src/chromium/testing/rust-gtest-interop.md +#: src/chromium.md #, fuzzy -msgid "Example:" -msgstr "Eksempel" +msgid "Welcome to Rust in Chromium" +msgstr "\"Velkommen til RustOS 3.14\"" -#: src/chromium/testing/build-gn.md +#: src/chromium.md msgid "" -"The simplest way to build Rust `gtest` tests is to add them to an existing " -"test binary that already contains tests authored in C++. For example:" +"Rust is supported for third-party libraries in Chromium, with first-party " +"glue code to connect between Rust and existing Chromium C++ code." msgstr "" -#: src/chromium/testing/build-gn.md +#: src/chromium.md msgid "" -"```gn\n" -"test(\"ui_base_unittests\") {\n" -" ...\n" -" sources += [ \"my_rust_lib_unittest.rs\" ]\n" -" deps += [ \":my_rust_lib\" ]\n" -"}\n" -"```" +"Today, we'll call into Rust to do something silly with strings. If you've " +"got a corner of the code where you're displaying a UTF8 string to the user, " +"feel free to follow this recipe in your part of the codebase instead of the " +"exact part we talk about." msgstr "" -#: src/chromium/testing/build-gn.md +#: src/chromium/setup.md msgid "" -"Authoring Rust tests in a separate `static_library` also works, but requires " -"manually declaring the dependency on the support libraries:" +"Make sure you can build and run Chromium. Any platform and set of build " +"flags is OK, so long as your code is relatively recent (commit position " +"1223636 onwards, corresponding to November 2023):" msgstr "" -#: src/chromium/testing/build-gn.md +#: src/chromium/setup.md msgid "" -"```gn\n" -"rust_static_library(\"my_rust_lib_unittests\") {\n" -" testonly = true\n" -" is_gtest_unittests = true\n" -" crate_root = \"my_rust_lib_unittest.rs\"\n" -" sources = [ \"my_rust_lib_unittest.rs\" ]\n" -" deps = [\n" -" \":my_rust_lib\",\n" -" \"//testing/rust_gtest_interop\",\n" -" ]\n" -"}\n" -"\n" -"test(\"ui_base_unittests\") {\n" -" ...\n" -" deps += [ \":my_rust_lib_unittests\" ]\n" -"}\n" -"```" +"(A component, debug build is recommended for quickest iteration time. This " +"is the default!)" msgstr "" -#: src/chromium/testing/chromium-import-macro.md +#: src/chromium/setup.md msgid "" -"After adding `:my_rust_lib` to GN `deps`, we still need to learn how to " -"import and use `my_rust_lib` from `my_rust_lib_unittest.rs`. We haven't " -"provided an explicit `crate_name` for `my_rust_lib` so its crate name is " -"computed based on the full target path and name. Fortunately we can avoid " -"working with such an unwieldy name by using the `chromium::import!` macro " -"from the automatically-imported `chromium` crate:" +"See [How to build Chromium](https://www.chromium.org/developers/how-tos/get-" +"the-code/) if you aren't already at that point. Be warned: setting up to " +"build Chromium takes time." msgstr "" -#: src/chromium/testing/chromium-import-macro.md -msgid "\"//ui/base:my_rust_lib\"" +#: src/chromium/setup.md +msgid "It's also recommended that you have Visual Studio code installed." msgstr "" -#: src/chromium/testing/chromium-import-macro.md -msgid "Under the covers the macro expands to something similar to:" +#: src/chromium/setup.md +msgid "About the exercises" msgstr "" -#: src/chromium/testing/chromium-import-macro.md +#: src/chromium/setup.md msgid "" -"More information can be found in [the doc comment](https://source.chromium." -"org/chromium/chromium/src/+/main:build/rust/chromium_prelude/" -"chromium_prelude.rs?q=f:chromium_prelude.rs%20pub.use.*%5Cbimport%5Cb;%20-f:" -"third_party&ss=chromium%2Fchromium%2Fsrc) of the `chromium::import` macro." +"This part of the course has a series of exercises that build on each other. " +"We'll be doing them spread throughout the course instead of just at the end. " +"If you don't have time to complete a certain part, don't worry: you can " +"catch up in the next slot." msgstr "" -#: src/chromium/testing/chromium-import-macro.md +#: src/chromium/cargo.md msgid "" -"`rust_static_library` supports specifying an explicit name via `crate_name` " -"property, but doing this is discouraged. And it is discouraged because the " -"crate name has to be globally unique. crates.io guarantees uniqueness of its " -"crate names so `cargo_crate` GN targets (generated by the `gnrt` tool " -"covered in a later section) use short crate names." +"The Rust community typically uses `cargo` and libraries from [crates.io]" +"(https://crates.io/). Chromium is built using `gn` and `ninja` and a curated " +"set of dependencies." msgstr "" -#: src/exercises/chromium/testing.md -#, fuzzy -msgid "Testing exercise" -msgstr "Øvelser" - -#: src/exercises/chromium/testing.md -msgid "Time for another exercise!" +#: src/chromium/cargo.md +msgid "When writing code in Rust, your choices are:" msgstr "" -#: src/exercises/chromium/testing.md -msgid "In your Chromium build:" +#: src/chromium/cargo.md +msgid "" +"Use `gn` and `ninja` with the help of the templates from `//build/rust/" +"*.gni` (e.g. `rust_static_library` that we'll meet later). This uses " +"Chromium's audited toolchain and crates." msgstr "" -#: src/exercises/chromium/testing.md +#: src/chromium/cargo.md msgid "" -"Add a testable function next to `hello_from_rust`. Some suggestions: adding " -"two integers received as arguments, computing the nth Fibonacci number, " -"summing integers in a slice, etc." +"Use `cargo`, but [restrict yourself to Chromium's audited toolchain and " +"crates](https://chromium.googlesource.com/chromium/src/+/refs/heads/main/" +"docs/rust.md#Using-cargo)" msgstr "" -#: src/exercises/chromium/testing.md -msgid "Add a separate `..._unittest.rs` file with a test for the new function." +#: src/chromium/cargo.md +msgid "" +"Use `cargo`, trusting a [toolchain](https://rustup.rs/) and/or [crates " +"downloaded from the internet](https://crates.io/)" msgstr "" -#: src/exercises/chromium/testing.md -msgid "Add the new tests to `BUILD.gn`." +#: src/chromium/cargo.md +msgid "" +"From here on we'll be focusing on `gn` and `ninja`, because this is how Rust " +"code can be built into the Chromium browser. At the same time, Cargo is an " +"important part of the Rust ecosystem and you should keep it in your toolbox." msgstr "" -#: src/exercises/chromium/testing.md -msgid "Build the tests, run them, and verify that the new test works." -msgstr "" +#: src/chromium/cargo.md +#, fuzzy +msgid "Mini exercise" +msgstr "Øvelser" -#: src/chromium/interoperability-with-cpp.md -msgid "" -"The Rust community offers multiple options for C++/Rust interop, with new " -"tools being developed all the time. At the moment, Chromium uses a tool " -"called CXX." +#: src/chromium/cargo.md +msgid "Split into small groups and:" msgstr "" -#: src/chromium/interoperability-with-cpp.md +#: src/chromium/cargo.md msgid "" -"You describe your whole language boundary in an interface definition " -"language (which looks a lot like Rust) and then CXX tools generate " -"declarations for functions and types in both Rust and C++." +"Brainstorm scenarios where `cargo` may offer an advantage and assess the " +"risk profile of these scenarios." msgstr "" -#: src/chromium/interoperability-with-cpp.md +#: src/chromium/cargo.md msgid "" -"See the [CXX tutorial](https://cxx.rs/tutorial.html) for a full example of " -"using this." +"Discuss which tools, libraries, and groups of people need to be trusted when " +"using `gn` and `ninja`, offline `cargo`, etc." msgstr "" -#: src/chromium/interoperability-with-cpp.md +#: src/chromium/cargo.md msgid "" -"Talk through the diagram. Explain that behind the scenes, this is doing just " -"the same as you previously did. Point out that automating the process has " -"the following benefits:" +"Ask students to avoid peeking at the speaker notes before completing the " +"exercise. Assuming folks taking the course are physically together, ask them " +"to discuss in small groups of 3-4 people." msgstr "" -#: src/chromium/interoperability-with-cpp.md +#: src/chromium/cargo.md msgid "" -"The tool guarantees that the C++ and Rust sides match (e.g. you get compile " -"errors if the `#[cxx::bridge]` doesn't match the actual C++ or Rust " -"definitions, but with out-of-sync manual bindings you'd get Undefined " -"Behavior)" +"Notes/hints related to the first part of the exercise (\"scenarios where " +"Cargo may offer an advantage\"):" msgstr "" -#: src/chromium/interoperability-with-cpp.md +#: src/chromium/cargo.md msgid "" -"The tool automates generation of FFI thunks (small, C-ABI-compatible, free " -"functions) for non-C features (e.g. enabling FFI calls into Rust or C++ " -"methods; manual bindings would require authoring such top-level, free " -"functions manually)" -msgstr "" - -#: src/chromium/interoperability-with-cpp.md -msgid "The tool and the library can handle a set of core types - for example:" +"It's fantastic that when writing a tool, or prototyping a part of Chromium, " +"one has access to the rich ecosystem of crates.io libraries. There is a " +"crate for almost anything and they are usually quite pleasant to use. " +"(`clap` for command-line parsing, `serde` for serializing/deserializing to/" +"from various formats, `itertools` for working with iterators, etc.)." msgstr "" -#: src/chromium/interoperability-with-cpp.md +#: src/chromium/cargo.md msgid "" -"`&[T]` can be passed across the FFI boundary, even though it doesn't " -"guarantee any particular ABI or memory layout. With manual bindings `std::" -"span` / `&[T]` have to be manually destructured and rebuilt out of a " -"pointer and length - this is error-prone given that each language represents " -"empty slices slightly differently)" +"`cargo` makes it easy to try a library (just add a single line to " +"`Cargo.toml` and start writing code)" msgstr "" -#: src/chromium/interoperability-with-cpp.md +#: src/chromium/cargo.md msgid "" -"Smart pointers like `std::unique_ptr`, `std::shared_ptr`, and/or `Box` " -"are natively supported. With manual bindings, one would have to pass C-ABI-" -"compatible raw pointers, which would increase lifetime and memory-safety " -"risks." +"It may be worth comparing how CPAN helped make `perl` a popular choice. Or " +"comparing with `python` + `pip`." msgstr "" -#: src/chromium/interoperability-with-cpp.md +#: src/chromium/cargo.md msgid "" -"`rust::String` and `CxxString` types understand and maintain differences in " -"string representation across the languages (e.g. `rust::String::lossy` can " -"build a Rust string from non-UTF8 input and `rust::String::c_str` can NUL-" -"terminate a string)." +"Development experience is made really nice not only by core Rust tools (e.g. " +"using `rustup` to switch to a different `rustc` version when testing a crate " +"that needs to work on nightly, current stable, and older stable) but also by " +"an ecosystem of third-party tools (e.g. Mozilla provides `cargo vet` for " +"streamlining and sharing security audits; `criterion` crate gives a " +"streamlined way to run benchmarks)." msgstr "" -#: src/chromium/interoperability-with-cpp/example-bindings.md +#: src/chromium/cargo.md msgid "" -"CXX requires that the whole C++/Rust boundary is declared in `cxx::bridge` " -"modules inside `.rs` source code." -msgstr "" - -#: src/chromium/interoperability-with-cpp/example-bindings.md -msgid "\"example/include/blobstore.h\"" -msgstr "" - -#: src/chromium/interoperability-with-cpp/example-bindings.md -msgid "// Definitions of Rust types and functions go here\n" +"`cargo` makes it easy to add a tool via `cargo install --locked cargo-vet`." msgstr "" -#: src/chromium/interoperability-with-cpp/example-bindings.md -msgid "Point out:" +#: src/chromium/cargo.md +msgid "It may be worth comparing with Chrome Extensions or VScode extensions." msgstr "" -#: src/chromium/interoperability-with-cpp/example-bindings.md +#: src/chromium/cargo.md msgid "" -"Although this looks like a regular Rust `mod`, the `#[cxx::bridge]` " -"procedural macro does complex things to it. The generated code is quite a " -"bit more sophisticated - though this does still result in a `mod` called " -"`ffi` in your code." -msgstr "" - -#: src/chromium/interoperability-with-cpp/example-bindings.md -msgid "Native support for C++'s `std::unique_ptr` in Rust" -msgstr "" - -#: src/chromium/interoperability-with-cpp/example-bindings.md -msgid "Native support for Rust slices in C++" -msgstr "" - -#: src/chromium/interoperability-with-cpp/example-bindings.md -msgid "Calls from C++ to Rust, and Rust types (in the top part)" -msgstr "" - -#: src/chromium/interoperability-with-cpp/example-bindings.md -msgid "Calls from Rust to C++, and C++ types (in the bottom part)" +"Broad, generic examples of projects where `cargo` may be the right choice:" msgstr "" -#: src/chromium/interoperability-with-cpp/example-bindings.md +#: src/chromium/cargo.md msgid "" -"**Common misconception**: It _looks_ like a C++ header is being parsed by " -"Rust, but this is misleading. This header is never interpreted by Rust, but " -"simply `#include`d in the generated C++ code for the benefit of C++ " -"compilers." +"Perhaps surprisingly, Rust is becoming increasingly popular in the industry " +"for writing command line tools. The breadth and ergonomics of libraries is " +"comparable to Python, while being more robust (thanks to the rich type " +"system) and running faster (as a compiled, rather than interpreted language)." msgstr "" -#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md +#: src/chromium/cargo.md msgid "" -"By far the most useful page when using CXX is the [type reference](https://" -"cxx.rs/bindings.html)." +"Participating in the Rust ecosystem requires using standard Rust tools like " +"Cargo. Libraries that want to get external contributions, and want to be " +"used outside of Chromium (e.g. in Bazel or Android/Soong build environments) " +"should probably use Cargo." msgstr "" -#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md -msgid "CXX fundamentally suits cases where:" +#: src/chromium/cargo.md +msgid "Examples of Chromium-related projects that are `cargo`\\-based:" msgstr "" -#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md +#: src/chromium/cargo.md msgid "" -"Your Rust-C++ interface is sufficiently simple that you can declare all of " -"it." +"`serde_json_lenient` (experimented with in other parts of Google which " +"resulted in PRs with performance improvements)" msgstr "" -#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md -msgid "" -"You're using only the types natively supported by CXX already, for example " -"`std::unique_ptr`, `std::string`, `&[u8]` etc." +#: src/chromium/cargo.md +msgid "Fontations libraries like `font-types`" msgstr "" -#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md +#: src/chromium/cargo.md msgid "" -"It has many limitations --- for example lack of support for Rust's `Option` " -"type." +"`gnrt` tool (we will meet it later in the course) which depends on `clap` " +"for command-line parsing and on `toml` for configuration files." msgstr "" -#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md +#: src/chromium/cargo.md msgid "" -"These limitations constrain us to using Rust in Chromium only for well " -"isolated \"leaf nodes\" rather than for arbitrary Rust-C++ interop. When " -"considering a use-case for Rust in Chromium, a good starting point is to " -"draft the CXX bindings for the language boundary to see if it appears simple " -"enough." +"Disclaimer: a unique reason for using `cargo` was unavailability of `gn` " +"when building and bootstrapping Rust standard library when building Rust " +"toolchain." msgstr "" -#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md +#: src/chromium/cargo.md msgid "" -"You should also discuss some of the other sticky points with CXX, for " -"example:" +"`run_gnrt.py` uses Chromium's copy of `cargo` and `rustc`. `gnrt` depends on " +"third-party libraries downloaded from the internet, but `run_gnrt.py` asks " +"`cargo` that only `--locked` content is allowed via `Cargo.lock`.)" msgstr "" -#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md +#: src/chromium/cargo.md msgid "" -"Its error handling is based around C++ exceptions (given on the next slide)" +"Students may identify the following items as being implicitly or explicitly " +"trusted:" msgstr "" -#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md -msgid "Function pointers are awkward to use." +#: src/chromium/cargo.md +msgid "" +"`rustc` (the Rust compiler) which in turn depends on the LLVM libraries, the " +"Clang compiler, the `rustc` sources (fetched from GitHub, reviewed by Rust " +"compiler team), binary Rust compiler downloaded for bootstrapping" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling.md +#: src/chromium/cargo.md msgid "" -"CXX's [support for `Result`](https://cxx.rs/binding/result.html) relies " -"on C++ exceptions, so we can't use that in Chromium. Alternatives:" +"`rustup` (it may be worth pointing out that `rustup` is developed under the " +"umbrella of the https://github.com/rust-lang/ organization - same as `rustc`)" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling.md -msgid "The `T` part of `Result` can be:" +#: src/chromium/cargo.md +msgid "`cargo`, `rustfmt`, etc." msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling.md +#: src/chromium/cargo.md msgid "" -"Returned via out parameters (e.g. via `&mut T`). This requires that `T` can " -"be passed across the FFI boundary - for example `T` has to be:" -msgstr "" - -#: src/chromium/interoperability-with-cpp/error-handling.md -msgid "A primitive type (like `u32` or `usize`)" +"Various internal infrastructure (bots that build `rustc`, system for " +"distributing the prebuilt toolchain to Chromium engineers, etc.)" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling.md -msgid "" -"A type natively supported by `cxx` (like `UniquePtr`) that has a suitable " -"default value to use in a failure case (_unlike_ `Box`)." +#: src/chromium/cargo.md +msgid "Cargo tools like `cargo audit`, `cargo vet`, etc." msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling.md +#: src/chromium/cargo.md msgid "" -"Retained on the Rust side, and exposed via reference. This may be needed " -"when `T` is a Rust type, which cannot be passed across the FFI boundary, and " -"cannot be stored in `UniquePtr`." +"Rust libraries vendored into `//third_party/rust` (audited by " +"security@chromium.org)" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling.md -msgid "The `E` part of `Result` can be:" +#: src/chromium/cargo.md +msgid "Other Rust libraries (some niche, some quite popular and commonly used)" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling.md -msgid "" -"Returned as a boolean (e.g. `true` representing success, and `false` " -"representing failure)" +#: src/chromium/policy.md +msgid "Chromium Rust policy" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling.md +#: src/chromium/policy.md msgid "" -"Preserving error details is in theory possible, but so far hasn't been " -"needed in practice." +"Chromium's Rust policy can be found [here](https://source.chromium.org/" +"chromium/chromium/src/+/main:docs/rust.md;l=22). Rust can be used for both " +"first-party and third-party code." msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling-qr.md -msgid "CXX Error Handling: QR Example" +#: src/chromium/policy.md +msgid "Using Rust for pure first-party code looks like this:" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling-qr.md +#: src/chromium/policy.md +#, fuzzy msgid "" -"The QR code generator is [an example](https://source.chromium.org/chromium/" -"chromium/src/+/main:components/qr_code_generator/qr_code_generator_ffi_glue." -"rs;l=13-18;drc=7bf1b75b910ca430501b9c6a74c1d18a0223ecca) where a boolean is " -"used to communicate success vs failure, and where the successful result can " -"be passed across the FFI boundary:" -msgstr "" - -#: src/chromium/interoperability-with-cpp/error-handling-qr.md -msgid "\"qr_code_generator\"" +"```bob\n" +"\"C++\" Rust\n" +".- - - - - - - - - -. .- - - - - - - - - - -.\n" +": : : :\n" +": Existing Chromium : : Chromium Rust :\n" +": \"C++\" : : code :\n" +": +---------------+ : : +----------------+ :\n" +": | | : : | | :\n" +": | o-----+-+-----------+-+-> | :\n" +": | | : Language : | | :\n" +": +---------------+ : boundary : +----------------+ :\n" +": : : :\n" +"`- - - - - - - - - -' `- - - - - - - - - - -'\n" +"```" msgstr "" +"```bob\n" +" Stak Heap\n" +".- - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - - " +"-.\n" +": : : :\n" +": " +"list : : :\n" +": +----+----+ : : +----+----+ +----+------" +"+ :\n" +": | 1 | o--+-----------+-----+--->| 2 | o--+--->| // | null " +"| :\n" +": +----+----+ : : +----+----+ +----+------" +"+ :\n" +": : : :\n" +": : : :\n" +"`- - - - - - - - - - - - -' '- - - - - - - - - - - - - - - - - - - - - - " +"-'\n" +"```" -#: src/chromium/interoperability-with-cpp/error-handling-qr.md +#: src/chromium/policy.md msgid "" -"Students may be curious about the semantics of the `out_qr_size` output. " -"This is not the size of the vector, but the size of the QR code (and " -"admittedly it is a bit redundant - this is the square root of the size of " -"the vector)." +"The third-party case is also common. It's likely that you'll also need a " +"small amount of first-party glue code, because very few Rust libraries " +"directly expose a C/C++ API." msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling-qr.md +#: src/chromium/policy.md +#, fuzzy msgid "" -"It may be worth pointing out the importance of initializing `out_qr_size` " -"before calling into the Rust function. Creation of a Rust reference that " -"points to uninitialized memory results in Undefined Behavior (unlike in C++, " -"when only the act of dereferencing such memory results in UB)." +"```bob\n" +"\"C++\" Rust\n" +".- - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - - " +"-.\n" +": : : :\n" +": Existing Chromium : : Chromium Rust Existing " +"Rust :\n" +": \"C++\" : : \"wrapper\" " +"crate :\n" +": +---------------+ : : +----------------+ +-------------" +"+ :\n" +": | | : : | | | " +"| :\n" +": | o-----+-+-----------+-+-> o-+----------+--> " +"| :\n" +": | | : Language : | | Crate | " +"| :\n" +": +---------------+ : boundary : +----------------+ API +-------------" +"+ :\n" +": : : :\n" +"`- - - - - - - - - -' `- - - - - - - - - - - - - - - - - - - - - - " +"-'\n" +"```" msgstr "" +"```bob\n" +" Stak Heap\n" +".- - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - - - " +"-.\n" +": : : :\n" +": " +"list : : :\n" +": +----+----+ : : +----+----+ +----+------" +"+ :\n" +": | 1 | o--+-----------+-----+--->| 2 | o--+--->| // | null " +"| :\n" +": +----+----+ : : +----+----+ +----+------" +"+ :\n" +": : : :\n" +": : : :\n" +"`- - - - - - - - - - - - -' '- - - - - - - - - - - - - - - - - - - - - - " +"-'\n" +"```" -#: src/chromium/interoperability-with-cpp/error-handling-qr.md +#: src/chromium/policy.md msgid "" -"If students ask about `Pin`, then explain why CXX needs it for mutable " -"references to C++ data: the answer is that C++ data can’t be moved around " -"like Rust data, because it may contain self-referential pointers." +"The scenario of using a third-party crate is the more complex one, so " +"today's course will focus on:" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling-png.md -msgid "CXX Error Handling: PNG Example" +#: src/chromium/policy.md +msgid "Bringing in third-party Rust libraries (\"crates\")" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling-png.md +#: src/chromium/policy.md msgid "" -"A prototype of a PNG decoder illustrates what can be done when the " -"successful result cannot be passed across the FFI boundary:" +"Writing glue code to be able to use those crates from Chromium C++. (The " +"same techniques are used when working with first-party Rust code)." msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling-png.md -#, fuzzy -msgid "\"gfx::rust_bindings\"" -msgstr "\"bindings\"" - -#: src/chromium/interoperability-with-cpp/error-handling-png.md -msgid "" -"/// This returns an FFI-friendly equivalent of `Result,\n" -" /// ()>`.\n" +#: src/chromium/build-rules.md +msgid "Build rules" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling-png.md -msgid "/// C++ bindings for the `crate::png::ResultOfPngReader` type.\n" +#: src/chromium/build-rules.md +msgid "" +"Rust code is usually built using `cargo`. Chromium builds with `gn` and " +"`ninja` for efficiency --- its static rules allow maximum parallelism. Rust " +"is no exception." msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling-png.md -msgid "/// C++ bindings for the `crate::png::PngReader` type.\n" +#: src/chromium/build-rules.md +msgid "Adding Rust code to Chromium" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling-png.md +#: src/chromium/build-rules.md msgid "" -"`PngReader` and `ResultOfPngReader` are Rust types --- objects of these " -"types cannot cross the FFI boundary without indirection of a `Box`. We " -"can't have an `out_parameter: &mut PngReader`, because CXX doesn't allow C++ " -"to store Rust objects by value." +"In some existing Chromium `BUILD.gn` file, declare a `rust_static_library`:" msgstr "" -#: src/chromium/interoperability-with-cpp/error-handling-png.md +#: src/chromium/build-rules.md msgid "" -"This example illustrates that even though CXX doesn't support arbitrary " -"generics nor templates, we can still pass them across the FFI boundary by " -"manually specializing / monomorphizing them into a non-generic type. In the " -"example `ResultOfPngReader` is a non-generic type that forwards into " -"appropriate methods of `Result` (e.g. into `is_err`, `unwrap`, and/or " -"`as_mut`)." +"```gn\n" +"import(\"//build/rust/rust_static_library.gni\")\n" +"\n" +"rust_static_library(\"my_rust_lib\") {\n" +" crate_root = \"lib.rs\"\n" +" sources = [ \"lib.rs\" ]\n" +"}\n" +"```" msgstr "" -#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md -msgid "Using cxx in Chromium" +#: src/chromium/build-rules.md +msgid "" +"You can also add `deps` on other Rust targets. Later we'll use this to " +"depend upon third party code." msgstr "" -#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +#: src/chromium/build-rules.md msgid "" -"In Chromium, we define an independent `#[cxx::bridge] mod` for each leaf-" -"node where we want to use Rust. You'd typically have one for each " -"`rust_static_library`. Just add" +"You must specify _both_ the crate root, _and_ a full list of sources. The " +"`crate_root` is the file given to the Rust compiler representing the root " +"file of the compilation unit --- typically `lib.rs`. `sources` is a complete " +"list of all source files which `ninja` needs in order to determine when " +"rebuilds are necessary." msgstr "" -#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +#: src/chromium/build-rules.md msgid "" -"```gn\n" -"cxx_bindings = [ \"my_rust_file.rs\" ]\n" -" # list of files containing #[cxx::bridge], not all source files\n" -"allow_unsafe = true\n" -"```" +"(There's no such thing as a Rust `source_set`, because in Rust, an entire " +"crate is a compilation unit. A `static_library` is the smallest unit.)" msgstr "" -#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +#: src/chromium/build-rules.md msgid "" -"to your existing `rust_static_library` target alongside `crate_root` and " -"`sources`." +"Students might be wondering why we need a gn template, rather than using " +"[gn's built-in support for Rust static libraries](https://" +"gn.googlesource.com/gn/+/main/docs/reference.md#func_static_library). The " +"answer is that this template provides support for CXX interop, Rust " +"features, and unit tests, some of which we'll use later." msgstr "" -#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md -msgid "C++ headers will be generated at a sensible location, so you can just" +#: src/chromium/build-rules/unsafe.md +msgid "Including `unsafe` Rust Code" msgstr "" -#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md -msgid "\"ui/base/my_rust_file.rs.h\"" +#: src/chromium/build-rules/unsafe.md +msgid "" +"Unsafe Rust code is forbidden in `rust_static_library` by default --- it " +"won't compile. If you need unsafe Rust code, add `allow_unsafe = true` to " +"the gn target. (Later in the course we'll see circumstances where this is " +"necessary.)" msgstr "" -#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +#: src/chromium/build-rules/unsafe.md msgid "" -"You will find some utility functions in `//base` to convert to/from Chromium " -"C++ types to CXX Rust types --- for example [`SpanToRustSlice`](https://" -"source.chromium.org/chromium/chromium/src/+/main:base/containers/span_rust.h;" -"l=21)." +"```gn\n" +"import(\"//build/rust/rust_static_library.gni\")\n" +"\n" +"rust_static_library(\"my_rust_lib\") {\n" +" crate_root = \"lib.rs\"\n" +" sources = [\n" +" \"lib.rs\",\n" +" \"hippopotamus.rs\"\n" +" ]\n" +" allow_unsafe = true\n" +"}\n" +"```" msgstr "" -#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md -msgid "Students may ask --- why do we still need `allow_unsafe = true`?" +#: src/chromium/build-rules/depending.md +msgid "Simply add the above target to the `deps` of some Chromium C++ target." msgstr "" -#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +#: src/chromium/build-rules/depending.md msgid "" -"The broad answer is that no C/C++ code is \"safe\" by the normal Rust " -"standards. Calling back and forth to C/C++ from Rust may do arbitrary things " -"to memory, and compromise the safety of Rust's own data layouts. Presence of " -"_too many_ `unsafe` keywords in C/C++ interop can harm the signal-to-noise " -"ratio of such a keyword, and is [controversial](https://steveklabnik.com/" -"writing/the-cxx-debate), but strictly, bringing any foreign code into a Rust " -"binary can cause unexpected behavior from Rust's perspective." +"```gn\n" +"import(\"//build/rust/rust_static_library.gni\")\n" +"\n" +"rust_static_library(\"my_rust_lib\") {\n" +" crate_root = \"lib.rs\"\n" +" sources = [ \"lib.rs\" ]\n" +"}\n" +"\n" +"# or source_set, static_library etc.\n" +"component(\"preexisting_cpp\") {\n" +" deps = [ \":my_rust_lib\" ]\n" +"}\n" +"```" msgstr "" -#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +#: src/chromium/build-rules/vscode.md msgid "" -"The narrow answer lies in the diagram at the top of [this page](../" -"interoperability-with-cpp.md) --- behind the scenes, CXX generates Rust " -"`unsafe` and `extern \"C\"` functions just like we did manually in the " -"previous section." +"Types are elided in Rust code, which makes a good IDE even more useful than " +"for C++. Visual Studio code works well for Rust in Chromium. To use it," msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Exercise: Interoperability with C++" +#: src/chromium/build-rules/vscode.md +msgid "" +"Ensure your VSCode has the `rust-analyzer` extension, not earlier forms of " +"Rust support" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Part one" +#: src/chromium/build-rules/vscode.md +msgid "" +"`gn gen out/Debug --export-rust-project` (or equivalent for your output " +"directory)" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/chromium/build-rules/vscode.md +msgid "`ln -s out/Debug/rust-project.json rust-project.json`" +msgstr "" + +#: src/chromium/build-rules/vscode.md msgid "" -"In the Rust file you previously created, add a `#[cxx::bridge]` which " -"specifies a single function, to be called from C++, called " -"`hello_from_rust`, taking no parameters and returning no value." +"A demo of some of the code annotation and exploration features of rust-" +"analyzer might be beneficial if the audience are naturally skeptical of IDEs." msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/chromium/build-rules/vscode.md msgid "" -"Modify your previous `hello_from_rust` function to remove `extern \"C\"` and " -"`#[no_mangle]`. This is now just a standard Rust function." +"The following steps may help with the demo (but feel free to instead use a " +"piece of Chromium-related Rust that you are most familiar with):" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Modify your `gn` target to build these bindings." +#: src/chromium/build-rules/vscode.md +msgid "Open `components/qr_code_generator/qr_code_generator_ffi_glue.rs`" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/chromium/build-rules/vscode.md msgid "" -"In your C++ code, remove the forward-declaration of `hello_from_rust`. " -"Instead, include the generated header file." -msgstr "" - -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Build and run!" -msgstr "" - -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Part two" +"Place the cursor over the `QrCode::new` call (around line 26) in " +"\\`qr_code_generator_ffi_glue.rs" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/chromium/build-rules/vscode.md msgid "" -"It's a good idea to play with CXX a little. It helps you think about how " -"flexible Rust in Chromium actually is." +"Demo **show documentation** (typical bindings: vscode = ctrl k i; vim/CoC = " +"K)." msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Some things to try:" +#: src/chromium/build-rules/vscode.md +msgid "" +"Demo **go to definition** (typical bindings: vscode = F12; vim/CoC = g d). " +"(This will take you to `//third_party/rust/.../qr_code-.../src/lib.rs`.)" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Call back into C++ from Rust. You will need:" +#: src/chromium/build-rules/vscode.md +msgid "" +"Demo **outline** and navigate to the `QrCode::with_bits` method (around line " +"164; the outline is in the file explorer pane in vscode; typical vim/CoC " +"bindings = space o)" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/chromium/build-rules/vscode.md msgid "" -"An additional header file which you can `include!` from your `cxx::bridge`. " -"You'll need to declare your C++ function in that new header file." +"Demo **type annotations** (there are quite a few nice examples in the " +"`QrCode::with_bits` method)" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/chromium/build-rules/vscode.md msgid "" -"An `unsafe` block to call such a function, or alternatively specify the " -"`unsafe` keyword in your `#[cxx::bridge]` [as described here](https://cxx.rs/" -"extern-c++.html#functions-and-member-functions)." +"It may be worth pointing out that `gn gen ... --export-rust-project` will " +"need to be rerun after editing `BUILD.gn` files (which we will do a few " +"times throughout the exercises in this session)." msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "" -"You may also need to `#include \"third_party/rust/cxx/v1/crate/include/cxx." -"h\"`" +#: src/exercises/chromium/build-rules.md +msgid "Build rules exercise" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Pass a C++ string from C++ into Rust." +#: src/exercises/chromium/build-rules.md +msgid "" +"In your Chromium build, add a new Rust target to `//ui/base/BUILD.gn` " +"containing:" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Pass a reference to a C++ object into Rust." +#: src/exercises/chromium/build-rules.md src/bare-metal/aps/inline-assembly.md +#: src/bare-metal/aps/uart/using.md src/bare-metal/aps/safemmio/using.md +#: src/bare-metal/aps/logging/using.md +msgid "// SAFETY: There is no other global function of this name.\n" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/exercises/chromium/build-rules.md msgid "" -"Intentionally get the Rust function signatures mismatched from the `#[cxx::" -"bridge]`, and get used to the errors you see." +"**Important**: note that `no_mangle` here is considered a type of unsafety " +"by the Rust compiler, so you'll need to allow unsafe code in your `gn` " +"target." msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/exercises/chromium/build-rules.md msgid "" -"Intentionally get the C++ function signatures mismatched from the `#[cxx::" -"bridge]`, and get used to the errors you see." +"Add this new Rust target as a dependency of `//ui/base:base`. Declare this " +"function at the top of `ui/base/resource/resource_bundle.cc` (later, we'll " +"see how this can be automated by bindings generation tools):" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/exercises/chromium/build-rules.md msgid "" -"Pass a `std::unique_ptr` of some type from C++ into Rust, so that Rust can " -"own some C++ object." +"Call this function from somewhere in `ui/base/resource/resource_bundle.cc` - " +"we suggest the top of `ResourceBundle::MaybeMangleLocalizedString`. Build " +"and run Chromium, and ensure that \"Hello from Rust!\" is printed lots of " +"times." msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/exercises/chromium/build-rules.md msgid "" -"Create a Rust object and pass it into C++, so that C++ owns it. (Hint: you " -"need a `Box`)." +"If you use VSCode, now set up Rust to work well in VSCode. It will be useful " +"in subsequent exercises. If you've succeeded, you will be able to use right-" +"click \"Go to definition\" on `println!`." msgstr "" +#: src/exercises/chromium/build-rules.md #: src/exercises/chromium/interoperability-with-cpp.md -msgid "Declare some methods on a C++ type. Call them from Rust." +msgid "Where to find help" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Declare some methods on a Rust type. Call them from C++." +#: src/exercises/chromium/build-rules.md +msgid "" +"The options available to the [`rust_static_library` gn template](https://" +"source.chromium.org/chromium/chromium/src/+/main:build/rust/" +"rust_static_library.gni;l=16)" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Part three" +#: src/exercises/chromium/build-rules.md +msgid "" +"Information about [`#[unsafe(no_mangle)]`](https://doc.rust-lang.org/beta/" +"reference/abi.html#the-no_mangle-attribute)" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/exercises/chromium/build-rules.md msgid "" -"Now you understand the strengths and limitations of CXX interop, think of a " -"couple of use-cases for Rust in Chromium where the interface would be " -"sufficiently simple. Sketch how you might define that interface." +"Information about [`extern \"C\"`](https://doc.rust-lang.org/std/" +"keyword.extern.html)" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "The [`cxx` binding reference](https://cxx.rs/bindings.html)" +#: src/exercises/chromium/build-rules.md +msgid "" +"Information about gn's [`--export-rust-project`](https://gn.googlesource.com/" +"gn/+/main/docs/reference.md#compilation-database) switch" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/exercises/chromium/build-rules.md msgid "" -"The [`rust_static_library` gn template](https://source.chromium.org/chromium/" -"chromium/src/+/main:build/rust/rust_static_library.gni;l=16)" +"[How to install rust-analyzer in VSCode](https://code.visualstudio.com/docs/" +"languages/rust)" msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md -msgid "Some of the questions you may encounter:" +#: src/exercises/chromium/build-rules.md +msgid "" +"This example is unusual because it boils down to the lowest-common-" +"denominator interop language, C. Both C++ and Rust can natively declare and " +"call C ABI functions. Later in the course, we'll connect C++ directly to " +"Rust." msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/exercises/chromium/build-rules.md msgid "" -"I'm seeing a problem initializing a variable of type X with type Y, where X " -"and Y are both function types. This is because your C++ function doesn't " -"quite match the declaration in your `cxx::bridge`." +"`allow_unsafe = true` is required here because `#[unsafe(no_mangle)]` might " +"allow Rust to generate two functions with the same name, and Rust can no " +"longer guarantee that the right one is called." msgstr "" -#: src/exercises/chromium/interoperability-with-cpp.md +#: src/exercises/chromium/build-rules.md msgid "" -"I seem to be able to freely convert C++ references into Rust references. " -"Doesn't that risk UB? For CXX's _opaque_ types, no, because they are zero-" -"sized. For CXX trivial types yes, it's _possible_ to cause UB, although " -"CXX's design makes it quite difficult to craft such an example." +"If you need a pure Rust executable, you can also do that using the " +"`rust_executable` gn template." msgstr "" -#: src/chromium/adding-third-party-crates.md +#: src/chromium/testing.md msgid "" -"Rust libraries are called \"crates\" and are found at [crates.io](https://" -"crates.io). It's _very easy_ for Rust crates to depend upon one another. So " -"they do!" +"Rust community typically authors unit tests in a module placed in the same " +"source file as the code being tested. This was covered [earlier](../" +"testing.md) in the course and looks like this:" msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "C++ library" +#: src/chromium/testing.md +msgid "" +"In Chromium we place unit tests in a separate source file and we continue to " +"follow this practice for Rust --- this makes tests consistently discoverable " +"and helps to avoid rebuilding `.rs` files a second time (in the `test` " +"configuration)." msgstr "" -#: src/chromium/adding-third-party-crates.md -#, fuzzy -msgid "Rust crate" -msgstr "Rust's økosystem" - -#: src/chromium/adding-third-party-crates.md -#, fuzzy -msgid "Build system" -msgstr "Rust's økosystem" - -#: src/chromium/adding-third-party-crates.md -msgid "Lots" +#: src/chromium/testing.md +msgid "" +"This results in the following options for testing Rust code in Chromium:" msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "Consistent: `Cargo.toml`" +#: src/chromium/testing.md +msgid "" +"Native Rust tests (i.e. `#[test]`). Discouraged outside of `//third_party/" +"rust`." msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "Typical library size" +#: src/chromium/testing.md +msgid "" +"`gtest` tests authored in C++ and exercising Rust via FFI calls. Sufficient " +"when Rust code is just a thin FFI layer and the existing unit tests provide " +"sufficient coverage for the feature." msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "Large-ish" +#: src/chromium/testing.md +msgid "" +"`gtest` tests authored in Rust and using the crate under test through its " +"public API (using `pub mod for_testing { ... }` if needed). This is the " +"subject of the next few slides." msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "Small" +#: src/chromium/testing.md +msgid "" +"Mention that native Rust tests of third-party crates should eventually be " +"exercised by Chromium bots. (Such testing is needed rarely --- only after " +"adding or updating third-party crates.)" msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "Transitive dependencies" +#: src/chromium/testing.md +msgid "" +"Some examples may help illustrate when C++ `gtest` vs Rust `gtest` should be " +"used:" msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "Few" +#: src/chromium/testing.md +msgid "" +"QR has very little functionality in the first-party Rust layer (it's just a " +"thin FFI glue) and therefore uses the existing C++ unit tests for testing " +"both the C++ and the Rust implementation (parameterizing the tests so they " +"enable or disable Rust using a `ScopedFeatureList`)." msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "For a Chromium engineer, this has pros and cons:" +#: src/chromium/testing.md +msgid "" +"Hypothetical/WIP PNG integration may need memory-safe implementations of " +"pixel transformations that are provided by `libpng` but missing in the `png` " +"crate - e.g. RGBA => BGRA, or gamma correction. Such functionality may " +"benefit from separate tests authored in Rust." msgstr "" -#: src/chromium/adding-third-party-crates.md +#: src/chromium/testing/rust-gtest-interop.md msgid "" -"All crates use a common build system so we can automate their inclusion into " -"Chromium..." +"The [`rust_gtest_interop`](https://chromium.googlesource.com/chromium/src/+/" +"main/testing/rust_gtest_interop/README.md) library provides a way to:" msgstr "" -#: src/chromium/adding-third-party-crates.md +#: src/chromium/testing/rust-gtest-interop.md msgid "" -"... but, crates typically have transitive dependencies, so you will likely " -"have to bring in multiple libraries." +"Use a Rust function as a `gtest` testcase (using the `#[gtest(...)]` " +"attribute)" msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "We'll discuss:" +#: src/chromium/testing/rust-gtest-interop.md +msgid "" +"Use `expect_eq!` and similar macros (similar to `assert_eq!` but not " +"panicking and not terminating the test when the assertion fails)." msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "How to put a crate in the Chromium source code tree" +#: src/chromium/testing/rust-gtest-interop.md +#, fuzzy +msgid "Example:" +msgstr "Eksempel" + +#: src/chromium/testing/build-gn.md +msgid "" +"The simplest way to build Rust `gtest` tests is to add them to an existing " +"test binary that already contains tests authored in C++. For example:" msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "How to make `gn` build rules for it" +#: src/chromium/testing/build-gn.md +msgid "" +"```gn\n" +"test(\"ui_base_unittests\") {\n" +" ...\n" +" sources += [ \"my_rust_lib_unittest.rs\" ]\n" +" deps += [ \":my_rust_lib\" ]\n" +"}\n" +"```" msgstr "" -#: src/chromium/adding-third-party-crates.md -msgid "How to audit its source code for sufficient safety." +#: src/chromium/testing/build-gn.md +msgid "" +"Authoring Rust tests in a separate `static_library` also works, but requires " +"manually declaring the dependency on the support libraries:" msgstr "" -#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md -msgid "Configuring the `Cargo.toml` file to add crates" -msgstr "" - -#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md -msgid "" -"Chromium has a single set of centrally-managed direct crate dependencies. " -"These are managed through a single [`Cargo.toml`](https://source.chromium." -"org/chromium/chromium/src/+/main:third_party/rust/chromium_crates_io/Cargo." -"toml):" -msgstr "" - -#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md +#: src/chromium/testing/build-gn.md msgid "" -"```toml\n" -"[dependencies]\n" -"bitflags = \"1\"\n" -"cfg-if = \"1\"\n" -"cxx = \"1\"\n" -"# lots more...\n" +"```gn\n" +"rust_static_library(\"my_rust_lib_unittests\") {\n" +" testonly = true\n" +" is_gtest_unittests = true\n" +" crate_root = \"my_rust_lib_unittest.rs\"\n" +" sources = [ \"my_rust_lib_unittest.rs\" ]\n" +" deps = [\n" +" \":my_rust_lib\",\n" +" \"//testing/rust_gtest_interop\",\n" +" ]\n" +"}\n" +"\n" +"test(\"ui_base_unittests\") {\n" +" ...\n" +" deps += [ \":my_rust_lib_unittests\" ]\n" +"}\n" "```" msgstr "" -#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md +#: src/chromium/testing/chromium-import-macro.md msgid "" -"As with any other `Cargo.toml`, you can specify [more details about the " -"dependencies](https://doc.rust-lang.org/cargo/reference/specifying-" -"dependencies.html) --- most commonly, you'll want to specify the `features` " -"that you wish to enable in the crate." +"After adding `:my_rust_lib` to GN `deps`, we still need to learn how to " +"import and use `my_rust_lib` from `my_rust_lib_unittest.rs`. We haven't " +"provided an explicit `crate_name` for `my_rust_lib` so its crate name is " +"computed based on the full target path and name. Fortunately we can avoid " +"working with such an unwieldy name by using the `chromium::import!` macro " +"from the automatically-imported `chromium` crate:" msgstr "" -#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md -msgid "" -"When adding a crate to Chromium, you'll often need to provide some extra " -"information in an additional file, `gnrt_config.toml`, which we'll meet next." +#: src/chromium/testing/chromium-import-macro.md +msgid "\"//ui/base:my_rust_lib\"" msgstr "" -#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md -msgid "" -"Alongside `Cargo.toml` is [`gnrt_config.toml`](https://source.chromium.org/" -"chromium/chromium/src/+/main:third_party/rust/chromium_crates_io/gnrt_config." -"toml). This contains Chromium-specific extensions to crate handling." +#: src/chromium/testing/chromium-import-macro.md +msgid "Under the covers the macro expands to something similar to:" msgstr "" -#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md +#: src/chromium/testing/chromium-import-macro.md msgid "" -"If you add a new crate, you should specify at least the `group`. This is one " -"of:" -msgstr "" - -#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md -#: src/chromium/adding-third-party-crates/depending-on-a-crate.md -msgid "For instance," +"More information can be found in [the doc comment](https://" +"source.chromium.org/chromium/chromium/src/+/main:build/rust/chromium_prelude/" +"chromium_prelude.rs?q=f:chromium_prelude.rs%20pub.use.*%5Cbimport%5Cb;%20-" +"f:third_party&ss=chromium%2Fchromium%2Fsrc) of the `chromium::import` macro." msgstr "" -#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md +#: src/chromium/testing/chromium-import-macro.md msgid "" -"Depending on the crate source code layout, you may also need to use this " -"file to specify where its `LICENSE` file(s) can be found." +"`rust_static_library` supports specifying an explicit name via `crate_name` " +"property, but doing this is discouraged. And it is discouraged because the " +"crate name has to be globally unique. crates.io guarantees uniqueness of its " +"crate names so `cargo_crate` GN targets (generated by the `gnrt` tool " +"covered in a later section) use short crate names." msgstr "" -#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md -msgid "" -"Later, we'll see some other things you will need to configure in this file " -"to resolve problems." -msgstr "" +#: src/exercises/chromium/testing.md +#, fuzzy +msgid "Testing exercise" +msgstr "Øvelser" -#: src/chromium/adding-third-party-crates/downloading-crates.md -msgid "" -"A tool called `gnrt` knows how to download crates and how to generate `BUILD." -"gn` rules." +#: src/exercises/chromium/testing.md +msgid "Time for another exercise!" msgstr "" -#: src/chromium/adding-third-party-crates/downloading-crates.md -msgid "To start, download the crate you want like this:" +#: src/exercises/chromium/testing.md +msgid "In your Chromium build:" msgstr "" -#: src/chromium/adding-third-party-crates/downloading-crates.md +#: src/exercises/chromium/testing.md msgid "" -"Although the `gnrt` tool is part of the Chromium source code, by running " -"this command you will be downloading and running its dependencies from " -"`crates.io`. See [the earlier section](../cargo.md) discussing this security " -"decision." +"Add a testable function next to `hello_from_rust`. Some suggestions: adding " +"two integers received as arguments, computing the nth Fibonacci number, " +"summing integers in a slice, etc." msgstr "" -#: src/chromium/adding-third-party-crates/downloading-crates.md -msgid "This `vendor` command may download:" +#: src/exercises/chromium/testing.md +msgid "Add a separate `..._unittest.rs` file with a test for the new function." msgstr "" -#: src/chromium/adding-third-party-crates/downloading-crates.md -#, fuzzy -msgid "Your crate" -msgstr "\"Sokrates\"" - -#: src/chromium/adding-third-party-crates/downloading-crates.md -msgid "Direct and transitive dependencies" +#: src/exercises/chromium/testing.md +msgid "Add the new tests to `BUILD.gn`." msgstr "" -#: src/chromium/adding-third-party-crates/downloading-crates.md -msgid "" -"New versions of other crates, as required by `cargo` to resolve the complete " -"set of crates required by Chromium." +#: src/exercises/chromium/testing.md +msgid "Build the tests, run them, and verify that the new test works." msgstr "" -#: src/chromium/adding-third-party-crates/downloading-crates.md +#: src/chromium/interoperability-with-cpp.md msgid "" -"Chromium maintains patches for some crates, kept in `//third_party/rust/" -"chromium_crates_io/patches`. These will be reapplied automatically, but if " -"patching fails you may need to take manual action." +"The Rust community offers multiple options for C++/Rust interop, with new " +"tools being developed all the time. At the moment, Chromium uses a tool " +"called CXX." msgstr "" -#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md +#: src/chromium/interoperability-with-cpp.md msgid "" -"Once you've downloaded the crate, generate the `BUILD.gn` files like this:" +"You describe your whole language boundary in an interface definition " +"language (which looks a lot like Rust) and then CXX tools generate " +"declarations for functions and types in both Rust and C++." msgstr "" -#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md -msgid "Now run `git status`. You should find:" +#: src/chromium/interoperability-with-cpp.md +msgid "" +"See the [CXX tutorial](https://cxx.rs/tutorial.html) for a full example of " +"using this." msgstr "" -#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md +#: src/chromium/interoperability-with-cpp.md msgid "" -"At least one new crate source code in `third_party/rust/chromium_crates_io/" -"vendor`" +"Talk through the diagram. Explain that behind the scenes, this is doing just " +"the same as you previously did. Point out that automating the process has " +"the following benefits:" msgstr "" -#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md +#: src/chromium/interoperability-with-cpp.md msgid "" -"At least one new `BUILD.gn` in `third_party/rust//v`" +"The tool guarantees that the C++ and Rust sides match (e.g. you get compile " +"errors if the `#[cxx::bridge]` doesn't match the actual C++ or Rust " +"definitions, but with out-of-sync manual bindings you'd get Undefined " +"Behavior)" msgstr "" -#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md -msgid "An appropriate `README.chromium`" +#: src/chromium/interoperability-with-cpp.md +msgid "" +"The tool automates generation of FFI thunks (small, C-ABI-compatible, free " +"functions) for non-C features (e.g. enabling FFI calls into Rust or C++ " +"methods; manual bindings would require authoring such top-level, free " +"functions manually)" msgstr "" -#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md -msgid "" -"The \"major semver version\" is a [Rust \"semver\" version number](https://" -"doc.rust-lang.org/cargo/reference/semver.html)." +#: src/chromium/interoperability-with-cpp.md +msgid "The tool and the library can handle a set of core types - for example:" msgstr "" -#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md +#: src/chromium/interoperability-with-cpp.md msgid "" -"Take a close look, especially at the things generated in `third_party/rust`." +"`&[T]` can be passed across the FFI boundary, even though it doesn't " +"guarantee any particular ABI or memory layout. With manual bindings " +"`std::span` / `&[T]` have to be manually destructured and rebuilt out of " +"a pointer and length - this is error-prone given that each language " +"represents empty slices slightly differently)" msgstr "" -#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md +#: src/chromium/interoperability-with-cpp.md msgid "" -"Talk a little about semver --- and specifically the way that in Chromium " -"it's to allow multiple incompatible versions of a crate, which is " -"discouraged but sometimes necessary in the Cargo ecosystem." +"Smart pointers like `std::unique_ptr`, `std::shared_ptr`, and/or `Box` " +"are natively supported. With manual bindings, one would have to pass C-ABI-" +"compatible raw pointers, which would increase lifetime and memory-safety " +"risks." msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md +#: src/chromium/interoperability-with-cpp.md msgid "" -"If your build fails, it may be because of a `build.rs`: programs which do " -"arbitrary things at build time. This is fundamentally at odds with the " -"design of `gn` and `ninja` which aim for static, deterministic, build rules " -"to maximize parallelism and repeatability of builds." +"`rust::String` and `CxxString` types understand and maintain differences in " +"string representation across the languages (e.g. `rust::String::lossy` can " +"build a Rust string from non-UTF8 input and `rust::String::c_str` can NUL-" +"terminate a string)." msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md +#: src/chromium/interoperability-with-cpp/example-bindings.md msgid "" -"Some `build.rs` actions are automatically supported; others require action:" +"CXX requires that the whole C++/Rust boundary is declared in `cxx::bridge` " +"modules inside `.rs` source code." msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "build script effect" +#: src/chromium/interoperability-with-cpp/example-bindings.md +msgid "\"example/include/blobstore.h\"" msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "Supported by our gn templates" +#: src/chromium/interoperability-with-cpp/example-bindings.md +msgid "// Definitions of Rust types and functions go here\n" msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "Work required by you" +#: src/chromium/interoperability-with-cpp/example-bindings.md +msgid "Point out:" msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "Checking rustc version to configure features on and off" +#: src/chromium/interoperability-with-cpp/example-bindings.md +msgid "" +"Although this looks like a regular Rust `mod`, the `#[cxx::bridge]` " +"procedural macro does complex things to it. The generated code is quite a " +"bit more sophisticated - though this does still result in a `mod` called " +"`ffi` in your code." msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "None" +#: src/chromium/interoperability-with-cpp/example-bindings.md +msgid "Native support for C++'s `std::unique_ptr` in Rust" msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "Checking platform or CPU to configure features on and off" +#: src/chromium/interoperability-with-cpp/example-bindings.md +msgid "Native support for Rust slices in C++" msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "Generating code" +#: src/chromium/interoperability-with-cpp/example-bindings.md +msgid "Calls from C++ to Rust, and Rust types (in the top part)" msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "Yes - specify in `gnrt_config.toml`" +#: src/chromium/interoperability-with-cpp/example-bindings.md +msgid "Calls from Rust to C++, and C++ types (in the bottom part)" msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "Building C/C++" +#: src/chromium/interoperability-with-cpp/example-bindings.md +msgid "" +"**Common misconception**: It _looks_ like a C++ header is being parsed by " +"Rust, but this is misleading. This header is never interpreted by Rust, but " +"simply `#include`d in the generated C++ code for the benefit of C++ " +"compilers." msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "Patch around it" +#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md +msgid "" +"By far the most useful page when using CXX is the [type reference](https://" +"cxx.rs/bindings.html)." msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md -msgid "Arbitrary other actions" +#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md +msgid "CXX fundamentally suits cases where:" msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems.md +#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md msgid "" -"Fortunately, most crates don't contain a build script, and fortunately, most " -"build scripts only do the top two actions." +"Your Rust-C++ interface is sufficiently simple that you can declare all of " +"it." msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md +#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md msgid "" -"If `ninja` complains about missing files, check the `build.rs` to see if it " -"writes source code files." +"You're using only the types natively supported by CXX already, for example " +"`std::unique_ptr`, `std::string`, `&[u8]` etc." msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md +#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md msgid "" -"If so, modify [`gnrt_config.toml`](../configuring-gnrt-config-toml.md) to " -"add `build-script-outputs` to the crate. If this is a transitive dependency, " -"that is, one on which Chromium code should not directly depend, also add " -"`allow-first-party-usage=false`. There are several examples already in that " -"file:" +"It has many limitations --- for example lack of support for Rust's `Option` " +"type." msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md +#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md msgid "" -"```toml\n" -"[crate.unicode-linebreak]\n" -"allow-first-party-usage = false\n" -"build-script-outputs = [\"tables.rs\"]\n" -"```" +"These limitations constrain us to using Rust in Chromium only for well " +"isolated \"leaf nodes\" rather than for arbitrary Rust-C++ interop. When " +"considering a use-case for Rust in Chromium, a good starting point is to " +"draft the CXX bindings for the language boundary to see if it appears simple " +"enough." msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md +#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md msgid "" -"Now rerun [`gnrt.py -- gen`](../generating-gn-build-rules.md) to regenerate " -"`BUILD.gn` files to inform ninja that this particular output file is input " -"to subsequent build steps." +"You should also discuss some of the other sticky points with CXX, for " +"example:" msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md +#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md msgid "" -"Some crates use the [`cc`](https://crates.io/crates/cc) crate to build and " -"link C/C++ libraries. Other crates parse C/C++ using [`bindgen`](https://" -"crates.io/crates/bindgen) within their build scripts. These actions can't be " -"supported in a Chromium context --- our gn, ninja and LLVM build system is " -"very specific in expressing relationships between build actions." -msgstr "" - -#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md -msgid "So, your options are:" +"Its error handling is based around C++ exceptions (given on the next slide)" msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md -msgid "Avoid these crates" +#: src/chromium/interoperability-with-cpp/limitations-of-cxx.md +msgid "Function pointers are awkward to use." msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md -msgid "Apply a patch to the crate." +#: src/chromium/interoperability-with-cpp/error-handling.md +msgid "" +"CXX's [support for `Result`](https://cxx.rs/binding/result.html) relies " +"on C++ exceptions, so we can't use that in Chromium. Alternatives:" msgstr "" -#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md -msgid "" -"Patches should be kept in `third_party/rust/chromium_crates_io/patches/" -"` - see for example the [patches against the `cxx` crate](https://" -"source.chromium.org/chromium/chromium/src/+/main:third_party/rust/" -"chromium_crates_io/patches/cxx/) - and will be applied automatically by " -"`gnrt` each time it upgrades the crate." +#: src/chromium/interoperability-with-cpp/error-handling.md +msgid "The `T` part of `Result` can be:" msgstr "" -#: src/chromium/adding-third-party-crates/depending-on-a-crate.md +#: src/chromium/interoperability-with-cpp/error-handling.md msgid "" -"Once you've added a third-party crate and generated build rules, depending " -"on a crate is simple. Find your `rust_static_library` target, and add a " -"`dep` on the `:lib` target within your crate." +"Returned via out parameters (e.g. via `&mut T`). This requires that `T` can " +"be passed across the FFI boundary - for example `T` has to be:" msgstr "" -#: src/chromium/adding-third-party-crates/depending-on-a-crate.md -msgid "Specifically," +#: src/chromium/interoperability-with-cpp/error-handling.md +msgid "A primitive type (like `u32` or `usize`)" msgstr "" -#: src/chromium/adding-third-party-crates/depending-on-a-crate.md +#: src/chromium/interoperability-with-cpp/error-handling.md msgid "" -"```bob\n" -" +------------+ +----------------------+\n" -"\"//third_party/rust\" | crate name | \"/v\" | major semver version | \":" -"lib\"\n" -" +------------+ +----------------------+\n" -"```" +"A type natively supported by `cxx` (like `UniquePtr`) that has a suitable " +"default value to use in a failure case (_unlike_ `Box`)." msgstr "" -#: src/chromium/adding-third-party-crates/depending-on-a-crate.md +#: src/chromium/interoperability-with-cpp/error-handling.md msgid "" -"```gn\n" -"rust_static_library(\"my_rust_lib\") {\n" -" crate_root = \"lib.rs\"\n" -" sources = [ \"lib.rs\" ]\n" -" deps = [ \"//third_party/rust/example_rust_crate/v1:lib\" ]\n" -"}\n" -"```" +"Retained on the Rust side, and exposed via reference. This may be needed " +"when `T` is a Rust type, which cannot be passed across the FFI boundary, and " +"cannot be stored in `UniquePtr`." msgstr "" -#: src/chromium/adding-third-party-crates/reviews-and-audits.md -msgid "Auditing Third Party Crates" +#: src/chromium/interoperability-with-cpp/error-handling.md +msgid "The `E` part of `Result` can be:" msgstr "" -#: src/chromium/adding-third-party-crates/reviews-and-audits.md +#: src/chromium/interoperability-with-cpp/error-handling.md msgid "" -"Adding new libraries is subject to Chromium's standard [policies](https://" -"chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/rust." -"md#Third_party-review), but of course also subject to security review. As " -"you may be bringing in not just a single crate but also transitive " -"dependencies, there may be a lot of code to review. On the other hand, safe " -"Rust code can have limited negative side effects. How should you review it?" +"Returned as a boolean (e.g. `true` representing success, and `false` " +"representing failure)" msgstr "" -#: src/chromium/adding-third-party-crates/reviews-and-audits.md +#: src/chromium/interoperability-with-cpp/error-handling.md msgid "" -"Over time Chromium aims to move to a process based around [cargo vet]" -"(https://mozilla.github.io/cargo-vet/)." +"Preserving error details is in theory possible, but so far hasn't been " +"needed in practice." msgstr "" -#: src/chromium/adding-third-party-crates/reviews-and-audits.md -msgid "" -"Meanwhile, for each new crate addition, we are checking for the following:" +#: src/chromium/interoperability-with-cpp/error-handling-qr.md +msgid "CXX Error Handling: QR Example" msgstr "" -#: src/chromium/adding-third-party-crates/reviews-and-audits.md +#: src/chromium/interoperability-with-cpp/error-handling-qr.md msgid "" -"Understand why each crate is used. What's the relationship between crates? " -"If the build system for each crate contains a `build.rs` or procedural " -"macros, work out what they're for. Are they compatible with the way Chromium " -"is normally built?" +"The QR code generator is [an example](https://source.chromium.org/chromium/" +"chromium/src/+/main:components/qr_code_generator/" +"qr_code_generator_ffi_glue.rs;l=13-18;drc=7bf1b75b910ca430501b9c6a74c1d18a0223ecca) " +"where a boolean is used to communicate success vs failure, and where the " +"successful result can be passed across the FFI boundary:" msgstr "" -#: src/chromium/adding-third-party-crates/reviews-and-audits.md -msgid "Check each crate seems to be reasonably well maintained" +#: src/chromium/interoperability-with-cpp/error-handling-qr.md +msgid "\"qr_code_generator\"" msgstr "" -#: src/chromium/adding-third-party-crates/reviews-and-audits.md +#: src/chromium/interoperability-with-cpp/error-handling-qr.md msgid "" -"Use `cd third-party/rust/chromium_crates_io; cargo audit` to check for known " -"vulnerabilities (first you'll need to `cargo install cargo-audit`, which " -"ironically involves downloading lots of dependencies from the internet[2](../" -"cargo.md))" +"Students may be curious about the semantics of the `out_qr_size` output. " +"This is not the size of the vector, but the size of the QR code (and " +"admittedly it is a bit redundant - this is the square root of the size of " +"the vector)." msgstr "" -#: src/chromium/adding-third-party-crates/reviews-and-audits.md +#: src/chromium/interoperability-with-cpp/error-handling-qr.md msgid "" -"Ensure any `unsafe` code is good enough for the [Rule of Two](https://" -"chromium.googlesource.com/chromium/src/+/main/docs/security/rule-of-2." -"md#unsafe-code-in-safe-languages)" +"It may be worth pointing out the importance of initializing `out_qr_size` " +"before calling into the Rust function. Creation of a Rust reference that " +"points to uninitialized memory results in Undefined Behavior (unlike in C++, " +"when only the act of dereferencing such memory results in UB)." msgstr "" -#: src/chromium/adding-third-party-crates/reviews-and-audits.md -msgid "Check for any use of `fs` or `net` APIs" +#: src/chromium/interoperability-with-cpp/error-handling-qr.md +msgid "" +"If students ask about `Pin`, then explain why CXX needs it for mutable " +"references to C++ data: the answer is that C++ data can’t be moved around " +"like Rust data, because it may contain self-referential pointers." msgstr "" -#: src/chromium/adding-third-party-crates/reviews-and-audits.md -msgid "" -"Read all the code at a sufficient level to look for anything out of place " -"that might have been maliciously inserted. (You can't realistically aim for " -"100% perfection here: there's often just too much code.)" +#: src/chromium/interoperability-with-cpp/error-handling-png.md +msgid "CXX Error Handling: PNG Example" msgstr "" -#: src/chromium/adding-third-party-crates/reviews-and-audits.md +#: src/chromium/interoperability-with-cpp/error-handling-png.md msgid "" -"These are just guidelines --- work with reviewers from `security@chromium." -"org` to work out the right way to become confident of the crate." +"A prototype of a PNG decoder illustrates what can be done when the " +"successful result cannot be passed across the FFI boundary:" msgstr "" -#: src/chromium/adding-third-party-crates/checking-in.md -msgid "Checking Crates into Chromium Source Code" +#: src/chromium/interoperability-with-cpp/error-handling-png.md +#, fuzzy +msgid "\"gfx::rust_bindings\"" +msgstr "\"bindings\"" + +#: src/chromium/interoperability-with-cpp/error-handling-png.md +msgid "" +"/// This returns an FFI-friendly equivalent of `Result,\n" +" /// ()>`.\n" msgstr "" -#: src/chromium/adding-third-party-crates/checking-in.md -msgid "`git status` should reveal:" +#: src/chromium/interoperability-with-cpp/error-handling-png.md +msgid "/// C++ bindings for the `crate::png::ResultOfPngReader` type.\n" msgstr "" -#: src/chromium/adding-third-party-crates/checking-in.md -msgid "Crate code in `//third_party/rust/chromium_crates_io`" +#: src/chromium/interoperability-with-cpp/error-handling-png.md +msgid "/// C++ bindings for the `crate::png::PngReader` type.\n" msgstr "" -#: src/chromium/adding-third-party-crates/checking-in.md +#: src/chromium/interoperability-with-cpp/error-handling-png.md msgid "" -"Metadata (`BUILD.gn` and `README.chromium`) in `//third_party/rust//" -"`" +"`PngReader` and `ResultOfPngReader` are Rust types --- objects of these " +"types cannot cross the FFI boundary without indirection of a `Box`. We " +"can't have an `out_parameter: &mut PngReader`, because CXX doesn't allow C++ " +"to store Rust objects by value." msgstr "" -#: src/chromium/adding-third-party-crates/checking-in.md -msgid "Please also add an `OWNERS` file in the latter location." +#: src/chromium/interoperability-with-cpp/error-handling-png.md +msgid "" +"This example illustrates that even though CXX doesn't support arbitrary " +"generics nor templates, we can still pass them across the FFI boundary by " +"manually specializing / monomorphizing them into a non-generic type. In the " +"example `ResultOfPngReader` is a non-generic type that forwards into " +"appropriate methods of `Result` (e.g. into `is_err`, `unwrap`, and/or " +"`as_mut`)." msgstr "" -#: src/chromium/adding-third-party-crates/checking-in.md -msgid "" -"You should land all this, along with your `Cargo.toml` and `gnrt_config." -"toml` changes, into the Chromium repo." +#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +msgid "Using cxx in Chromium" msgstr "" -#: src/chromium/adding-third-party-crates/checking-in.md +#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md msgid "" -"**Important**: you need to use `git add -f` because otherwise `.gitignore` " -"files may result in some files being skipped." +"In Chromium, we define an independent `#[cxx::bridge] mod` for each leaf-" +"node where we want to use Rust. You'd typically have one for each " +"`rust_static_library`. Just add" msgstr "" -#: src/chromium/adding-third-party-crates/checking-in.md +#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md msgid "" -"As you do so, you might find presubmit checks fail because of non-inclusive " -"language. This is because Rust crate data tends to include names of git " -"branches, and many projects still use non-inclusive terminology there. So " -"you may need to run:" +"```gn\n" +"cxx_bindings = [ \"my_rust_file.rs\" ]\n" +" # list of files containing #[cxx::bridge], not all source files\n" +"allow_unsafe = true\n" +"```" msgstr "" -#: src/chromium/adding-third-party-crates/keeping-up-to-date.md +#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md msgid "" -"As the OWNER of any third party Chromium dependency, you are [expected to " -"keep it up to date with any security fixes](https://chromium.googlesource." -"com/chromium/src/+/main/docs/adding_to_third_party.md#add-owners). It is " -"hoped that we will soon automate this for Rust crates, but for now, it's " -"still your responsibility just as it is for any other third party dependency." +"to your existing `rust_static_library` target alongside `crate_root` and " +"`sources`." msgstr "" -#: src/exercises/chromium/third-party.md -msgid "" -"Add [uwuify](https://crates.io/crates/uwuify) to Chromium, turning off the " -"crate's [default features](https://doc.rust-lang.org/cargo/reference/" -"features.html#the-default-feature). Assume that the crate will be used in " -"shipping Chromium, but won't be used to handle untrustworthy input." +#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +msgid "C++ headers will be generated at a sensible location, so you can just" msgstr "" -#: src/exercises/chromium/third-party.md -msgid "" -"(In the next exercise we'll use uwuify from Chromium, but feel free to skip " -"ahead and do that now if you like. Or, you could create a new " -"[`rust_executable` target](https://source.chromium.org/chromium/chromium/src/" -"+/main:build/rust/rust_executable.gni) which uses `uwuify`)." +#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +msgid "\"ui/base/my_rust_file.rs.h\"" msgstr "" -#: src/exercises/chromium/third-party.md -msgid "Students will need to download lots of transitive dependencies." +#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +msgid "" +"You will find some utility functions in `//base` to convert to/from Chromium " +"C++ types to CXX Rust types --- for example [`SpanToRustSlice`](https://" +"source.chromium.org/chromium/chromium/src/+/main:base/containers/" +"span_rust.h;l=21)." msgstr "" -#: src/exercises/chromium/third-party.md -msgid "The total crates needed are:" +#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +msgid "Students may ask --- why do we still need `allow_unsafe = true`?" msgstr "" -#: src/exercises/chromium/third-party.md -#, fuzzy -msgid "`instant`," -msgstr "Konstant" - -#: src/exercises/chromium/third-party.md -msgid "`lock_api`," +#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +msgid "" +"The broad answer is that no C/C++ code is \"safe\" by the normal Rust " +"standards. Calling back and forth to C/C++ from Rust may do arbitrary things " +"to memory, and compromise the safety of Rust's own data layouts. Presence of " +"_too many_ `unsafe` keywords in C/C++ interop can harm the signal-to-noise " +"ratio of such a keyword, and is [controversial](https://steveklabnik.com/" +"writing/the-cxx-debate), but strictly, bringing any foreign code into a Rust " +"binary can cause unexpected behavior from Rust's perspective." msgstr "" -#: src/exercises/chromium/third-party.md -msgid "`parking_lot`," +#: src/chromium/interoperability-with-cpp/using-cxx-in-chromium.md +msgid "" +"The narrow answer lies in the diagram at the top of [this page](../" +"interoperability-with-cpp.md) --- behind the scenes, CXX generates Rust " +"`unsafe` and `extern \"C\"` functions just like we did manually in the " +"previous section." msgstr "" -#: src/exercises/chromium/third-party.md -msgid "`parking_lot_core`," +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Exercise: Interoperability with C++" msgstr "" -#: src/exercises/chromium/third-party.md -msgid "`redox_syscall`," +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Part one" msgstr "" -#: src/exercises/chromium/third-party.md -msgid "`scopeguard`," +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "" +"In the Rust file you previously created, add a `#[cxx::bridge]` which " +"specifies a single function, to be called from C++, called " +"`hello_from_rust`, taking no parameters and returning no value." msgstr "" -#: src/exercises/chromium/third-party.md -msgid "`smallvec`, and" +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "" +"Modify your previous `hello_from_rust` function to remove `extern \"C\"` and " +"`#[unsafe(no_mangle)]`. This is now just a standard Rust function." msgstr "" -#: src/exercises/chromium/third-party.md -msgid "`uwuify`." +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Modify your `gn` target to build these bindings." msgstr "" -#: src/exercises/chromium/third-party.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"If students are downloading even more than that, they probably forgot to " -"turn off the default features." +"In your C++ code, remove the forward-declaration of `hello_from_rust`. " +"Instead, include the generated header file." msgstr "" -#: src/exercises/chromium/third-party.md -msgid "" -"Thanks to [Daniel Liu](https://github.com/Daniel-Liu-c0deb0t) for this crate!" +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Build and run!" msgstr "" -#: src/exercises/chromium/bringing-it-together.md -msgid "Bringing It Together --- Exercise" +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Part two" msgstr "" -#: src/exercises/chromium/bringing-it-together.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"In this exercise, you're going to add a whole new Chromium feature, bringing " -"together everything you already learned." +"It's a good idea to play with CXX a little. It helps you think about how " +"flexible Rust in Chromium actually is." msgstr "" -#: src/exercises/chromium/bringing-it-together.md -msgid "The Brief from Product Management" +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Some things to try:" msgstr "" -#: src/exercises/chromium/bringing-it-together.md -msgid "" -"A community of pixies has been discovered living in a remote rainforest. " -"It's important that we get Chromium for Pixies delivered to them as soon as " -"possible." +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Call back into C++ from Rust. You will need:" msgstr "" -#: src/exercises/chromium/bringing-it-together.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"The requirement is to translate all Chromium's UI strings into Pixie " -"language." +"An additional header file which you can `include!` from your `cxx::bridge`. " +"You'll need to declare your C++ function in that new header file." msgstr "" -#: src/exercises/chromium/bringing-it-together.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"There's not time to wait for proper translations, but fortunately pixie " -"language is very close to English, and it turns out there's a Rust crate " -"which does the translation." +"An `unsafe` block to call such a function, or alternatively specify the " +"`unsafe` keyword in your `#[cxx::bridge]` [as described here](https://cxx.rs/" +"extern-c++.html#functions-and-member-functions)." msgstr "" -#: src/exercises/chromium/bringing-it-together.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"In fact, you already [imported that crate in the previous exercise](https://" -"crates.io/crates/uwuify)." +"You may also need to `#include \"third_party/rust/cxx/v1/crate/include/" +"cxx.h\"`" msgstr "" -#: src/exercises/chromium/bringing-it-together.md -msgid "" -"(Obviously, real translations of Chrome require incredible care and " -"diligence. Don't ship this!)" +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Pass a C++ string from C++ into Rust." msgstr "" -#: src/exercises/chromium/bringing-it-together.md -msgid "Steps" +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Pass a reference to a C++ object into Rust." msgstr "" -#: src/exercises/chromium/bringing-it-together.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"Modify `ResourceBundle::MaybeMangleLocalizedString` so that it uwuifies all " -"strings before display. In this special build of Chromium, it should always " -"do this irrespective of the setting of `mangle_localized_strings_`." +"Intentionally get the Rust function signatures mismatched from the " +"`#[cxx::bridge]`, and get used to the errors you see." msgstr "" -#: src/exercises/chromium/bringing-it-together.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"If you've done everything right across all these exercises, congratulations, " -"you should have created Chrome for pixies!" +"Intentionally get the C++ function signatures mismatched from the " +"`#[cxx::bridge]`, and get used to the errors you see." msgstr "" -#: src/exercises/chromium/bringing-it-together.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"UTF16 vs UTF8. Students should be aware that Rust strings are always UTF8, " -"and will probably decide that it's better to do the conversion on the C++ " -"side using `base::UTF16ToUTF8` and back again." +"Pass a `std::unique_ptr` of some type from C++ into Rust, so that Rust can " +"own some C++ object." msgstr "" -#: src/exercises/chromium/bringing-it-together.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"If students decide to do the conversion on the Rust side, they'll need to " -"consider [`String::from_utf16`](https://doc.rust-lang.org/std/string/struct." -"String.html#method.from_utf16), consider error handling, and consider which " -"[CXX supported types can transfer a lot of u16s](https://cxx.rs/binding/" -"slice.html)." +"Create a Rust object and pass it into C++, so that C++ owns it. (Hint: you " +"need a `Box`)." msgstr "" -#: src/exercises/chromium/bringing-it-together.md -msgid "" -"Students may design the C++/Rust boundary in several different ways, e.g. " -"taking and returning strings by value, or taking a mutable reference to a " -"string. If a mutable reference is used, CXX will likely tell the student " -"that they need to use [`Pin`](https://doc.rust-lang.org/std/pin/). You may " -"need to explain what `Pin` does, and then explain why CXX needs it for " -"mutable references to C++ data: the answer is that C++ data can't be moved " -"around like Rust data, because it may contain self-referential pointers." +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Declare some methods on a C++ type. Call them from Rust." msgstr "" -#: src/exercises/chromium/bringing-it-together.md -msgid "" -"The C++ target containing `ResourceBundle::MaybeMangleLocalizedString` will " -"need to depend on a `rust_static_library` target. The student probably " -"already did this." +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Declare some methods on a Rust type. Call them from C++." msgstr "" -#: src/exercises/chromium/bringing-it-together.md -msgid "" -"The `rust_static_library` target will need to depend on `//third_party/rust/" -"uwuify/v0_2:lib`." +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Part three" msgstr "" -#: src/exercises/chromium/solutions.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"Solutions to the Chromium exercises can be found in [this series of CLs]" -"(https://chromium-review.googlesource.com/c/chromium/src/+/5096560)." +"Now you understand the strengths and limitations of CXX interop, think of a " +"couple of use-cases for Rust in Chromium where the interface would be " +"sufficiently simple. Sketch how you might define that interface." msgstr "" -#: src/bare-metal.md -msgid "Welcome to Bare Metal Rust" -msgstr "Velkommen til Rust på det rå jern" - -#: src/bare-metal.md -msgid "" -"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." +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "The [`cxx` binding reference](https://cxx.rs/bindings.html)" msgstr "" -#: src/bare-metal.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"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 -msgid "What is `no_std` Rust?" -msgstr "" - -#: src/bare-metal.md -msgid "Writing firmware for microcontrollers." +"The [`rust_static_library` gn template](https://source.chromium.org/chromium/" +"chromium/src/+/main:build/rust/rust_static_library.gni;l=16)" msgstr "" -#: src/bare-metal.md -msgid "Writing bootloader / kernel code for application processors." +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "Some of the questions you may encounter:" msgstr "" -#: src/bare-metal.md -msgid "Some useful crates for bare-metal Rust development." +#: src/exercises/chromium/interoperability-with-cpp.md +msgid "" +"I'm seeing a problem initializing a variable of type X with type Y, where X " +"and Y are both function types. This is because your C++ function doesn't " +"quite match the declaration in your `cxx::bridge`." msgstr "" -#: src/bare-metal.md +#: src/exercises/chromium/interoperability-with-cpp.md msgid "" -"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." +"I seem to be able to freely convert C++ references into Rust references. " +"Doesn't that risk UB? For CXX's _opaque_ types, no, because they are zero-" +"sized. For CXX trivial types yes, it's _possible_ to cause UB, although " +"CXX's design makes it quite difficult to craft such an example." msgstr "" -#: src/bare-metal.md +#: src/chromium/adding-third-party-crates.md msgid "" -"To get started, install some tools we'll need later. On gLinux or Debian:" +"Rust libraries are called \"crates\" and are found at [crates.io](https://" +"crates.io). It's _very easy_ for Rust crates to depend upon one another. So " +"they do!" msgstr "" -#: src/bare-metal.md -msgid "" -"And give users in the `plugdev` group access to the micro:bit programmer:" +#: src/chromium/adding-third-party-crates.md +msgid "Property" +msgstr "Egenskab" + +#: src/chromium/adding-third-party-crates.md +msgid "C++ library" msgstr "" -#: src/bare-metal.md src/bare-metal/microcontrollers/debugging.md -msgid "On MacOS:" -msgstr "På MacOS:" +#: src/chromium/adding-third-party-crates.md +#, fuzzy +msgid "Rust crate" +msgstr "Rust's økosystem" -#: src/bare-metal/no_std.md -msgid "`core`" -msgstr "`core`" +#: src/chromium/adding-third-party-crates.md +#, fuzzy +msgid "Build system" +msgstr "Rust's økosystem" -#: src/bare-metal/no_std.md -msgid "`std`" -msgstr "`std`" +#: src/chromium/adding-third-party-crates.md +msgid "Lots" +msgstr "" -#: src/bare-metal/no_std.md -msgid "Slices, `&str`, `CStr`" +#: src/chromium/adding-third-party-crates.md +msgid "Consistent: `Cargo.toml`" msgstr "" -#: src/bare-metal/no_std.md -msgid "`NonZeroU8`..." -msgstr "`NonZeroU8`..." +#: src/chromium/adding-third-party-crates.md +msgid "Typical library size" +msgstr "" -#: src/bare-metal/no_std.md -msgid "`Option`, `Result`" -msgstr "`Option`, `Result`" +#: src/chromium/adding-third-party-crates.md +msgid "Large-ish" +msgstr "" -#: src/bare-metal/no_std.md -msgid "`Display`, `Debug`, `write!`..." -msgstr "`Display`, `Debug`, `write!`..." - -#: src/bare-metal/no_std.md -msgid "`panic!`, `assert_eq!`..." -msgstr "`panic!`, `assert_eq!`..." - -#: src/bare-metal/no_std.md -msgid "`NonNull` and all the usual pointer-related functions" +#: src/chromium/adding-third-party-crates.md +msgid "Small" msgstr "" -#: src/bare-metal/no_std.md -msgid "`Future` and `async`/`await`" -msgstr "`Future` og `async`/`await`" - -#: src/bare-metal/no_std.md -msgid "`fence`, `AtomicBool`, `AtomicPtr`, `AtomicU32`..." -msgstr "`fence`, `AtomicBool`, `AtomicPtr`, `AtomicU32`..." - -#: src/bare-metal/no_std.md -msgid "`Duration`" -msgstr "`Duration`" - -#: src/bare-metal/no_std.md -msgid "`Box`, `Cow`, `Arc`, `Rc`" -msgstr "`Box`, `Cow`, `Arc`, `Rc`" - -#: src/bare-metal/no_std.md -msgid "`Vec`, `BinaryHeap`, `BtreeMap`, `LinkedList`, `VecDeque`" -msgstr "`Vec`, `BinaryHeap`, `BtreeMap`, `LinkedList`, `VecDeque`" +#: src/chromium/adding-third-party-crates.md +msgid "Transitive dependencies" +msgstr "" -#: src/bare-metal/no_std.md -msgid "`String`, `CString`, `format!`" -msgstr "`String`, `CString`, `format!`" +#: src/chromium/adding-third-party-crates.md +msgid "Few" +msgstr "" -#: src/bare-metal/no_std.md -msgid "`Error`" -msgstr "`Error`" +#: src/chromium/adding-third-party-crates.md +msgid "For a Chromium engineer, this has pros and cons:" +msgstr "" -#: src/bare-metal/no_std.md -msgid "`Mutex`, `Condvar`, `Barrier`, `Once`, `RwLock`, `mpsc`" -msgstr "`Mutex`, `Condvar`, `Barrier`, `Once`, `RwLock`, `mpsc`" +#: src/chromium/adding-third-party-crates.md +msgid "" +"All crates use a common build system so we can automate their inclusion into " +"Chromium..." +msgstr "" -#: src/bare-metal/no_std.md -msgid "`File` and the rest of `fs`" -msgstr "`File` og resten af `fs`" +#: src/chromium/adding-third-party-crates.md +msgid "" +"... but, crates typically have transitive dependencies, so you will likely " +"have to bring in multiple libraries." +msgstr "" -#: src/bare-metal/no_std.md -msgid "`println!`, `Read`, `Write`, `Stdin`, `Stdout` and the rest of `io`" -msgstr "`println!`, `Read`, `Write`, `Stdin`, `Stdout` og resten af `io`" +#: src/chromium/adding-third-party-crates.md +msgid "We'll discuss:" +msgstr "" -#: src/bare-metal/no_std.md -msgid "`Path`, `OsString`" -msgstr "`Path`, `OsString`" +#: src/chromium/adding-third-party-crates.md +msgid "How to put a crate in the Chromium source code tree" +msgstr "" -#: src/bare-metal/no_std.md -msgid "`net`" -msgstr "`net`" +#: src/chromium/adding-third-party-crates.md +msgid "How to make `gn` build rules for it" +msgstr "" -#: src/bare-metal/no_std.md -msgid "`Command`, `Child`, `ExitCode`" -msgstr "`Command`, `Child`, `ExitCode`" +#: src/chromium/adding-third-party-crates.md +msgid "How to audit its source code for sufficient safety." +msgstr "" -#: src/bare-metal/no_std.md -msgid "`spawn`, `sleep` and the rest of `thread`" -msgstr "`spawn`, `sleep` og resten af `thread`" +#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md +msgid "Configuring the `Cargo.toml` file to add crates" +msgstr "" -#: src/bare-metal/no_std.md -msgid "`SystemTime`, `Instant`" -msgstr "`SystemTime`, `Instant`" +#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md +msgid "" +"Chromium has a single set of centrally-managed direct crate dependencies. " +"These are managed through a single [`Cargo.toml`](https://" +"source.chromium.org/chromium/chromium/src/+/main:third_party/rust/" +"chromium_crates_io/Cargo.toml):" +msgstr "" -#: src/bare-metal/no_std.md -msgid "`HashMap` depends on RNG." +#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md +msgid "" +"```toml\n" +"[dependencies]\n" +"bitflags = \"1\"\n" +"cfg-if = \"1\"\n" +"cxx = \"1\"\n" +"# lots more...\n" +"```" msgstr "" -#: src/bare-metal/no_std.md -msgid "`std` re-exports the contents of both `core` and `alloc`." +#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md +msgid "" +"As with any other `Cargo.toml`, you can specify [more details about the " +"dependencies](https://doc.rust-lang.org/cargo/reference/specifying-" +"dependencies.html) --- most commonly, you'll want to specify the `features` " +"that you wish to enable in the crate." msgstr "" -#: src/bare-metal/minimal.md -msgid "A minimal `no_std` program" +#: src/chromium/adding-third-party-crates/configuring-cargo-toml.md +msgid "" +"When adding a crate to Chromium, you'll often need to provide some extra " +"information in an additional file, `gnrt_config.toml`, which we'll meet next." msgstr "" -#: src/bare-metal/minimal.md -msgid "This will compile to an empty binary." +#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md +msgid "" +"Alongside `Cargo.toml` is [`gnrt_config.toml`](https://source.chromium.org/" +"chromium/chromium/src/+/main:third_party/rust/chromium_crates_io/" +"gnrt_config.toml). This contains Chromium-specific extensions to crate " +"handling." msgstr "" -#: src/bare-metal/minimal.md -msgid "`std` provides a panic handler; without it we must provide our own." +#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md +msgid "" +"If you add a new crate, you should specify at least the `group`. This is one " +"of:" msgstr "" -#: src/bare-metal/minimal.md -msgid "It can also be provided by another crate, such as `panic-halt`." +#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md +#: src/chromium/adding-third-party-crates/depending-on-a-crate.md +msgid "For instance," msgstr "" -#: src/bare-metal/minimal.md +#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md msgid "" -"Depending on the target, you may need to compile with `panic = \"abort\"` to " -"avoid an error about `eh_personality`." +"Depending on the crate source code layout, you may also need to use this " +"file to specify where its `LICENSE` file(s) can be found." msgstr "" -#: src/bare-metal/minimal.md +#: src/chromium/adding-third-party-crates/configuring-gnrt-config-toml.md 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." +"Later, we'll see some other things you will need to configure in this file " +"to resolve problems." msgstr "" -#: src/bare-metal/alloc.md +#: src/chromium/adding-third-party-crates/downloading-crates.md msgid "" -"To use `alloc` you must implement a [global (heap) allocator](https://doc." -"rust-lang.org/stable/std/alloc/trait.GlobalAlloc.html)." +"A tool called `gnrt` knows how to download crates and how to generate " +"`BUILD.gn` rules." msgstr "" -#: src/bare-metal/alloc.md +#: src/chromium/adding-third-party-crates/downloading-crates.md +msgid "To start, download the crate you want like this:" +msgstr "" + +#: src/chromium/adding-third-party-crates/downloading-crates.md msgid "" -"// Safe because `HEAP` is only used here and `entry` is only called once.\n" +"Although the `gnrt` tool is part of the Chromium source code, by running " +"this command you will be downloading and running its dependencies from " +"`crates.io`. See [the earlier section](../cargo.md) discussing this security " +"decision." msgstr "" -"// Safe because `HEAP` is only used here and `entry` is only called once.\n" -#: src/bare-metal/alloc.md -msgid "// Give the allocator some memory to allocate.\n" -msgstr "// Give the allocator some memory to allocate.\n" +#: src/chromium/adding-third-party-crates/downloading-crates.md +msgid "This `vendor` command may download:" +msgstr "" -#: src/bare-metal/alloc.md -msgid "// Now we can do things that require heap allocation.\n" -msgstr "// Now we can do things that require heap allocation.\n" +#: src/chromium/adding-third-party-crates/downloading-crates.md +#, fuzzy +msgid "Your crate" +msgstr "\"Sokrates\"" -#: src/bare-metal/alloc.md -msgid "\"A string\"" -msgstr "\"En streng\"" +#: src/chromium/adding-third-party-crates/downloading-crates.md +msgid "Direct and transitive dependencies" +msgstr "" -#: src/bare-metal/alloc.md +#: src/chromium/adding-third-party-crates/downloading-crates.md msgid "" -"`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." +"New versions of other crates, as required by `cargo` to resolve the complete " +"set of crates required by Chromium." msgstr "" -#: src/bare-metal/alloc.md +#: src/chromium/adding-third-party-crates/downloading-crates.md 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." +"Chromium maintains patches for some crates, kept in `//third_party/rust/" +"chromium_crates_io/patches`. These will be reapplied automatically, but if " +"patching fails you may need to take manual action." msgstr "" -#: src/bare-metal/alloc.md +#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md 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." +"Once you've downloaded the crate, generate the `BUILD.gn` files like this:" msgstr "" -#: src/bare-metal/alloc.md +#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md +msgid "Now run `git status`. You should find:" +msgstr "" + +#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md msgid "" -"`extern crate panic_halt as _` is necessary to ensure that the `panic_halt` " -"crate is linked in so we get its panic handler." +"At least one new crate source code in `third_party/rust/chromium_crates_io/" +"vendor`" msgstr "" -#: src/bare-metal/alloc.md -msgid "This example will build but not run, as it doesn't have an entry point." +#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md +msgid "" +"At least one new `BUILD.gn` in `third_party/rust//v`" msgstr "" -#: src/bare-metal/microcontrollers.md +#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md +msgid "An appropriate `README.chromium`" +msgstr "" + +#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md msgid "" -"The `cortex_m_rt` crate provides (among other things) a reset handler for " -"Cortex M microcontrollers." +"The \"major semver version\" is a [Rust \"semver\" version number](https://" +"doc.rust-lang.org/cargo/reference/semver.html)." msgstr "" -#: src/bare-metal/microcontrollers.md +#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md msgid "" -"Next we'll look at how to access peripherals, with increasing levels of " -"abstraction." +"Take a close look, especially at the things generated in `third_party/rust`." msgstr "" -#: src/bare-metal/microcontrollers.md +#: src/chromium/adding-third-party-crates/generating-gn-build-rules.md msgid "" -"The `cortex_m_rt::entry` macro requires that the function have type `fn() -" -"> !`, because returning to the reset handler doesn't make sense." +"Talk a little about semver --- and specifically the way that in Chromium " +"it's to allow multiple incompatible versions of a crate, which is " +"discouraged but sometimes necessary in the Cargo ecosystem." msgstr "" -#: src/bare-metal/microcontrollers.md -msgid "Run the example with `cargo embed --bin minimal`" +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "" +"If your build fails, it may be because of a `build.rs`: programs which do " +"arbitrary things at build time. This is fundamentally at odds with the " +"design of `gn` and `ninja` which aim for static, deterministic, build rules " +"to maximize parallelism and repeatability of builds." msgstr "" -#: src/bare-metal/microcontrollers/mmio.md +#: src/chromium/adding-third-party-crates/resolving-problems.md msgid "" -"Most microcontrollers access peripherals via memory-mapped IO. Let's try " -"turning on an LED on our micro:bit:" +"Some `build.rs` actions are automatically supported; others require action:" msgstr "" -#: src/bare-metal/microcontrollers/mmio.md -msgid "/// GPIO port 0 peripheral address\n" -msgstr "/// GPIO port 0 peripheral address\n" - -#: src/bare-metal/microcontrollers/mmio.md -msgid "// GPIO peripheral offsets\n" -msgstr "// GPIO peripheral offsets\n" +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "build script effect" +msgstr "" -#: src/bare-metal/microcontrollers/mmio.md -msgid "// PIN_CNF fields\n" -msgstr "// PIN_CNF fields\n" +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "Supported by our gn templates" +msgstr "" -#: src/bare-metal/microcontrollers/mmio.md -#: src/bare-metal/microcontrollers/pacs.md -#: src/bare-metal/microcontrollers/hals.md -msgid "// Configure GPIO 0 pins 21 and 28 as push-pull outputs.\n" -msgstr "// Configure GPIO 0 pins 21 and 28 as push-pull outputs.\n" +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "Work required by you" +msgstr "" -#: src/bare-metal/microcontrollers/mmio.md -msgid "" -"// Safe because the pointers are to valid peripheral control registers, and\n" -" // no aliases exist.\n" +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "Checking rustc version to configure features on and off" msgstr "" -"// Safe because the pointers are to valid peripheral control registers, and\n" -" // no aliases exist.\n" -#: src/bare-metal/microcontrollers/mmio.md -#: src/bare-metal/microcontrollers/pacs.md -#: src/bare-metal/microcontrollers/hals.md -msgid "// Set pin 28 low and pin 21 high to turn the LED on.\n" -msgstr "// Set pin 28 low and pin 21 high to turn the LED on.\n" +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "Yes" +msgstr "Ja" -#: src/bare-metal/microcontrollers/mmio.md -msgid "" -"GPIO 0 pin 21 is connected to the first column of the LED matrix, and pin 28 " -"to the first row." +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "None" msgstr "" -#: src/bare-metal/microcontrollers/mmio.md -#: src/bare-metal/microcontrollers/pacs.md -#: src/bare-metal/microcontrollers/hals.md -#: src/bare-metal/microcontrollers/board-support.md -msgid "Run the example with:" +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "Checking platform or CPU to configure features on and off" msgstr "" -#: src/bare-metal/microcontrollers/pacs.md -msgid "Peripheral Access Crates" +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "Generating code" msgstr "" -#: src/bare-metal/microcontrollers/pacs.md -msgid "" -"[`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." +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "Yes - specify in `gnrt_config.toml`" msgstr "" -#: src/bare-metal/microcontrollers/pacs.md -msgid "" -"SVD (System View Description) files are XML files typically provided by " -"silicon vendors which describe the memory map of the device." +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "Building C/C++" msgstr "" -#: src/bare-metal/microcontrollers/pacs.md -msgid "" -"They are organised by peripheral, register, field and value, with names, " -"descriptions, addresses and so on." -msgstr "" +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "No" +msgstr "Nej" -#: src/bare-metal/microcontrollers/pacs.md -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." +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "Patch around it" msgstr "" -#: src/bare-metal/microcontrollers/pacs.md -msgid "`cortex-m-rt` provides the vector table, among other things." +#: src/chromium/adding-third-party-crates/resolving-problems.md +msgid "Arbitrary other actions" msgstr "" -#: src/bare-metal/microcontrollers/pacs.md +#: src/chromium/adding-third-party-crates/resolving-problems.md 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." +"Fortunately, most crates don't contain a build script, and fortunately, most " +"build scripts only do the top two actions." msgstr "" -#: src/bare-metal/microcontrollers/hals.md -msgid "HAL crates" +#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md +msgid "" +"If `ninja` complains about missing files, check the `build.rs` to see if it " +"writes source code files." msgstr "" -#: src/bare-metal/microcontrollers/hals.md +#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md msgid "" -"[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)." +"If so, modify [`gnrt_config.toml`](../configuring-gnrt-config-toml.md) to " +"add `build-script-outputs` to the crate. If this is a transitive dependency, " +"that is, one on which Chromium code should not directly depend, also add " +"`allow-first-party-usage=false`. There are several examples already in that " +"file:" msgstr "" -#: src/bare-metal/microcontrollers/hals.md -msgid "// Create HAL wrapper for GPIO port 0.\n" +#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md +msgid "" +"```toml\n" +"[crate.unicode-linebreak]\n" +"allow-first-party-usage = false\n" +"build-script-outputs = [\"tables.rs\"]\n" +"```" msgstr "" -#: src/bare-metal/microcontrollers/hals.md +#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-generate-code.md msgid "" -"`set_low` and `set_high` are methods on the `embedded_hal` `OutputPin` trait." +"Now rerun [`gnrt.py -- gen`](../generating-gn-build-rules.md) to regenerate " +"`BUILD.gn` files to inform ninja that this particular output file is input " +"to subsequent build steps." msgstr "" -#: src/bare-metal/microcontrollers/hals.md +#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md msgid "" -"HAL crates exist for many Cortex-M and RISC-V devices, including various " -"STM32, GD32, nRF, NXP, MSP430, AVR and PIC microcontrollers." +"Some crates use the [`cc`](https://crates.io/crates/cc) crate to build and " +"link C/C++ libraries. Other crates parse C/C++ using [`bindgen`](https://" +"crates.io/crates/bindgen) within their build scripts. These actions can't be " +"supported in a Chromium context --- our gn, ninja and LLVM build system is " +"very specific in expressing relationships between build actions." msgstr "" -#: src/bare-metal/microcontrollers/board-support.md -msgid "Board support crates" +#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md +msgid "So, your options are:" msgstr "" -#: src/bare-metal/microcontrollers/board-support.md -msgid "" -"Board support crates provide a further level of wrapping for a specific " -"board for convenience." +#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md +msgid "Avoid these crates" msgstr "" -#: src/bare-metal/microcontrollers/board-support.md -msgid "" -"In this case the board support crate is just providing more useful names, " -"and a bit of initialisation." +#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md +msgid "Apply a patch to the crate." msgstr "" -#: src/bare-metal/microcontrollers/board-support.md +#: src/chromium/adding-third-party-crates/resolving-problems/build-scripts-which-take-arbitrary-actions.md msgid "" -"The crate may also include drivers for some on-board devices outside of the " -"microcontroller itself." +"Patches should be kept in `third_party/rust/chromium_crates_io/patches/" +"` - see for example the [patches against the `cxx` crate](https://" +"source.chromium.org/chromium/chromium/src/+/main:third_party/rust/" +"chromium_crates_io/patches/cxx/) - and will be applied automatically by " +"`gnrt` each time it upgrades the crate." msgstr "" -#: src/bare-metal/microcontrollers/board-support.md -msgid "`microbit-v2` includes a simple driver for the LED matrix." +#: src/chromium/adding-third-party-crates/depending-on-a-crate.md +msgid "" +"Once you've added a third-party crate and generated build rules, depending " +"on a crate is simple. Find your `rust_static_library` target, and add a " +"`dep` on the `:lib` target within your crate." msgstr "" -#: src/bare-metal/microcontrollers/type-state.md -msgid "The type state pattern" +#: src/chromium/adding-third-party-crates/depending-on-a-crate.md +msgid "Specifically," msgstr "" -#: src/bare-metal/microcontrollers/type-state.md -msgid "// let gpio0_01_again = gpio0.p0_01; // Error, moved.\n" -msgstr "// let gpio0_01_again = gpio0.p0_01; // Error, moved.\n" - -#: src/bare-metal/microcontrollers/type-state.md -msgid "// pin_input.is_high(); // Error, moved.\n" -msgstr "// pin_input.is_high(); // Error, moved.\n" - -#: src/bare-metal/microcontrollers/type-state.md +#: src/chromium/adding-third-party-crates/depending-on-a-crate.md msgid "" -"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." +"```bob\n" +" +------------+ +----------------------+\n" +"\"//third_party/rust\" | crate name | \"/v\" | major semver version | " +"\":lib\"\n" +" +------------+ +----------------------+\n" +"```" msgstr "" -#: src/bare-metal/microcontrollers/type-state.md +#: src/chromium/adding-third-party-crates/depending-on-a-crate.md msgid "" -"Changing the configuration of a pin consumes the old pin instance, so you " -"can’t keep use the old instance afterwards." +"```gn\n" +"rust_static_library(\"my_rust_lib\") {\n" +" crate_root = \"lib.rs\"\n" +" sources = [ \"lib.rs\" ]\n" +" deps = [ \"//third_party/rust/example_rust_crate/v1:lib\" ]\n" +"}\n" +"```" msgstr "" -#: src/bare-metal/microcontrollers/type-state.md -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." +#: src/chromium/adding-third-party-crates/reviews-and-audits.md +msgid "Auditing Third Party Crates" msgstr "" -#: src/bare-metal/microcontrollers/type-state.md +#: src/chromium/adding-third-party-crates/reviews-and-audits.md msgid "" -"You can call `is_high` on an input pin and `set_high` on an output pin, but " -"not vice-versa." +"Adding new libraries is subject to Chromium's standard [policies](https://" +"chromium.googlesource.com/chromium/src/+/refs/heads/main/docs/" +"rust.md#Third_party-review), but of course also subject to security review. " +"As you may be bringing in not just a single crate but also transitive " +"dependencies, there may be a lot of code to review. On the other hand, safe " +"Rust code can have limited negative side effects. How should you review it?" msgstr "" -#: src/bare-metal/microcontrollers/type-state.md -msgid "Many HAL crates follow this pattern." +#: src/chromium/adding-third-party-crates/reviews-and-audits.md +msgid "" +"Over time Chromium aims to move to a process based around [cargo vet]" +"(https://mozilla.github.io/cargo-vet/)." msgstr "" -#: src/bare-metal/microcontrollers/embedded-hal.md +#: src/chromium/adding-third-party-crates/reviews-and-audits.md msgid "" -"The [`embedded-hal`](https://crates.io/crates/embedded-hal) crate provides a " -"number of traits covering common microcontroller peripherals." +"Meanwhile, for each new crate addition, we are checking for the following:" msgstr "" -#: src/bare-metal/microcontrollers/embedded-hal.md -msgid "GPIO" -msgstr "GPIO" - -#: src/bare-metal/microcontrollers/embedded-hal.md -msgid "ADC" -msgstr "ADC" - -#: src/bare-metal/microcontrollers/embedded-hal.md -msgid "I2C, SPI, UART, CAN" -msgstr "I2C, SPI, UART, CAN" - -#: src/bare-metal/microcontrollers/embedded-hal.md -msgid "RNG" -msgstr "RNG" - -#: src/bare-metal/microcontrollers/embedded-hal.md -msgid "Timers" +#: src/chromium/adding-third-party-crates/reviews-and-audits.md +msgid "" +"Understand why each crate is used. What's the relationship between crates? " +"If the build system for each crate contains a `build.rs` or procedural " +"macros, work out what they're for. Are they compatible with the way Chromium " +"is normally built?" msgstr "" -#: src/bare-metal/microcontrollers/embedded-hal.md -msgid "Watchdogs" +#: src/chromium/adding-third-party-crates/reviews-and-audits.md +msgid "Check each crate seems to be reasonably well maintained" msgstr "" -#: src/bare-metal/microcontrollers/embedded-hal.md +#: src/chromium/adding-third-party-crates/reviews-and-audits.md 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." +"Use `cd third-party/rust/chromium_crates_io; cargo audit` to check for known " +"vulnerabilities (first you'll need to `cargo install cargo-audit`, which " +"ironically involves downloading lots of dependencies from the internet[2](../" +"cargo.md))" msgstr "" -#: src/bare-metal/microcontrollers/embedded-hal.md +#: src/chromium/adding-third-party-crates/reviews-and-audits.md msgid "" -"There are implementations for many microcontrollers, as well as other " -"platforms such as Linux on Raspberry Pi." +"Ensure any `unsafe` code is good enough for the [Rule of Two](https://" +"chromium.googlesource.com/chromium/src/+/main/docs/security/rule-" +"of-2.md#unsafe-code-in-safe-languages)" msgstr "" -#: src/bare-metal/microcontrollers/embedded-hal.md -msgid "" -"There is work in progress on an `async` version of `embedded-hal`, but it " -"isn't stable yet." +#: src/chromium/adding-third-party-crates/reviews-and-audits.md +msgid "Check for any use of `fs` or `net` APIs" msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md +#: src/chromium/adding-third-party-crates/reviews-and-audits.md msgid "" -"[probe-rs](https://probe.rs/) is a handy toolset for embedded debugging, " -"like OpenOCD but better integrated." +"Read all the code at a sufficient level to look for anything out of place " +"that might have been maliciously inserted. (You can't realistically aim for " +"100% perfection here: there's often just too much code.)" msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md +#: src/chromium/adding-third-party-crates/reviews-and-audits.md msgid "" -"SWD (Serial Wire Debug) and JTAG via CMSIS-DAP, ST-Link and J-Link probes" +"These are just guidelines --- work with reviewers from " +"`security@chromium.org` to work out the right way to become confident of the " +"crate." msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md -msgid "GDB stub and Microsoft DAP (Debug Adapter Protocol) server" +#: src/chromium/adding-third-party-crates/checking-in.md +msgid "Checking Crates into Chromium Source Code" msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md -msgid "Cargo integration" +#: src/chromium/adding-third-party-crates/checking-in.md +msgid "`git status` should reveal:" msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md -msgid "" -"`cargo-embed` is a cargo subcommand to build and flash binaries, log RTT " -"(Real Time Transfers) output and connect GDB. It's configured by an `Embed." -"toml` file in your project directory." +#: src/chromium/adding-third-party-crates/checking-in.md +msgid "Crate code in `//third_party/rust/chromium_crates_io`" msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md +#: src/chromium/adding-third-party-crates/checking-in.md msgid "" -"[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." +"Metadata (`BUILD.gn` and `README.chromium`) in `//third_party/rust//" +"`" msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md -msgid "" -"ST-Link is a range of in-circuit debuggers from ST Microelectronics, J-Link " -"is a range from SEGGER." +#: src/chromium/adding-third-party-crates/checking-in.md +msgid "Please also add an `OWNERS` file in the latter location." msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md +#: src/chromium/adding-third-party-crates/checking-in.md msgid "" -"The Debug Access Port is usually either a 5-pin JTAG interface or 2-pin " -"Serial Wire Debug." +"You should land all this, along with your `Cargo.toml` and " +"`gnrt_config.toml` changes, into the Chromium repo." msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md +#: src/chromium/adding-third-party-crates/checking-in.md msgid "" -"probe-rs is a library which you can integrate into your own tools if you " -"want to." +"**Important**: you need to use `git add -f` because otherwise `.gitignore` " +"files may result in some files being skipped." msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md +#: src/chromium/adding-third-party-crates/checking-in.md msgid "" -"The [Microsoft Debug Adapter Protocol](https://microsoft.github.io/debug-" -"adapter-protocol/) lets VSCode and other IDEs debug code running on any " -"supported microcontroller." +"As you do so, you might find presubmit checks fail because of non-inclusive " +"language. This is because Rust crate data tends to include names of git " +"branches, and many projects still use non-inclusive terminology there. So " +"you may need to run:" msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md -msgid "cargo-embed is a binary built using the probe-rs library." +#: src/chromium/adding-third-party-crates/keeping-up-to-date.md +msgid "" +"As the OWNER of any third party Chromium dependency, you are [expected to " +"keep it up to date with any security fixes](https://" +"chromium.googlesource.com/chromium/src/+/main/docs/" +"adding_to_third_party.md#add-owners). It is hoped that we will soon automate " +"this for Rust crates, but for now, it's still your responsibility just as it " +"is for any other third party dependency." msgstr "" -#: src/bare-metal/microcontrollers/probe-rs.md +#: src/exercises/chromium/third-party.md msgid "" -"RTT (Real Time Transfers) is a mechanism to transfer data between the debug " -"host and the target through a number of ringbuffers." +"Add [uwuify](https://crates.io/crates/uwuify) to Chromium, turning off the " +"crate's [default features](https://doc.rust-lang.org/cargo/reference/" +"features.html#the-default-feature). Assume that the crate will be used in " +"shipping Chromium, but won't be used to handle untrustworthy input." msgstr "" -#: src/bare-metal/microcontrollers/debugging.md -#, fuzzy -msgid "_Embed.toml_:" -msgstr "Embed.toml:" - -#: src/bare-metal/microcontrollers/debugging.md -msgid "In one terminal under `src/bare-metal/microcontrollers/examples/`:" +#: src/exercises/chromium/third-party.md +msgid "" +"(In the next exercise we'll use uwuify from Chromium, but feel free to skip " +"ahead and do that now if you like. Or, you could create a new " +"[`rust_executable` target](https://source.chromium.org/chromium/chromium/src/" +"+/main:build/rust/rust_executable.gni) which uses `uwuify`)." msgstr "" -#: src/bare-metal/microcontrollers/debugging.md -msgid "In another terminal in the same directory:" +#: src/exercises/chromium/third-party.md +msgid "Students will need to download lots of transitive dependencies." msgstr "" -#: src/bare-metal/microcontrollers/debugging.md -msgid "On gLinux or Debian:" +#: src/exercises/chromium/third-party.md +msgid "The total crates needed are:" msgstr "" -#: src/bare-metal/microcontrollers/debugging.md -msgid "In GDB, try running:" -msgstr "" +#: src/exercises/chromium/third-party.md +#, fuzzy +msgid "`instant`," +msgstr "Konstant" -#: src/bare-metal/microcontrollers/other-projects.md -#: src/bare-metal/aps/other-projects.md -msgid "Other projects" -msgstr "Andre projekter" +#: src/exercises/chromium/third-party.md +msgid "`lock_api`," +msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md -msgid "[RTIC](https://rtic.rs/)" -msgstr "[RTIC](https://rtic.rs/)" +#: src/exercises/chromium/third-party.md +msgid "`parking_lot`," +msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md -msgid "\"Real-Time Interrupt-driven Concurrency\"" +#: src/exercises/chromium/third-party.md +msgid "`parking_lot_core`," msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md -msgid "" -"Shared resource management, message passing, task scheduling, timer queue" +#: src/exercises/chromium/third-party.md +msgid "`redox_syscall`," msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md -msgid "[Embassy](https://embassy.dev/)" -msgstr "[Embassy](https://embassy.dev/)" +#: src/exercises/chromium/third-party.md +msgid "`scopeguard`," +msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md -msgid "`async` executors with priorities, timers, networking, USB" +#: src/exercises/chromium/third-party.md +msgid "`smallvec`, and" msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md -msgid "[TockOS](https://www.tockos.org/documentation/getting-started)" -msgstr "[TockOS](https://www.tockos.org/documentation/getting-started)" +#: src/exercises/chromium/third-party.md +msgid "`uwuify`." +msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md +#: src/exercises/chromium/third-party.md msgid "" -"Security-focused RTOS with preemptive scheduling and Memory Protection Unit " -"support" +"If students are downloading even more than that, they probably forgot to " +"turn off the default features." msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md -msgid "[Hubris](https://hubris.oxide.computer/)" -msgstr "[Hubris](https://hubris.oxide.computer/)" - -#: src/bare-metal/microcontrollers/other-projects.md +#: src/exercises/chromium/third-party.md msgid "" -"Microkernel RTOS from Oxide Computer Company with memory protection, " -"unprivileged drivers, IPC" +"Thanks to [Daniel Liu](https://github.com/Daniel-Liu-c0deb0t) for this crate!" msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md -msgid "[Bindings for FreeRTOS](https://github.com/lobaro/FreeRTOS-rust)" -msgstr "[Bindinger til FreeRTOS](https://github.com/lobaro/FreeRTOS-rust)" +#: src/exercises/chromium/bringing-it-together.md +msgid "Bringing It Together --- Exercise" +msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md +#: src/exercises/chromium/bringing-it-together.md msgid "" -"Some platforms have `std` implementations, e.g. [esp-idf](https://esp-rs." -"github.io/book/overview/using-the-standard-library.html)." +"In this exercise, you're going to add a whole new Chromium feature, bringing " +"together everything you already learned." msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md -msgid "RTIC can be considered either an RTOS or a concurrency framework." +#: src/exercises/chromium/bringing-it-together.md +msgid "The Brief from Product Management" msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md -msgid "It doesn't include any HALs." +#: src/exercises/chromium/bringing-it-together.md +msgid "" +"A community of pixies has been discovered living in a remote rainforest. " +"It's important that we get Chromium for Pixies delivered to them as soon as " +"possible." msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md +#: src/exercises/chromium/bringing-it-together.md msgid "" -"It uses the Cortex-M NVIC (Nested Virtual Interrupt Controller) for " -"scheduling rather than a proper kernel." +"The requirement is to translate all Chromium's UI strings into Pixie " +"language." msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md -msgid "Cortex-M only." +#: src/exercises/chromium/bringing-it-together.md +msgid "" +"There's not time to wait for proper translations, but fortunately pixie " +"language is very close to English, and it turns out there's a Rust crate " +"which does the translation." msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md +#: src/exercises/chromium/bringing-it-together.md msgid "" -"Google uses TockOS on the Haven microcontroller for Titan security keys." +"In fact, you already [imported that crate in the previous exercise](https://" +"crates.io/crates/uwuify)." msgstr "" -#: src/bare-metal/microcontrollers/other-projects.md +#: src/exercises/chromium/bringing-it-together.md msgid "" -"FreeRTOS is mostly written in C, but there are Rust bindings for writing " -"applications." +"(Obviously, real translations of Chrome require incredible care and " +"diligence. Don't ship this!)" msgstr "" -#: src/exercises/bare-metal/morning.md -msgid "" -"We will read the direction from an I2C compass, and log the readings to a " -"serial port." +#: src/exercises/chromium/bringing-it-together.md +msgid "Steps" msgstr "" -#: src/exercises/bare-metal/morning.md src/exercises/concurrency/morning.md +#: src/exercises/chromium/bringing-it-together.md msgid "" -"After looking at the exercises, you can look at the [solutions](solutions-" -"morning.md) provided." +"Modify `ResourceBundle::MaybeMangleLocalizedString` so that it uwuifies all " +"strings before display. In this special build of Chromium, it should always " +"do this irrespective of the setting of `mangle_localized_strings_`." msgstr "" -#: src/exercises/bare-metal/compass.md +#: src/exercises/chromium/bringing-it-together.md msgid "" -"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." +"If you've done everything right across all these exercises, congratulations, " +"you should have created Chrome for pixies!" msgstr "" -#: src/exercises/bare-metal/compass.md -msgid "Hints:" +#: src/exercises/chromium/bringing-it-together.md +msgid "" +"UTF16 vs UTF8. Students should be aware that Rust strings are always UTF8, " +"and will probably decide that it's better to do the conversion on the C++ " +"side using `base::UTF16ToUTF8` and back again." msgstr "" -#: src/exercises/bare-metal/compass.md +#: src/exercises/chromium/bringing-it-together.md msgid "" -"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/)." +"If students decide to do the conversion on the Rust side, they'll need to " +"consider [`String::from_utf16`](https://doc.rust-lang.org/std/string/" +"struct.String.html#method.from_utf16), consider error handling, and consider " +"which [CXX supported types can transfer a lot of u16s](https://cxx.rs/" +"binding/slice.html)." msgstr "" -#: src/exercises/bare-metal/compass.md +#: src/exercises/chromium/bringing-it-together.md msgid "" -"The LSM303AGR Inertial Measurement Unit is connected to the internal I2C bus." +"Students may design the C++/Rust boundary in several different ways, e.g. " +"taking and returning strings by value, or taking a mutable reference to a " +"string. If a mutable reference is used, CXX will likely tell the student " +"that they need to use [`Pin`](https://doc.rust-lang.org/std/pin/). You may " +"need to explain what `Pin` does, and then explain why CXX needs it for " +"mutable references to C++ data: the answer is that C++ data can't be moved " +"around like Rust data, because it may contain self-referential pointers." msgstr "" -#: src/exercises/bare-metal/compass.md +#: src/exercises/chromium/bringing-it-together.md msgid "" -"TWI is another name for I2C, so the I2C master peripheral is called TWIM." +"The C++ target containing `ResourceBundle::MaybeMangleLocalizedString` will " +"need to depend on a `rust_static_library` target. The student probably " +"already did this." msgstr "" -#: src/exercises/bare-metal/compass.md +#: src/exercises/chromium/bringing-it-together.md 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." +"The `rust_static_library` target will need to depend on `//third_party/rust/" +"uwuify/v0_2:lib`." msgstr "" -#: src/exercises/bare-metal/compass.md +#: src/exercises/chromium/solutions.md 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." +"Solutions to the Chromium exercises can be found in [this series of CLs]" +"(https://chromium-review.googlesource.com/c/chromium/src/+/5096560)." msgstr "" -#: src/exercises/bare-metal/compass.md +#: src/bare-metal.md +msgid "Welcome to Bare Metal Rust" +msgstr "Velkommen til Rust på det rå jern" + +#: src/bare-metal.md 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." +"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/exercises/bare-metal/compass.md +#: src/bare-metal.md msgid "" -"Download the [exercise template](../../comprehensive-rust-exercises.zip) and " -"look in the `compass` directory for the following files." +"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/exercises/bare-metal/compass.md src/exercises/bare-metal/rtc.md -msgid "_src/main.rs_:" -msgstr "_src/main.rs_:" +#: src/bare-metal.md +msgid "What is `no_std` Rust?" +msgstr "" -#: src/exercises/bare-metal/compass.md -#: src/exercises/bare-metal/solutions-morning.md -msgid "// Configure serial port.\n" +#: src/bare-metal.md +msgid "Writing firmware for microcontrollers." msgstr "" -#: src/exercises/bare-metal/compass.md -#: src/exercises/bare-metal/solutions-morning.md -msgid "// Use the system timer as a delay provider.\n" +#: src/bare-metal.md +msgid "Writing bootloader / kernel code for application processors." msgstr "" -#: src/exercises/bare-metal/compass.md +#: src/bare-metal.md +msgid "Some useful crates for bare-metal Rust development." +msgstr "" + +#: src/bare-metal.md msgid "" -"// Set up the I2C controller and Inertial Measurement Unit.\n" -" // TODO\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 nRF52833 microcontroller " +"with some LEDs and buttons, an I2C-connected accelerometer and compass, and " +"an on-board SWD debugger." msgstr "" -#: src/exercises/bare-metal/compass.md -#: src/exercises/bare-metal/solutions-morning.md -msgid "\"Ready.\"" +#: src/bare-metal.md +msgid "" +"To get started, install some tools we'll need later. On gLinux or Debian:" msgstr "" -#: src/exercises/bare-metal/compass.md +#: src/bare-metal.md msgid "" -"// Read compass data and log it to the serial port.\n" -" // TODO\n" +"And give users in the `plugdev` group access to the micro:bit programmer:" msgstr "" -#: src/exercises/bare-metal/compass.md src/exercises/bare-metal/rtc.md -msgid "_Cargo.toml_ (you shouldn't need to change this):" +#: src/bare-metal.md +msgid "" +"You should see \"NXP ARM mbed\" in the output of `lsusb` if the device is " +"available. If you are using a Linux environment on a Chromebook, you will " +"need to share the USB device with Linux, via `chrome://os-settings/crostini/" +"sharedUsbDevices`." msgstr "" -#: src/exercises/bare-metal/compass.md -msgid "_Embed.toml_ (you shouldn't need to change this):" +#: src/bare-metal.md src/bare-metal/microcontrollers/debugging.md +msgid "On MacOS:" +msgstr "På MacOS:" + +#: src/bare-metal/no_std.md +msgid "`core`" +msgstr "`core`" + +#: src/bare-metal/no_std.md +msgid "`std`" +msgstr "`std`" + +#: src/bare-metal/no_std.md +msgid "Slices, `&str`, `CStr`" msgstr "" -#: src/exercises/bare-metal/compass.md src/exercises/bare-metal/rtc.md -msgid "_.cargo/config.toml_ (you shouldn't need to change this):" +#: src/bare-metal/no_std.md +msgid "`NonZeroU8`..." +msgstr "`NonZeroU8`..." + +#: src/bare-metal/no_std.md +msgid "`Option`, `Result`" +msgstr "`Option`, `Result`" + +#: src/bare-metal/no_std.md +msgid "`Display`, `Debug`, `write!`..." +msgstr "`Display`, `Debug`, `write!`..." + +#: src/bare-metal/no_std.md +msgid "`Iterator`" +msgstr "`Iterator`" + +#: src/bare-metal/no_std.md +msgid "`Error`" +msgstr "`Error`" + +#: src/bare-metal/no_std.md +msgid "`panic!`, `assert_eq!`..." +msgstr "`panic!`, `assert_eq!`..." + +#: src/bare-metal/no_std.md +msgid "`NonNull` and all the usual pointer-related functions" msgstr "" -#: src/exercises/bare-metal/compass.md -msgid "See the serial output on Linux with:" +#: src/bare-metal/no_std.md +msgid "`Future` and `async`/`await`" +msgstr "`Future` og `async`/`await`" + +#: src/bare-metal/no_std.md +msgid "`fence`, `AtomicBool`, `AtomicPtr`, `AtomicU32`..." +msgstr "`fence`, `AtomicBool`, `AtomicPtr`, `AtomicU32`..." + +#: src/bare-metal/no_std.md +msgid "`Duration`" +msgstr "`Duration`" + +#: src/bare-metal/no_std.md +msgid "`Box`, `Cow`, `Arc`, `Rc`" +msgstr "`Box`, `Cow`, `Arc`, `Rc`" + +#: src/bare-metal/no_std.md +msgid "`Vec`, `BinaryHeap`, `BtreeMap`, `LinkedList`, `VecDeque`" +msgstr "`Vec`, `BinaryHeap`, `BtreeMap`, `LinkedList`, `VecDeque`" + +#: src/bare-metal/no_std.md +msgid "`String`, `CString`, `format!`" +msgstr "`String`, `CString`, `format!`" + +#: src/bare-metal/no_std.md +msgid "`Mutex`, `Condvar`, `Barrier`, `Once`, `RwLock`, `mpsc`" +msgstr "`Mutex`, `Condvar`, `Barrier`, `Once`, `RwLock`, `mpsc`" + +#: src/bare-metal/no_std.md +msgid "`File` and the rest of `fs`" +msgstr "`File` og resten af `fs`" + +#: src/bare-metal/no_std.md +msgid "`println!`, `Read`, `Write`, `Stdin`, `Stdout` and the rest of `io`" +msgstr "`println!`, `Read`, `Write`, `Stdin`, `Stdout` og resten af `io`" + +#: src/bare-metal/no_std.md +msgid "`Path`, `OsString`" +msgstr "`Path`, `OsString`" + +#: src/bare-metal/no_std.md +msgid "`net`" +msgstr "`net`" + +#: src/bare-metal/no_std.md +msgid "`Command`, `Child`, `ExitCode`" +msgstr "`Command`, `Child`, `ExitCode`" + +#: src/bare-metal/no_std.md +msgid "`spawn`, `sleep` and the rest of `thread`" +msgstr "`spawn`, `sleep` og resten af `thread`" + +#: src/bare-metal/no_std.md +msgid "`SystemTime`, `Instant`" +msgstr "`SystemTime`, `Instant`" + +#: src/bare-metal/no_std.md +msgid "`HashMap` depends on RNG." msgstr "" -#: src/exercises/bare-metal/compass.md -msgid "" -"Or on Mac OS something like (the device name may be slightly different):" +#: src/bare-metal/no_std.md +msgid "`std` re-exports the contents of both `core` and `alloc`." msgstr "" -#: src/exercises/bare-metal/compass.md -msgid "Use Ctrl+A Ctrl+Q to quit picocom." +#: src/bare-metal/minimal.md +msgid "A minimal `no_std` program" msgstr "" -#: src/exercises/bare-metal/solutions-morning.md -msgid "Bare Metal Rust Morning Exercise" -msgstr "Bar metal formiddagsøvelser" +#: src/bare-metal/minimal.md +msgid "This will compile to an empty binary." +msgstr "" -#: src/exercises/bare-metal/solutions-morning.md -msgid "([back to exercise](compass.md))" -msgstr "([tilbage til øvelsen](compass.md))" +#: src/bare-metal/minimal.md +msgid "`std` provides a panic handler; without it we must provide our own." +msgstr "" -#: src/exercises/bare-metal/solutions-morning.md -msgid "// Set up the I2C controller and Inertial Measurement Unit.\n" +#: src/bare-metal/minimal.md +msgid "It can also be provided by another crate, such as `panic-halt`." msgstr "" -#: src/exercises/bare-metal/solutions-morning.md -msgid "\"Setting up IMU...\"" +#: src/bare-metal/minimal.md +msgid "" +"Depending on the target, you may need to compile with `panic = \"abort\"` to " +"avoid an error about `eh_personality`." msgstr "" -#: src/exercises/bare-metal/solutions-morning.md -msgid "// Set up display and timer.\n" +#: src/bare-metal/minimal.md +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/exercises/bare-metal/solutions-morning.md -msgid "// Read compass data and log it to the serial port.\n" +#: src/bare-metal/alloc.md +msgid "" +"To use `alloc` you must implement a [global (heap) allocator](https://" +"doc.rust-lang.org/stable/std/alloc/trait.GlobalAlloc.html)." msgstr "" -#: src/exercises/bare-metal/solutions-morning.md -msgid "\"{},{},{}\\t{},{},{}\"" -msgstr "\"{},{},{}\\t{},{},{}\"" +#: src/bare-metal/alloc.md +#, fuzzy +msgid "// SAFETY: `HEAP` is only used here and `entry` is only called once.\n" +msgstr "" +"// Safe because `HEAP` is only used here and `entry` is only called once.\n" -#: src/exercises/bare-metal/solutions-morning.md +#: src/bare-metal/alloc.md +msgid "// Give the allocator some memory to allocate.\n" +msgstr "// Give the allocator some memory to allocate.\n" + +#: src/bare-metal/alloc.md +msgid "// Now we can do things that require heap allocation.\n" +msgstr "// Now we can do things that require heap allocation.\n" + +#: src/bare-metal/alloc.md +msgid "\"A string\"" +msgstr "\"En streng\"" + +#: src/bare-metal/alloc.md msgid "" -"// If button A is pressed, switch to the next mode and briefly blink all " -"LEDs\n" -" // on.\n" +"`buddy_system_allocator` is a 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/aps.md -msgid "Application processors" +#: src/bare-metal/alloc.md +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/aps.md +#: src/bare-metal/alloc.md msgid "" -"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." +"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/aps.md +#: src/bare-metal/alloc.md msgid "" -"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." +"`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/aps.md +#: src/bare-metal/alloc.md +msgid "This example will build but not run, as it doesn't have an entry point." +msgstr "" + +#: src/bare-metal/microcontrollers.md 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." +"The `cortex_m_rt` crate provides (among other things) a reset handler for " +"Cortex M microcontrollers." msgstr "" -#: src/bare-metal/aps/entry-point.md +#: src/bare-metal/microcontrollers.md msgid "" -"Before we can start running Rust code, we need to do some initialisation." +"Next we'll look at how to access peripherals, with increasing levels of " +"abstraction." msgstr "" -#: src/bare-metal/aps/entry-point.md +#: src/bare-metal/microcontrollers.md msgid "" -"```armasm\n" -".section .init.entry, \"ax\"\n" -".global entry\n" -"entry:\n" -" /*\n" -" * Load and apply the memory management configuration, ready to enable " -"MMU and\n" -" * caches.\n" -" */\n" -" adrp x30, idmap\n" -" msr ttbr0_el1, x30\n" -"\n" -" mov_i x30, .Lmairval\n" -" msr mair_el1, x30\n" -"\n" -" mov_i x30, .Ltcrval\n" -" /* Copy the supported PA range into TCR_EL1.IPS. */\n" -" mrs x29, id_aa64mmfr0_el1\n" -" bfi x30, x29, #32, #4\n" -"\n" -" msr tcr_el1, x30\n" -"\n" -" mov_i x30, .Lsctlrval\n" -"\n" -" /*\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" -" tlbi vmalle1\n" -" ic iallu\n" -" dsb nsh\n" -" isb\n" -"\n" -" /*\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" -" isb\n" -"\n" -" /* Disable trapping floating point access in EL1. */\n" -" mrs x30, cpacr_el1\n" -" orr x30, x30, #(0x3 << 20)\n" -" msr cpacr_el1, x30\n" -" isb\n" -"\n" -" /* Zero out the bss section. */\n" -" adr_l x29, bss_begin\n" -" adr_l x30, bss_end\n" -"0: cmp x29, x30\n" -" b.hs 1f\n" -" stp xzr, xzr, [x29], #16\n" -" b 0b\n" -"\n" -"1: /* Prepare the stack. */\n" -" adr_l x30, boot_stack_end\n" -" mov sp, x30\n" -"\n" -" /* Set up exception vector. */\n" -" adr x30, vector_table_el1\n" -" msr vbar_el1, x30\n" -"\n" -" /* Call into Rust code. */\n" -" bl main\n" -"\n" -" /* Loop forever waiting for interrupts. */\n" -"2: wfi\n" -" b 2b\n" -"```" +"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/aps/entry-point.md -msgid "" -"This is the same as it would be for C: initialising the processor state, " -"zeroing the BSS, and setting up the stack pointer." +#: src/bare-metal/microcontrollers.md +msgid "Run the example with `cargo embed --bin minimal`" msgstr "" -#: src/bare-metal/aps/entry-point.md +#: src/bare-metal/microcontrollers/mmio.md 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." +"Most microcontrollers access peripherals via memory-mapped IO. Let's try " +"turning on an LED on our micro:bit:" msgstr "" -#: src/bare-metal/aps/entry-point.md +#: src/bare-metal/microcontrollers/mmio.md +msgid "/// GPIO port 0 peripheral address\n" +msgstr "/// GPIO port 0 peripheral address\n" + +#: src/bare-metal/microcontrollers/mmio.md +msgid "// GPIO peripheral offsets\n" +msgstr "// GPIO peripheral offsets\n" + +#: src/bare-metal/microcontrollers/mmio.md +msgid "// PIN_CNF fields\n" +msgstr "// PIN_CNF fields\n" + +#: src/bare-metal/microcontrollers/mmio.md +#: src/bare-metal/microcontrollers/pacs.md +#: src/bare-metal/microcontrollers/hals.md +msgid "// Configure GPIO 0 pins 21 and 28 as push-pull outputs.\n" +msgstr "// Configure GPIO 0 pins 21 and 28 as push-pull outputs.\n" + +#: src/bare-metal/microcontrollers/mmio.md +#, fuzzy 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." +"// SAFETY: The pointers are to valid peripheral control registers, and no\n" +" // aliases exist.\n" msgstr "" +"// Safe because the pointers are to valid peripheral control registers, and\n" +" // no aliases exist.\n" -#: src/bare-metal/aps/entry-point.md +#: src/bare-metal/microcontrollers/mmio.md +#: src/bare-metal/microcontrollers/pacs.md +#: src/bare-metal/microcontrollers/hals.md +msgid "// Set pin 28 low and pin 21 high to turn the LED on.\n" +msgstr "// Set pin 28 low and pin 21 high to turn the LED on.\n" + +#: src/bare-metal/microcontrollers/mmio.md msgid "" -"We need to enable the MMU and cache before reading or writing any memory. If " -"we don't:" +"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/aps/entry-point.md -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." +#: src/bare-metal/microcontrollers/mmio.md +#: src/bare-metal/microcontrollers/pacs.md +#: src/bare-metal/microcontrollers/hals.md +#: src/bare-metal/microcontrollers/board-support.md +msgid "Run the example with:" msgstr "" -#: src/bare-metal/aps/entry-point.md +#: src/bare-metal/microcontrollers/pacs.md +msgid "Peripheral Access Crates" +msgstr "" + +#: src/bare-metal/microcontrollers/pacs.md 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 cacheable 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.)" +"[`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/aps/entry-point.md +#: src/bare-metal/microcontrollers/pacs.md 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." +"SVD (System View Description) files are XML files typically provided by " +"silicon vendors that describe the memory map of the device." msgstr "" -#: src/bare-metal/aps/entry-point.md +#: src/bare-metal/microcontrollers/pacs.md msgid "" -"We also set up the exception vector (`vbar_el1`), which we'll see more about " -"later." +"They are organized by peripheral, register, field and value, with names, " +"descriptions, addresses and so on." msgstr "" -#: src/bare-metal/aps/entry-point.md +#: src/bare-metal/microcontrollers/pacs.md 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." +"SVD files are often buggy and incomplete, so there are various projects that " +"patch the mistakes, add missing details, and publish the generated crates." msgstr "" -#: src/bare-metal/aps/inline-assembly.md -msgid "Inline assembly" +#: src/bare-metal/microcontrollers/pacs.md +msgid "`cortex-m-rt` provides the vector table, among other things." msgstr "" -#: src/bare-metal/aps/inline-assembly.md +#: src/bare-metal/microcontrollers/pacs.md msgid "" -"Sometimes we need to use assembly to do things that aren't possible with " -"Rust code. For example, to make an HVC (hypervisor call) to tell the " -"firmware to power off the system:" +"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/aps/inline-assembly.md +#: src/bare-metal/microcontrollers/hals.md +msgid "HAL crates" +msgstr "" + +#: src/bare-metal/microcontrollers/hals.md msgid "" -"// Safe because this only uses the declared registers and doesn't do\n" -" // anything with memory.\n" +"[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/aps/inline-assembly.md -msgid "\"hvc #0\"" +#: src/bare-metal/microcontrollers/hals.md +msgid "// Create HAL wrapper for GPIO port 0.\n" msgstr "" -#: src/bare-metal/aps/inline-assembly.md -msgid "\"w0\"" +#: src/bare-metal/microcontrollers/hals.md +msgid "" +"`set_low` and `set_high` are methods on the `embedded_hal` `OutputPin` trait." msgstr "" -#: src/bare-metal/aps/inline-assembly.md -msgid "\"w1\"" +#: src/bare-metal/microcontrollers/hals.md +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/aps/inline-assembly.md -msgid "\"w2\"" +#: src/bare-metal/microcontrollers/board-support.md +msgid "Board support crates" msgstr "" -#: src/bare-metal/aps/inline-assembly.md -msgid "\"w3\"" +#: src/bare-metal/microcontrollers/board-support.md +msgid "" +"Board support crates provide a further level of wrapping for a specific " +"board for convenience." msgstr "" -#: src/bare-metal/aps/inline-assembly.md -msgid "\"w4\"" +#: src/bare-metal/microcontrollers/board-support.md +msgid "" +"In this case the board support crate is just providing more useful names, " +"and a bit of initialization." msgstr "" -#: src/bare-metal/aps/inline-assembly.md -msgid "\"w5\"" +#: src/bare-metal/microcontrollers/board-support.md +msgid "" +"The crate may also include drivers for some on-board devices outside of the " +"microcontroller itself." msgstr "" -#: src/bare-metal/aps/inline-assembly.md -msgid "\"w6\"" +#: src/bare-metal/microcontrollers/board-support.md +msgid "`microbit-v2` includes a simple driver for the LED matrix." msgstr "" -#: src/bare-metal/aps/inline-assembly.md -msgid "\"w7\"" +#: src/bare-metal/microcontrollers/type-state.md +msgid "The type state pattern" msgstr "" -#: src/bare-metal/aps/inline-assembly.md +#: src/bare-metal/microcontrollers/type-state.md +msgid "// let gpio0_01_again = gpio0.p0_01; // Error, moved.\n" +msgstr "// let gpio0_01_again = gpio0.p0_01; // Error, moved.\n" + +#: src/bare-metal/microcontrollers/type-state.md +msgid "// pin_input.is_high(); // Error, moved.\n" +msgstr "// pin_input.is_high(); // Error, moved.\n" + +#: src/bare-metal/microcontrollers/type-state.md msgid "" -"(If you actually want to do this, use the [`smccc`](https://crates.io/crates/" -"smccc) crate which has wrappers for all these functions.)" +"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/aps/inline-assembly.md +#: src/bare-metal/microcontrollers/type-state.md msgid "" -"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." +"Changing the configuration of a pin consumes the old pin instance, so you " +"can't use the old instance afterwards." msgstr "" -#: src/bare-metal/aps/inline-assembly.md +#: src/bare-metal/microcontrollers/type-state.md 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." +"The type of a value indicates the state 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/aps/inline-assembly.md +#: src/bare-metal/microcontrollers/type-state.md msgid "" -"This `main` function needs to be `#[no_mangle]` and `extern \"C\"` because " -"it is called from our entry point in `entry.S`." +"You can call `is_high` on an input pin and `set_high` on an output pin, but " +"not vice-versa." msgstr "" -#: src/bare-metal/aps/inline-assembly.md -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." +#: src/bare-metal/microcontrollers/type-state.md +msgid "Many HAL crates follow this pattern." msgstr "" -#: src/bare-metal/aps/inline-assembly.md +#: src/bare-metal/microcontrollers/embedded-hal.md msgid "" -"Run the example in QEMU with `make qemu_psci` under `src/bare-metal/aps/" -"examples`." +"The [`embedded-hal`](https://crates.io/crates/embedded-hal) crate provides a " +"number of traits covering common microcontroller peripherals:" msgstr "" -#: src/bare-metal/aps/mmio.md -msgid "Volatile memory access for MMIO" +#: src/bare-metal/microcontrollers/embedded-hal.md +msgid "GPIO" +msgstr "GPIO" + +#: src/bare-metal/microcontrollers/embedded-hal.md +msgid "PWM" msgstr "" -#: src/bare-metal/aps/mmio.md -msgid "Use `pointer::read_volatile` and `pointer::write_volatile`." +#: src/bare-metal/microcontrollers/embedded-hal.md +msgid "Delay timers" msgstr "" -#: src/bare-metal/aps/mmio.md -msgid "Never hold a reference." +#: src/bare-metal/microcontrollers/embedded-hal.md +msgid "I2C and SPI buses and devices" msgstr "" -#: src/bare-metal/aps/mmio.md +#: src/bare-metal/microcontrollers/embedded-hal.md msgid "" -"`addr_of!` lets you get fields of structs without creating an intermediate " -"reference." +"Similar traits for byte streams (e.g. UARTs), CAN buses and RNGs are broken " +"out into [`embedded-io`](https://crates.io/crates/embedded-io), [`embedded-" +"can`](https://crates.io/crates/embedded-can) and [`rand_core`](https://" +"crates.io/crates/rand_core) respectively." msgstr "" -#: src/bare-metal/aps/mmio.md +#: src/bare-metal/microcontrollers/embedded-hal.md msgid "" -"Volatile access: read or write operations may have side-effects, so prevent " -"the compiler or hardware from reordering, duplicating or eliding them." +"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 device instance." msgstr "" -#: src/bare-metal/aps/mmio.md +#: src/bare-metal/microcontrollers/embedded-hal.md 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." +"The traits cover using the peripherals but not initializing or configuring " +"them, as initialization and configuration is usually highly platform-" +"specific." msgstr "" -#: src/bare-metal/aps/mmio.md +#: src/bare-metal/microcontrollers/embedded-hal.md 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." +"There are implementations for many microcontrollers, as well as other " +"platforms such as Linux on Raspberry Pi." msgstr "" -#: src/bare-metal/aps/mmio.md +#: src/bare-metal/microcontrollers/embedded-hal.md msgid "" -"Use the `addr_of!` macro to get struct field pointers from a pointer to the " -"struct." -msgstr "" - -#: src/bare-metal/aps/uart.md -msgid "Let's write a UART driver" +"[`embedded-hal-async`](https://crates.io/crates/embedded-hal-async) provides " +"async versions of the traits." msgstr "" -#: src/bare-metal/aps/uart.md +#: src/bare-metal/microcontrollers/embedded-hal.md 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 -msgid "/// Minimal driver for a PL011 UART.\n" +"[`embedded-hal-nb`](https://crates.io/crates/embedded-hal-nb) provides " +"another approach to non-blocking I/O, based on the [`nb`](https://crates.io/" +"crates/nb) crate." msgstr "" -#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md +#: src/bare-metal/microcontrollers/probe-rs.md msgid "" -"/// 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" -" /// as device memory and not have any other aliases.\n" +"[probe-rs](https://probe.rs/) is a handy toolset for embedded debugging, " +"like OpenOCD but better integrated." msgstr "" -#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md -#: src/exercises/bare-metal/rtc.md -msgid "/// Writes a single byte to the UART.\n" -msgstr "/// Writes a single byte to the UART.\n" - -#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md -#: src/exercises/bare-metal/rtc.md -msgid "// Wait until there is room in the TX buffer.\n" -msgstr "// Wait until there is room in the TX buffer.\n" - -#: src/bare-metal/aps/uart.md +#: src/bare-metal/microcontrollers/probe-rs.md msgid "" -"// Safe because we know that the base address points to the control\n" -" // registers of a PL011 device which is appropriately mapped.\n" +"SWD (Serial Wire Debug) and JTAG via CMSIS-DAP, ST-Link and J-Link probes" msgstr "" -#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md -#: src/exercises/bare-metal/rtc.md -msgid "// Write to the TX buffer.\n" -msgstr "// Write to the TX buffer.\n" - -#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md -#: src/exercises/bare-metal/rtc.md -msgid "// Wait until the UART is no longer busy.\n" -msgstr "// Wait until the UART is no longer busy.\n" - -#: src/bare-metal/aps/uart.md -msgid "" -"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." +#: src/bare-metal/microcontrollers/probe-rs.md +msgid "GDB stub and Microsoft DAP (Debug Adapter Protocol) server" msgstr "" -#: src/bare-metal/aps/uart.md -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" +#: src/bare-metal/microcontrollers/probe-rs.md +msgid "Cargo integration" msgstr "" -#: src/bare-metal/aps/uart.md +#: src/bare-metal/microcontrollers/probe-rs.md 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." +"`cargo-embed` is a cargo subcommand to build and flash binaries, log RTT " +"(Real Time Transfers) output and connect GDB. It's configured by an " +"`Embed.toml` file in your project directory." msgstr "" -#: src/bare-metal/aps/uart/traits.md -msgid "More traits" +#: src/bare-metal/microcontrollers/probe-rs.md +msgid "" +"[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/aps/uart/traits.md +#: src/bare-metal/microcontrollers/probe-rs.md msgid "" -"We derived the `Debug` trait. It would be useful to implement a few more " -"traits too." +"ST-Link is a range of in-circuit debuggers from ST Microelectronics, J-Link " +"is a range from SEGGER." msgstr "" -#: src/bare-metal/aps/uart/traits.md src/exercises/bare-metal/rtc.md -#: src/exercises/bare-metal/solutions-afternoon.md +#: src/bare-metal/microcontrollers/probe-rs.md msgid "" -"// Safe because it just contains a pointer to device memory, which can be\n" -"// accessed from any context.\n" +"The Debug Access Port is usually either a 5-pin JTAG interface or 2-pin " +"Serial Wire Debug." msgstr "" -"// Safe because it just contains a pointer to device memory, which can be\n" -"// accessed from any context.\n" -#: src/bare-metal/aps/uart/traits.md +#: src/bare-metal/microcontrollers/probe-rs.md msgid "" -"Implementing `Write` lets us use the `write!` and `writeln!` macros with our " -"`Uart` type." +"probe-rs is a library that you can integrate into your own tools if you want " +"to." msgstr "" -#: src/bare-metal/aps/uart/traits.md +#: src/bare-metal/microcontrollers/probe-rs.md msgid "" -"Run the example in QEMU with `make qemu_minimal` under `src/bare-metal/aps/" -"examples`." +"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/aps/better-uart.md -msgid "A better UART driver" +#: src/bare-metal/microcontrollers/probe-rs.md +msgid "cargo-embed is a binary built using the probe-rs library." msgstr "" -#: src/bare-metal/aps/better-uart.md +#: src/bare-metal/microcontrollers/probe-rs.md msgid "" -"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." +"RTT (Real Time Transfers) is a mechanism to transfer data between the debug " +"host and the target through a number of ring buffers." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "Offset" -msgstr "" +#: src/bare-metal/microcontrollers/debugging.md +#, fuzzy +msgid "_Embed.toml_:" +msgstr "Embed.toml:" -#: src/bare-metal/aps/better-uart.md -msgid "Register name" +#: src/bare-metal/microcontrollers/debugging.md +msgid "In one terminal under `src/bare-metal/microcontrollers/examples/`:" msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "Width" +#: src/bare-metal/microcontrollers/debugging.md +msgid "In another terminal in the same directory:" msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "0x00" +#: src/bare-metal/microcontrollers/debugging.md +msgid "On gLinux or Debian:" msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "DR" +#: src/bare-metal/microcontrollers/debugging.md +msgid "In GDB, try running:" msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "12" -msgstr "" +#: src/bare-metal/microcontrollers/other-projects.md +#: src/bare-metal/aps/other-projects.md +msgid "Other projects" +msgstr "Andre projekter" -#: src/bare-metal/aps/better-uart.md -msgid "0x04" -msgstr "" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "[RTIC](https://rtic.rs/)" +msgstr "[RTIC](https://rtic.rs/)" -#: src/bare-metal/aps/better-uart.md -msgid "RSR" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "\"Real-Time Interrupt-driven Concurrency\"." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "0x18" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "" +"Shared resource management, message passing, task scheduling, timer queue." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "FR" -msgstr "" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "[Embassy](https://embassy.dev/)" +msgstr "[Embassy](https://embassy.dev/)" -#: src/bare-metal/aps/better-uart.md -msgid "9" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "`async` executors with priorities, timers, networking, USB." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "0x20" -msgstr "" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "[TockOS](https://www.tockos.org/documentation/getting-started)" +msgstr "[TockOS](https://www.tockos.org/documentation/getting-started)" -#: src/bare-metal/aps/better-uart.md -msgid "ILPR" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "" +"Security-focused RTOS with preemptive scheduling and Memory Protection Unit " +"support." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "0x24" -msgstr "" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "[Hubris](https://hubris.oxide.computer/)" +msgstr "[Hubris](https://hubris.oxide.computer/)" -#: src/bare-metal/aps/better-uart.md -msgid "IBRD" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "" +"Microkernel RTOS from Oxide Computer Company with memory protection, " +"unprivileged drivers, IPC." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "16" +#: src/bare-metal/microcontrollers/other-projects.md +#, fuzzy +msgid "[Bindings for FreeRTOS](https://github.com/lobaro/FreeRTOS-rust)." +msgstr "[Bindinger til FreeRTOS](https://github.com/lobaro/FreeRTOS-rust)" + +#: src/bare-metal/microcontrollers/other-projects.md +msgid "" +"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/aps/better-uart.md -msgid "0x28" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "RTIC can be considered either an RTOS or a concurrency framework." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "FBRD" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "It doesn't include any HALs." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "0x2c" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "" +"It uses the Cortex-M NVIC (Nested Virtual Interrupt Controller) for " +"scheduling rather than a proper kernel." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "LCR_H" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "Cortex-M only." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "0x30" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "" +"Google uses TockOS on the Haven microcontroller for Titan security keys." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "CR" +#: src/bare-metal/microcontrollers/other-projects.md +msgid "" +"FreeRTOS is mostly written in C, but there are Rust bindings for writing " +"applications." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "0x34" +#: src/exercises/bare-metal/morning.md +msgid "" +"We will read the direction from an I2C compass, and log the readings to a " +"serial port." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "IFLS" +#: src/exercises/bare-metal/morning.md +msgid "" +"After looking at the exercises, you can look at the [solutions](solutions-" +"morning.md) provided." msgstr "" -#: src/bare-metal/aps/better-uart.md -msgid "0x38" -msgstr "" - -#: src/bare-metal/aps/better-uart.md -msgid "IMSC" -msgstr "" - -#: src/bare-metal/aps/better-uart.md -msgid "11" -msgstr "" - -#: src/bare-metal/aps/better-uart.md -msgid "0x3c" -msgstr "" - -#: src/bare-metal/aps/better-uart.md -msgid "RIS" -msgstr "" - -#: src/bare-metal/aps/better-uart.md -msgid "0x40" -msgstr "" - -#: src/bare-metal/aps/better-uart.md -msgid "MIS" -msgstr "" - -#: src/bare-metal/aps/better-uart.md -msgid "0x44" -msgstr "" - -#: src/bare-metal/aps/better-uart.md -msgid "ICR" -msgstr "" - -#: src/bare-metal/aps/better-uart.md -msgid "0x48" -msgstr "" - -#: src/bare-metal/aps/better-uart.md -msgid "DMACR" +#: src/exercises/bare-metal/compass.md +msgid "" +"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/bare-metal/aps/better-uart.md -msgid "There are also some ID registers which have been omitted for brevity." +#: src/exercises/bare-metal/compass.md +msgid "Hints:" msgstr "" -#: src/bare-metal/aps/better-uart/bitflags.md +#: src/exercises/bare-metal/compass.md msgid "" -"The [`bitflags`](https://crates.io/crates/bitflags) crate is useful for " -"working with bitflags." +"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/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md -msgid "/// Flags from the UART flag register.\n" -msgstr "/// Flags from the UART flag register.\n" - -#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md -msgid "/// Clear to send.\n" -msgstr "/// Clear to send.\n" - -#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md -msgid "/// Data set ready.\n" -msgstr "/// Data set ready.\n" - -#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md -msgid "/// Data carrier detect.\n" -msgstr "/// Data carrier detect.\n" - -#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md -msgid "/// UART busy transmitting data.\n" -msgstr "/// UART busy transmitting data.\n" - -#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md -msgid "/// Receive FIFO is empty.\n" -msgstr "/// Receive FIFO is empty.\n" - -#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md -msgid "/// Transmit FIFO is full.\n" -msgstr "/// Transmit FIFO is full.\n" - -#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md -msgid "/// Receive FIFO is full.\n" -msgstr "/// Receive FIFO is full.\n" - -#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md -msgid "/// Transmit FIFO is empty.\n" -msgstr "/// Transmit FIFO is empty.\n" - -#: src/bare-metal/aps/better-uart/bitflags.md src/exercises/bare-metal/rtc.md -msgid "/// Ring indicator.\n" -msgstr "/// Ring indicator.\n" - -#: src/bare-metal/aps/better-uart/bitflags.md +#: src/exercises/bare-metal/compass.md msgid "" -"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 -msgid "Multiple registers" +"The LSM303AGR Inertial Measurement Unit is connected to the internal I2C bus." msgstr "" -#: src/bare-metal/aps/better-uart/registers.md +#: src/exercises/bare-metal/compass.md msgid "" -"We can use a struct to represent the memory layout of the UART's registers." +"TWI is another name for I2C, so the I2C master peripheral is called TWIM." msgstr "" -#: src/bare-metal/aps/better-uart/registers.md +#: src/exercises/bare-metal/compass.md msgid "" -"[`#[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 -msgid "Now let's use the new `Registers` struct in our driver." +"The LSM303AGR driver needs something implementing the " +"`embedded_hal::i2c::I2c` trait. The [`microbit::hal::Twim`](https://docs.rs/" +"microbit-v2/latest/microbit/hal/struct.Twim.html) struct implements this." msgstr "" -#: src/bare-metal/aps/better-uart/driver.md -msgid "/// Driver for a PL011 UART.\n" +#: src/exercises/bare-metal/compass.md +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/bare-metal/aps/better-uart/driver.md src/exercises/bare-metal/rtc.md +#: src/exercises/bare-metal/compass.md msgid "" -"// Safe because we know that self.registers points to the control\n" -" // registers of a PL011 device which is appropriately mapped.\n" +"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 "" -"// Safe because we know that self.registers points to the control\n" -" // registers of a PL011 device which is appropriately mapped.\n" -#: src/bare-metal/aps/better-uart/driver.md src/exercises/bare-metal/rtc.md -#, fuzzy +#: src/exercises/bare-metal/compass.md msgid "" -"/// Reads and returns a pending byte, or `None` if nothing has been\n" -" /// received.\n" +"Download the [exercise template](../../comprehensive-rust-exercises.zip) and " +"look in the `compass` directory for the following files." msgstr "" -"/// Reads and returns a pending byte, or `None` if nothing has been " -"received.\n" -#: src/bare-metal/aps/better-uart/driver.md src/exercises/bare-metal/rtc.md -msgid "// TODO: Check for error conditions in bits 8-11.\n" -msgstr "// TODO: Check for error conditions in bits 8-11.\n" +#: src/exercises/bare-metal/compass.md src/exercises/bare-metal/rtc.md +msgid "_src/main.rs_:" +msgstr "_src/main.rs_:" -#: src/bare-metal/aps/better-uart/driver.md -msgid "" -"Note the use of `addr_of!` / `addr_of_mut!` to get pointers to individual " -"fields without creating an intermediate reference, which would be unsound." +#: src/exercises/bare-metal/compass.md src/exercises/bare-metal/rtc.md +msgid "_Cargo.toml_ (you shouldn't need to change this):" msgstr "" -#: src/bare-metal/aps/better-uart/using.md src/bare-metal/aps/logging/using.md -msgid "Using it" +#: src/exercises/bare-metal/compass.md +msgid "_Embed.toml_ (you shouldn't need to change this):" msgstr "" -#: src/bare-metal/aps/better-uart/using.md -msgid "" -"Let's write a small program using our driver to write to the serial console, " -"and echo incoming bytes." +#: src/exercises/bare-metal/compass.md src/exercises/bare-metal/rtc.md +msgid "_.cargo/config.toml_ (you shouldn't need to change this):" msgstr "" -#: src/bare-metal/aps/better-uart/using.md src/bare-metal/aps/logging/using.md -#: src/exercises/bare-metal/rtc.md -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Base address of the primary PL011 UART.\n" +#: src/exercises/bare-metal/compass.md +msgid "See the serial output on Linux with:" msgstr "" -#: src/bare-metal/aps/better-uart/using.md src/bare-metal/aps/logging/using.md -#: src/exercises/bare-metal/rtc.md -#: src/exercises/bare-metal/solutions-afternoon.md +#: src/exercises/bare-metal/compass.md msgid "" -"// Safe because `PL011_BASE_ADDRESS` is the base address of a PL011 device,\n" -" // and nothing else accesses that address range.\n" +"Or on Mac OS something like (the device name may be slightly different):" msgstr "" -#: src/bare-metal/aps/better-uart/using.md src/bare-metal/aps/logging/using.md -msgid "\"main({x0:#x}, {x1:#x}, {x2:#x}, {x3:#x})\"" +#: src/exercises/bare-metal/compass.md +msgid "Use Ctrl+A Ctrl+Q to quit picocom." msgstr "" -#: src/bare-metal/aps/better-uart/using.md -msgid "b'\\r'" -msgstr "" +#: src/exercises/bare-metal/solutions-morning.md +msgid "Bare Metal Rust Morning Exercise" +msgstr "Bar metal formiddagsøvelser" -#: src/bare-metal/aps/better-uart/using.md src/async/pitfalls/cancellation.md -msgid "b'\\n'" -msgstr "" +#: src/exercises/bare-metal/solutions-morning.md +msgid "([back to exercise](compass.md))" +msgstr "([tilbage til øvelsen](compass.md))" -#: src/bare-metal/aps/better-uart/using.md -msgid "b'q'" +#: src/exercises/bare-metal/solutions-morning.md +msgid "// Configure serial port.\n" msgstr "" -#: src/bare-metal/aps/better-uart/using.md -msgid "\"Bye!\"" +#: src/exercises/bare-metal/solutions-morning.md +msgid "// Use the system timer as a delay provider.\n" msgstr "" -#: src/bare-metal/aps/better-uart/using.md -msgid "" -"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." +#: src/exercises/bare-metal/solutions-morning.md +msgid "// Set up the I2C controller and Inertial Measurement Unit.\n" msgstr "" -#: src/bare-metal/aps/better-uart/using.md -msgid "" -"Run the example in QEMU with `make qemu` under `src/bare-metal/aps/examples`." +#: src/exercises/bare-metal/solutions-morning.md +msgid "\"Setting up IMU...\"" msgstr "" -#: src/bare-metal/aps/logging.md -msgid "" -"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." +#: src/exercises/bare-metal/solutions-morning.md +msgid "// Set up display and timer.\n" msgstr "" -#: src/bare-metal/aps/logging.md src/exercises/bare-metal/rtc.md -msgid "\"[{}] {}\"" -msgstr "\"[{}] {}\"" - -#: src/bare-metal/aps/logging.md src/exercises/bare-metal/rtc.md -msgid "/// Initialises UART logger.\n" -msgstr "/// Initialises UART logger.\n" - -#: src/bare-metal/aps/logging.md -msgid "" -"The unwrap in `log` is safe because we initialise `LOGGER` before calling " -"`set_logger`." +#: src/exercises/bare-metal/solutions-morning.md +msgid "\"Ready.\"" msgstr "" -#: src/bare-metal/aps/logging/using.md -msgid "We need to initialise the logger before we use it." +#: src/exercises/bare-metal/solutions-morning.md +msgid "// Read compass data and log it to the serial port.\n" msgstr "" -#: src/bare-metal/aps/logging/using.md src/exercises/bare-metal/rtc.md -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "\"{info}\"" +#: src/exercises/bare-metal/solutions-morning.md +msgid "\"{},{},{}\\t{},{},{}\"" +msgstr "\"{},{},{}\\t{},{},{}\"" + +#: src/exercises/bare-metal/solutions-morning.md +msgid "" +"// If button A is pressed, switch to the next mode and briefly blink all " +"LEDs\n" +" // on.\n" msgstr "" -#: src/bare-metal/aps/logging/using.md -msgid "Note that our panic handler can now log details of panics." +#: src/bare-metal/aps.md +msgid "Application processors" msgstr "" -#: src/bare-metal/aps/logging/using.md +#: src/bare-metal/aps.md msgid "" -"Run the example in QEMU with `make qemu_logger` under `src/bare-metal/aps/" -"examples`." +"So far we've talked about microcontrollers, such as the Arm Cortex-M series. " +"These are typically small systems with very limited resources." msgstr "" -#: src/bare-metal/aps/exceptions.md +#: src/bare-metal/aps.md msgid "" -"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:" +"Larger systems with more resources are typically called application " +"processors, built around processors such as the ARM Cortex-A or Intel Atom." msgstr "" -#: src/bare-metal/aps/exceptions.md -msgid "EL is exception level; all our examples this afternoon run in EL1." +#: src/bare-metal/aps.md +msgid "" +"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/exceptions.md +#: src/bare-metal/aps.md 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." +"Broadly speaking, microcontrollers don't have an MMU or multiple levels of " +"privilege (exception levels on Arm CPUs, rings on x86)." msgstr "" -#: src/bare-metal/aps/exceptions.md +#: src/bare-metal/aps.md msgid "" -"For this example we just log the exception and power down, as we don't " -"expect any of them to actually happen." +"Application processors have more resources, and often run an operating " +"system, instead of directly executing the target application on startup." msgstr "" -#: src/bare-metal/aps/exceptions.md +#: src/bare-metal/aps.md 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." +"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/other-projects.md -msgid "[oreboot](https://github.com/oreboot/oreboot)" +#: src/bare-metal/aps.md +msgid "" +"We will still address this board as bare-metal, as if we were writing an " +"operating system." msgstr "" -#: src/bare-metal/aps/other-projects.md -msgid "\"coreboot without the C\"" +#: src/bare-metal/aps/entry-point.md +msgid "" +"Before we can start running Rust code, we need to do some initialization." msgstr "" -#: src/bare-metal/aps/other-projects.md -msgid "Supports x86, aarch64 and RISC-V." -msgstr "" - -#: src/bare-metal/aps/other-projects.md -msgid "Relies on LinuxBoot rather than having many drivers itself." -msgstr "" - -#: src/bare-metal/aps/other-projects.md +#: src/bare-metal/aps/entry-point.md msgid "" -"[Rust RaspberryPi OS tutorial](https://github.com/rust-embedded/rust-" -"raspberrypi-OS-tutorials)" +"```armasm\n" +"/**\n" +" * This is a generic entry point for an image. It carries out the\n" +" * operations required to prepare the loaded image to be run.\n" +" * Specifically, it\n" +" *\n" +" * - sets up the MMU with an identity map of virtual to physical\n" +" * addresses, and enables caching\n" +" * - enables floating point\n" +" * - zeroes the bss section using registers x25 and above\n" +" * - prepares the stack, pointing to a section within the image\n" +" * - sets up the exception vector\n" +" * - branches to the Rust `main` function\n" +" *\n" +" * It preserves x0-x3 for the Rust entry point, as these may contain\n" +" * boot parameters.\n" +" */\n" +".section .init.entry, \"ax\"\n" +".global entry\n" +"entry:\n" +" /*\n" +" * Load and apply the memory management configuration, ready to\n" +" * enable MMU and caches.\n" +" */\n" +" adrp x30, idmap\n" +" msr ttbr0_el1, x30\n" +"\n" +" mov_i x30, .Lmairval\n" +" msr mair_el1, x30\n" +"\n" +" mov_i x30, .Ltcrval\n" +" /* Copy the supported PA range into TCR_EL1.IPS. */\n" +" mrs x29, id_aa64mmfr0_el1\n" +" bfi x30, x29, #32, #4\n" +"\n" +" msr tcr_el1, x30\n" +"\n" +" mov_i x30, .Lsctlrval\n" +"\n" +" /*\n" +" * Ensure everything before this point has completed, then\n" +" * invalidate any potentially stale local TLB entries before they\n" +" * start being used.\n" +" */\n" +" isb\n" +" tlbi vmalle1\n" +" ic iallu\n" +" dsb nsh\n" +" isb\n" +"\n" +" /*\n" +" * Configure sctlr_el1 to enable MMU and cache and don't proceed\n" +" * until this has completed.\n" +" */\n" +" msr sctlr_el1, x30\n" +" isb\n" +"\n" +" /* Disable trapping floating point access in EL1. */\n" +" mrs x30, cpacr_el1\n" +" orr x30, x30, #(0x3 << 20)\n" +" msr cpacr_el1, x30\n" +" isb\n" +"\n" +" /* Zero out the bss section. */\n" +" adr_l x29, bss_begin\n" +" adr_l x30, bss_end\n" +"0: cmp x29, x30\n" +" b.hs 1f\n" +" stp xzr, xzr, [x29], #16\n" +" b 0b\n" +"\n" +"1: /* Prepare the stack. */\n" +" adr_l x30, boot_stack_end\n" +" mov sp, x30\n" +"\n" +" /* Set up exception vector. */\n" +" adr x30, vector_table_el1\n" +" msr vbar_el1, x30\n" +"\n" +" /* Call into Rust code. */\n" +" bl main\n" +"\n" +" /* Loop forever waiting for interrupts. */\n" +"2: wfi\n" +" b 2b\n" +"```" msgstr "" -#: src/bare-metal/aps/other-projects.md +#: src/bare-metal/aps/entry-point.md msgid "" -"Initialisation, UART driver, simple bootloader, JTAG, exception levels, " -"exception handling, page tables" +"This code is in `src/bare-metal/aps/examples/src/entry.S`. It's not " +"necessary to understand this in detail -- the takeaway is that typically " +"some low-level setup is needed to meet Rust's expectations of the system." msgstr "" -#: src/bare-metal/aps/other-projects.md +#: src/bare-metal/aps/entry-point.md msgid "" -"Some dodginess around cache maintenance and initialisation in Rust, not " -"necessarily a good example to copy for production code." +"This is the same as it would be for C: initializing the processor state, " +"zeroing the BSS, and setting up the stack pointer." msgstr "" -#: src/bare-metal/aps/other-projects.md -msgid "[`cargo-call-stack`](https://crates.io/crates/cargo-call-stack)" +#: src/bare-metal/aps/entry-point.md +msgid "" +"The BSS (block starting symbol, for historical reasons) is the part of the " +"object file that contains statically allocated variables that are " +"initialized 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/other-projects.md -msgid "Static analysis to determine maximum stack usage." +#: src/bare-metal/aps/entry-point.md +msgid "" +"The BSS may already be zeroed, depending on how memory is initialized and " +"the image is loaded, but we zero it to be sure." msgstr "" -#: src/bare-metal/aps/other-projects.md +#: src/bare-metal/aps/entry-point.md msgid "" -"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:" +"We need to enable the MMU and cache before reading or writing any memory. If " +"we don't:" msgstr "" -#: src/bare-metal/aps/other-projects.md +#: src/bare-metal/aps/entry-point.md 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." +"Unaligned accesses will fault. We build the Rust code for the `aarch64-" +"unknown-none` target that sets `+strict-align` to prevent the compiler from " +"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/other-projects.md +#: src/bare-metal/aps/entry-point.md 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 cacheable 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 -msgid "Useful crates" +"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/useful-crates.md +#: src/bare-metal/aps/entry-point.md msgid "" -"We'll go over a few crates which solve some common problems in bare-metal " -"programming." +"For simplicity, we just use a hardcoded pagetable (see `idmap.S`) that " +"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/useful-crates/zerocopy.md +#: src/bare-metal/aps/entry-point.md msgid "" -"The [`zerocopy`](https://docs.rs/zerocopy/) crate (from Fuchsia) provides " -"traits and macros for safely converting between byte sequences and other " -"types." +"We also set up the exception vector (`vbar_el1`), which we'll see more about " +"later." msgstr "" -#: src/bare-metal/useful-crates/zerocopy.md +#: src/bare-metal/aps/entry-point.md msgid "" -"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." +"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/useful-crates/zerocopy.md -msgid "" -"`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." +#: src/bare-metal/aps/inline-assembly.md +msgid "Inline assembly" msgstr "" -#: src/bare-metal/useful-crates/zerocopy.md +#: src/bare-metal/aps/inline-assembly.md 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." +"Sometimes we need to use assembly to do things that aren't possible with " +"Rust code. For example, to make an HVC (hypervisor call) to tell the " +"firmware to power off the system:" msgstr "" -#: src/bare-metal/useful-crates/zerocopy.md +#: src/bare-metal/aps/inline-assembly.md msgid "" -"`zerocopy::byteorder` has types for byte-order aware numeric primitives." +"// SAFETY: this only uses the declared registers and doesn't do anything\n" +" // with memory.\n" msgstr "" -#: src/bare-metal/useful-crates/zerocopy.md -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.)" +#: src/bare-metal/aps/inline-assembly.md +msgid "\"hvc #0\"" msgstr "" -#: src/bare-metal/useful-crates/aarch64-paging.md -msgid "" -"The [`aarch64-paging`](https://crates.io/crates/aarch64-paging) crate lets " -"you create page tables according to the AArch64 Virtual Memory System " -"Architecture." +#: src/bare-metal/aps/inline-assembly.md +msgid "\"w0\"" msgstr "" -#: src/bare-metal/useful-crates/aarch64-paging.md -msgid "// Create a new page table with identity mapping.\n" +#: src/bare-metal/aps/inline-assembly.md +msgid "\"w1\"" msgstr "" -#: src/bare-metal/useful-crates/aarch64-paging.md -msgid "// Map a 2 MiB region of memory as read-only.\n" +#: src/bare-metal/aps/inline-assembly.md +msgid "\"w2\"" msgstr "" -#: src/bare-metal/useful-crates/aarch64-paging.md -msgid "// Set `TTBR0_EL1` to activate the page table.\n" +#: src/bare-metal/aps/inline-assembly.md +msgid "\"w3\"" msgstr "" -#: src/bare-metal/useful-crates/aarch64-paging.md -msgid "" -"For now it only supports EL1, but support for other exception levels should " -"be straightforward to add." +#: src/bare-metal/aps/inline-assembly.md +msgid "\"w4\"" msgstr "" -#: src/bare-metal/useful-crates/aarch64-paging.md -msgid "" -"This is used in Android for the [Protected VM Firmware](https://cs.android." -"com/android/platform/superproject/+/master:packages/modules/Virtualization/" -"pvmfw/)." +#: src/bare-metal/aps/inline-assembly.md +msgid "\"w5\"" msgstr "" -#: src/bare-metal/useful-crates/aarch64-paging.md -msgid "" -"There's no easy way to run this example, as it needs to run on real hardware " -"or under QEMU." +#: src/bare-metal/aps/inline-assembly.md +msgid "\"w6\"" msgstr "" -#: src/bare-metal/useful-crates/buddy_system_allocator.md -msgid "" -"[`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:" +#: src/bare-metal/aps/inline-assembly.md +msgid "\"w7\"" msgstr "" -#: src/bare-metal/useful-crates/buddy_system_allocator.md -msgid "PCI BARs always have alignment equal to their size." +#: src/bare-metal/aps/inline-assembly.md +msgid "" +"(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/useful-crates/buddy_system_allocator.md +#: src/bare-metal/aps/inline-assembly.md msgid "" -"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.)" +"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/useful-crates/tinyvec.md +#: src/bare-metal/aps/inline-assembly.md msgid "" -"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." +"The `0 => _` syntax means initialize 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/useful-crates/tinyvec.md +#: src/bare-metal/aps/inline-assembly.md msgid "" -"`tinyvec` requires that the element type implement `Default` for " -"initialisation." +"This `main` function needs to be `#[unsafe(no_mangle)]` and `extern \"C\"` " +"because it is called from our entry point in `entry.S`." msgstr "" -#: src/bare-metal/useful-crates/tinyvec.md +#: src/bare-metal/aps/inline-assembly.md msgid "" -"The Rust Playground includes `tinyvec`, so this example will run fine inline." +"Just `#[no_mangle]` would be sufficient but [RFC3325](https://rust-" +"lang.github.io/rfcs/3325-unsafe-attributes.html) uses this notation to draw " +"reviewer attention to attributes that might cause undefined behavior if used " +"incorrectly." msgstr "" -#: src/bare-metal/useful-crates/spin.md +#: src/bare-metal/aps/inline-assembly.md msgid "" -"`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?" +"`_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/useful-crates/spin.md +#: src/bare-metal/aps/inline-assembly.md msgid "" -"The [`spin`](https://crates.io/crates/spin) crate provides spinlock-based " -"equivalents of many of these primitives." +"Run the example in QEMU with `make qemu_psci` under `src/bare-metal/aps/" +"examples`." msgstr "" -#: src/bare-metal/useful-crates/spin.md -msgid "Be careful to avoid deadlock if you take locks in interrupt handlers." +#: src/bare-metal/aps/mmio.md +msgid "Volatile memory access for MMIO" msgstr "" -#: src/bare-metal/useful-crates/spin.md +#: src/bare-metal/aps/mmio.md msgid "" -"`spin` also has a ticket lock mutex implementation; equivalents of `RwLock`, " -"`Barrier` and `Once` from `std::sync`; and `Lazy` for lazy initialisation." +"Use [`pointer::read_volatile`](https://doc.rust-lang.org/stable/core/" +"primitive.pointer.html#method.read_volatile) and [`pointer::write_volatile`]" +"(https://doc.rust-lang.org/stable/core/" +"primitive.pointer.html#method.write_volatile)." msgstr "" -#: src/bare-metal/useful-crates/spin.md +#: src/bare-metal/aps/mmio.md msgid "" -"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`." +"Never hold a reference to a location being accessed with these methods. Rust " +"may read from (or write to, for `&mut`) a reference at any time." msgstr "" -#: src/bare-metal/useful-crates/spin.md +#: src/bare-metal/aps/mmio.md msgid "" -"The Rust Playground includes `spin`, so this example will run fine inline." +"Use `&raw` to get fields of structs without creating an intermediate " +"reference." msgstr "" -#: src/bare-metal/android.md +#: src/bare-metal/aps/mmio.md +msgid "// SAFETY: Some device is mapped at this address.\n" +msgstr "" + +#: src/bare-metal/aps/mmio.md msgid "" -"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." +"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/android/vmbase.md -msgid "vmbase" -msgstr "vmbase" +#: src/bare-metal/aps/mmio.md +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/android/vmbase.md +#: src/bare-metal/aps/mmio.md msgid "" -"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." +"Some existing crates for volatile access to hardware do hold references, but " +"this is unsound. Whenever a reference exists, the compiler may choose to " +"dereference it." msgstr "" -#: src/bare-metal/android/vmbase.md +#: src/bare-metal/aps/mmio.md +msgid "Use `&raw` to get struct field pointers from a pointer to the struct." +msgstr "" + +#: src/bare-metal/aps/mmio.md msgid "" -"The `main!` macro marks your main function, to be called from the `vmbase` " -"entry point." +"For compatibility with old versions of Rust you can use the [`addr_of!`]" +"(https://doc.rust-lang.org/stable/core/ptr/macro.addr_of.html) macro instead." msgstr "" -#: src/bare-metal/android/vmbase.md +#: src/bare-metal/aps/uart.md +msgid "Let's write a UART driver" +msgstr "" + +#: src/bare-metal/aps/uart.md msgid "" -"The `vmbase` entry point handles console initialisation, and issues a " -"PSCI_SYSTEM_OFF to shutdown the VM if your main function returns." +"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/exercises/bare-metal/afternoon.md -msgid "We will write a driver for the PL031 real-time clock device." +#: src/bare-metal/aps/uart.md +msgid "/// Minimal driver for a PL011 UART.\n" msgstr "" -#: src/exercises/bare-metal/afternoon.md src/exercises/concurrency/afternoon.md +#: src/bare-metal/aps/uart.md msgid "" -"After looking at the exercises, you can look at the [solutions](solutions-" -"afternoon.md) provided." +"/// 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" +" /// as device memory and not have any other aliases.\n" msgstr "" -#: src/exercises/bare-metal/rtc.md -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "RTC driver" +#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md +#: src/bare-metal/aps/safemmio/driver.md +msgid "/// Writes a single byte to the UART.\n" +msgstr "/// Writes a single byte to the UART.\n" + +#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md +#: src/bare-metal/aps/safemmio/driver.md +msgid "// Wait until there is room in the TX buffer.\n" +msgstr "// Wait until there is room in the TX buffer.\n" + +#: src/bare-metal/aps/uart.md +#, fuzzy +msgid "" +"// SAFETY: We know that the base address points to the control\n" +" // registers of a PL011 device which is appropriately mapped.\n" msgstr "" +"// Safe because we know that self.registers points to the control\n" +" // registers of a PL011 device which is appropriately mapped.\n" -#: src/exercises/bare-metal/rtc.md +#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md +#: src/bare-metal/aps/safemmio/driver.md +msgid "// Write to the TX buffer.\n" +msgstr "// Write to the TX buffer.\n" + +#: src/bare-metal/aps/uart.md src/bare-metal/aps/better-uart/driver.md +#: src/bare-metal/aps/safemmio/driver.md +msgid "// Wait until the UART is no longer busy.\n" +msgstr "// Wait until the UART is no longer busy.\n" + +#: src/bare-metal/aps/uart.md msgid "" -"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." +"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/exercises/bare-metal/rtc.md +#: src/bare-metal/aps/uart.md msgid "" -"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." +"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/exercises/bare-metal/rtc.md +#: src/bare-metal/aps/uart.md 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.)" +"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/exercises/bare-metal/rtc.md +#: src/bare-metal/aps/uart/traits.md +msgid "More traits" +msgstr "" + +#: src/bare-metal/aps/uart/traits.md 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." +"We derived the `Debug` trait. It would be useful to implement a few more " +"traits too." msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "Use the RTC interrupt, which is wired to the GIC as `IntId::spi(2)`." +#: src/bare-metal/aps/uart/traits.md +#, fuzzy +msgid "" +"// SAFETY: `Uart` just contains a pointer to device memory, which can be\n" +"// accessed from any context.\n" msgstr "" +"// Safe because it just contains a pointer to device memory, which can be\n" +"// accessed from any context.\n" -#: src/exercises/bare-metal/rtc.md +#: src/bare-metal/aps/uart/traits.md 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." +"Implementing `Write` lets us use the `write!` and `writeln!` macros with our " +"`Uart` type." msgstr "" -#: src/exercises/bare-metal/rtc.md +#: src/bare-metal/aps/uart/traits.md msgid "" -"Download the [exercise template](../../comprehensive-rust-exercises.zip) and " -"look in the `rtc` directory for the following files." +"`Send` is an auto-trait, but not implemented automatically because it is not " +"implemented for pointers." msgstr "" -#: src/exercises/bare-metal/rtc.md -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Base addresses of the GICv3.\n" +#: src/bare-metal/aps/uart/using.md src/bare-metal/aps/logging/using.md +msgid "Using it" msgstr "" -#: src/exercises/bare-metal/rtc.md +#: src/bare-metal/aps/uart/using.md +msgid "" +"Let's write a small program using our driver to write to the serial console." +msgstr "" + +#: src/bare-metal/aps/uart/using.md src/bare-metal/aps/safemmio/using.md +#: src/bare-metal/aps/logging/using.md src/bare-metal/aps/aarch64-rt.md #: src/exercises/bare-metal/solutions-afternoon.md -msgid "\"main({:#x}, {:#x}, {:#x}, {:#x})\"" +msgid "/// Base address of the primary PL011 UART.\n" msgstr "" -#: src/exercises/bare-metal/rtc.md +#: src/bare-metal/aps/uart/using.md src/bare-metal/aps/safemmio/using.md +#: src/bare-metal/aps/logging/using.md src/bare-metal/aps/aarch64-rt.md #: src/exercises/bare-metal/solutions-afternoon.md msgid "" -"// 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" +"// SAFETY: `PL011_BASE_ADDRESS` is the base address of a PL011 device, and\n" +" // nothing else accesses that address range.\n" msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "// TODO: Create instance of RTC driver and print current time.\n" +#: src/bare-metal/aps/uart/using.md src/bare-metal/aps/safemmio/using.md +#: src/bare-metal/aps/logging/using.md src/bare-metal/aps/aarch64-rt.md +msgid "\"main({x0:#x}, {x1:#x}, {x2:#x}, {x3:#x})\"" msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "// TODO: Wait for 3 seconds.\n" +#: src/bare-metal/aps/uart/using.md +msgid "" +"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/exercises/bare-metal/rtc.md +#: src/bare-metal/aps/uart/using.md msgid "" -"_src/exceptions.rs_ (you should only need to change this for the 3rd part of " -"the exercise):" +"Run the example in QEMU with `make qemu_minimal` under `src/bare-metal/aps/" +"examples`." msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "" -"// Copyright 2023 Google LLC\n" -"//\n" -"// Licensed under the Apache License, Version 2.0 (the \"License\");\n" -"// you may not use this file except in compliance with the License.\n" -"// You may obtain a copy of the License at\n" -"//\n" -"// http://www.apache.org/licenses/LICENSE-2.0\n" -"//\n" -"// Unless required by applicable law or agreed to in writing, software\n" -"// distributed under the License is distributed on an \"AS IS\" BASIS,\n" -"// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" -"// See the License for the specific language governing permissions and\n" -"// limitations under the License.\n" -msgstr "" -"// Copyright 2023 Google LLC\n" -"//\n" -"// Licensed under the Apache License, Version 2.0 (the \"License\");\n" -"// you may not use this file except in compliance with the License.\n" -"// You may obtain a copy of the License at\n" -"//\n" -"// http://www.apache.org/licenses/LICENSE-2.0\n" -"//\n" -"// Unless required by applicable law or agreed to in writing, software\n" -"// distributed under the License is distributed on an \"AS IS\" BASIS,\n" -"// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" -"// See the License for the specific language governing permissions and\n" -"// limitations under the License.\n" +#: src/bare-metal/aps/better-uart.md +msgid "A better UART driver" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"sync_exception_current\"" -msgstr "\"sync_exception_current\"" +#: src/bare-metal/aps/better-uart.md +msgid "" +"The PL011 actually has [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. Additionally, some of them are bit fields, which would be nice to " +"access in a structured way." +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"irq_current\"" -msgstr "\"irq_current\"" +#: src/bare-metal/aps/better-uart.md +msgid "Offset" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"No pending interrupt\"" -msgstr "\"No pending interrupt\"" +#: src/bare-metal/aps/better-uart.md +msgid "Register name" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"IRQ {intid:?}\"" -msgstr "\"IRQ {intid:?}\"" +#: src/bare-metal/aps/better-uart.md +msgid "Width" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"fiq_current\"" -msgstr "\"fiq_current\"" +#: src/bare-metal/aps/better-uart.md +msgid "0x00" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"serr_current\"" -msgstr "\"serr_current\"" +#: src/bare-metal/aps/better-uart.md +msgid "DR" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"sync_lower\"" -msgstr "\"sync_lower\"" +#: src/bare-metal/aps/better-uart.md +msgid "12" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"irq_lower\"" -msgstr "\"irq_lower\"" +#: src/bare-metal/aps/better-uart.md +msgid "0x04" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"fiq_lower\"" -msgstr "\"fiq_lower\"" +#: src/bare-metal/aps/better-uart.md +msgid "RSR" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"serr_lower\"" -msgstr "\"serr_lower\"" +#: src/bare-metal/aps/better-uart.md +msgid "4" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "_src/logger.rs_ (you shouldn't need to change this):" +#: src/bare-metal/aps/better-uart.md +msgid "0x18" msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "// ANCHOR: main\n" -msgstr "// ANCHOR: main\n" +#: src/bare-metal/aps/better-uart.md +msgid "FR" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "_src/pl011.rs_ (you shouldn't need to change this):" +#: src/bare-metal/aps/better-uart.md +msgid "9" msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "// ANCHOR: Flags\n" -msgstr "// ANCHOR: Flags\n" +#: src/bare-metal/aps/better-uart.md +msgid "0x20" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "// ANCHOR_END: Flags\n" -msgstr "// ANCHOR_END: Flags\n" +#: src/bare-metal/aps/better-uart.md +msgid "ILPR" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "" -"/// Flags from the UART Receive Status Register / Error Clear Register.\n" +#: src/bare-metal/aps/better-uart.md +msgid "8" msgstr "" -"/// Flags from the UART Receive Status Register / Error Clear Register.\n" -#: src/exercises/bare-metal/rtc.md -msgid "/// Framing error.\n" -msgstr "/// Framing error.\n" +#: src/bare-metal/aps/better-uart.md +msgid "0x24" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "/// Parity error.\n" -msgstr "/// Parity error.\n" +#: src/bare-metal/aps/better-uart.md +msgid "IBRD" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "/// Break error.\n" -msgstr "/// Break error.\n" +#: src/bare-metal/aps/better-uart.md +msgid "16" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "/// Overrun error.\n" -msgstr "/// Overrun error.\n" +#: src/bare-metal/aps/better-uart.md +msgid "0x28" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "// ANCHOR: Registers\n" -msgstr "// ANCHOR: Registers\n" +#: src/bare-metal/aps/better-uart.md +msgid "FBRD" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "// ANCHOR_END: Registers\n" -msgstr "// ANCHOR_END: Registers\n" +#: src/bare-metal/aps/better-uart.md +msgid "6" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "0x2c" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "LCR_H" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "0x30" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "CR" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "0x34" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "IFLS" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "0x38" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "IMSC" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "11" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "0x3c" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "RIS" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "0x40" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "MIS" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "0x44" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "ICR" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "0x48" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "DMACR" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "3" +msgstr "" + +#: src/bare-metal/aps/better-uart.md +msgid "There are also some ID registers that have been omitted for brevity." +msgstr "" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "" +"The [`bitflags`](https://crates.io/crates/bitflags) crate is useful for " +"working with bitflags." +msgstr "" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "/// Flags from the UART flag register.\n" +msgstr "/// Flags from the UART flag register.\n" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "/// Clear to send.\n" +msgstr "/// Clear to send.\n" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "/// Data set ready.\n" +msgstr "/// Data set ready.\n" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "/// Data carrier detect.\n" +msgstr "/// Data carrier detect.\n" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "/// UART busy transmitting data.\n" +msgstr "/// UART busy transmitting data.\n" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "/// Receive FIFO is empty.\n" +msgstr "/// Receive FIFO is empty.\n" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "/// Transmit FIFO is full.\n" +msgstr "/// Transmit FIFO is full.\n" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "/// Receive FIFO is full.\n" +msgstr "/// Receive FIFO is full.\n" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "/// Transmit FIFO is empty.\n" +msgstr "/// Transmit FIFO is empty.\n" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "/// Ring indicator.\n" +msgstr "/// Ring indicator.\n" + +#: src/bare-metal/aps/better-uart/bitflags.md +msgid "" +"The `bitflags!` macro creates a newtype something like `struct Flags(u16)`, " +"along with a bunch of method implementations to get and set flags." +msgstr "" + +#: src/bare-metal/aps/better-uart/registers.md +msgid "Multiple registers" +msgstr "" + +#: src/bare-metal/aps/better-uart/registers.md +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 +msgid "" +"[`#[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 +#: src/bare-metal/aps/safemmio/driver.md +msgid "Now let's use the new `Registers` struct in our driver." +msgstr "" + +#: src/bare-metal/aps/better-uart/driver.md +#: src/bare-metal/aps/safemmio/driver.md +msgid "/// Driver for a PL011 UART.\n" +msgstr "" + +#: src/bare-metal/aps/better-uart/driver.md +#, fuzzy +msgid "" +"/// Constructs a new instance of the UART driver for a PL011 device with " +"the\n" +" /// given set of registers.\n" +" ///\n" +" /// # Safety\n" +" ///\n" +" /// The given pointer must point to the 8 MMIO control registers of a " +"PL011\n" +" /// device, which must be mapped into the address space of the process " +"as\n" +" /// device memory and not have any other aliases.\n" +msgstr "" +"/// 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" +" /// as device memory and not have any other aliases.\n" + +#: src/bare-metal/aps/better-uart/driver.md +#, fuzzy +msgid "" +"// SAFETY: We know that self.registers points to the control registers\n" +" // of a PL011 device which is appropriately mapped.\n" +msgstr "" +"// Safe because we know that self.registers points to the control\n" +" // registers of a PL011 device which is appropriately mapped.\n" + +#: src/bare-metal/aps/better-uart/driver.md +#: src/bare-metal/aps/safemmio/driver.md +#, fuzzy +msgid "" +"/// Reads and returns a pending byte, or `None` if nothing has been\n" +" /// received.\n" +msgstr "" +"/// Reads and returns a pending byte, or `None` if nothing has been " +"received.\n" + +#: src/bare-metal/aps/better-uart/driver.md +#, fuzzy +msgid "" +"// SAFETY: We know that self.registers points to the control\n" +" // registers of a PL011 device which is appropriately mapped.\n" +msgstr "" +"// Safe because we know that self.registers points to the control\n" +" // registers of a PL011 device which is appropriately mapped.\n" + +#: src/bare-metal/aps/better-uart/driver.md +#: src/bare-metal/aps/safemmio/driver.md +msgid "// TODO: Check for error conditions in bits 8-11.\n" +msgstr "// TODO: Check for error conditions in bits 8-11.\n" + +#: src/bare-metal/aps/better-uart/driver.md +msgid "" +"Note the use of `&raw const` / `&raw mut` to get pointers to individual " +"fields without creating an intermediate reference, which would be unsound." +msgstr "" + +#: src/bare-metal/aps/better-uart/driver.md +msgid "" +"The example isn't included in the slides because it is very similar to the " +"`safe-mmio` example which comes next. You can run it in QEMU with `make " +"qemu` under `src/bare-metal/aps/examples` if you need to." +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "" +"The [`safe-mmio`](https://crates.io/crates/safe-mmio) crate provides types " +"to wrap registers that can be read or written safely." +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "Can't read" +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "Read has no side-effects" +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "Read has side-effects" +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "Can't write" +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "" +"[`ReadPure`](https://docs.rs/safe-mmio/latest/safe_mmio/fields/" +"struct.ReadPure.html)" +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "" +"[`ReadOnly`](https://docs.rs/safe-mmio/latest/safe_mmio/fields/" +"struct.ReadOnly.html)" +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "Can write" +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "" +"[`WriteOnly`](https://docs.rs/safe-mmio/latest/safe_mmio/fields/" +"struct.WriteOnly.html)" +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "" +"[`ReadPureWrite`](https://docs.rs/safe-mmio/latest/safe_mmio/fields/" +"struct.ReadPureWrite.html)" +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "" +"[`ReadWrite`](https://docs.rs/safe-mmio/latest/safe_mmio/fields/" +"struct.ReadWrite.html)" +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "Reading `dr` has a side effect: it pops a byte from the receive FIFO." +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "" +"Reading `rsr` (and other registers) has no side-effects. It is a 'pure' read." +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "" +"There are a number of different crates providing safe abstractions around " +"MMIO operations; we recommend the `safe-mmio` crate." +msgstr "" + +#: src/bare-metal/aps/safemmio/registers.md +msgid "" +"The difference between `ReadPure` or `ReadOnly` (and likewise between " +"`ReadPureWrite` and `ReadWrite`) is whether reading a register can have side-" +"effects that change the state of the device, e.g., reading the data register " +"pops a byte from the receive FIFO. `ReadPure` means that reads have no side-" +"effects, they are purely reading data." +msgstr "" + +#: src/bare-metal/aps/safemmio/driver.md +msgid "" +"/// Constructs a new instance of the UART driver for a PL011 device with " +"the\n" +" /// given set of registers.\n" +msgstr "" + +#: src/bare-metal/aps/safemmio/driver.md +msgid "The driver no longer needs any unsafe code!" +msgstr "" + +#: src/bare-metal/aps/safemmio/driver.md +msgid "" +"`UniqueMmioPointer` is a wrapper around a raw pointer to an MMIO device or " +"register. The caller of `UniqueMmioPointer::new` promises that it is valid " +"and unique for the given lifetime, so it can provide safe methods to read " +"and write fields." +msgstr "" + +#: src/bare-metal/aps/safemmio/driver.md +msgid "" +"Note that `Uart::new` is now safe; `UniqueMmioPointer::new` is unsafe " +"instead." +msgstr "" + +#: src/bare-metal/aps/safemmio/driver.md +msgid "" +"These MMIO accesses are generally a wrapper around `read_volatile` and " +"`write_volatile`, though on aarch64 they are instead implemented in assembly " +"to work around a bug where the compiler can emit instructions that prevent " +"MMIO virtualization." +msgstr "" + +#: src/bare-metal/aps/safemmio/driver.md +msgid "" +"The `field!` and `field_shared!` macros internally use `&raw mut` and `&raw " +"const` to get pointers to individual fields without creating an intermediate " +"reference, which would be unsound." +msgstr "" + +#: src/bare-metal/aps/safemmio/driver.md +msgid "" +"`field!` needs a mutable reference to a `UniqueMmioPointer`, and returns a " +"`UniqueMmioPointer` that allows reads with side effects and writes." +msgstr "" + +#: src/bare-metal/aps/safemmio/driver.md +msgid "" +"`field_shared!` works with a shared reference to either a " +"`UniqueMmioPointer` or a `SharedMmioPointer`. It returns a " +"`SharedMmioPointer` that only allows pure reads." +msgstr "" + +#: src/bare-metal/aps/safemmio/using.md +msgid "" +"Let's write a small program using our driver to write to the serial console, " +"and echo incoming bytes." +msgstr "" + +#: src/bare-metal/aps/safemmio/using.md +msgid "b'\\r'" +msgstr "" + +#: src/bare-metal/aps/safemmio/using.md +#: src/concurrency/async-pitfalls/cancellation.md +msgid "b'\\n'" +msgstr "" + +#: src/bare-metal/aps/safemmio/using.md +msgid "b'q'" +msgstr "" + +#: src/bare-metal/aps/safemmio/using.md +msgid "\"\\n\\nBye!\"" +msgstr "" + +#: src/bare-metal/aps/safemmio/using.md +msgid "" +"Run the example in QEMU with `make qemu_safemmio` under `src/bare-metal/aps/" +"examples`." +msgstr "" + +#: src/bare-metal/aps/logging.md +msgid "" +"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 +msgid "\"[{}] {}\"" +msgstr "\"[{}] {}\"" + +#: src/bare-metal/aps/logging.md +msgid "/// Initialises UART logger.\n" +msgstr "/// Initialises UART logger.\n" + +#: src/bare-metal/aps/logging.md +msgid "" +"The first unwrap in `log` will succeed because we initialize `LOGGER` before " +"calling `set_logger`. The second will succeed because `Uart::write_str` " +"always returns `Ok`." +msgstr "" + +#: src/bare-metal/aps/logging/using.md +msgid "We need to initialise the logger before we use it." +msgstr "" + +#: src/bare-metal/aps/logging/using.md +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "\"{info}\"" +msgstr "" + +#: src/bare-metal/aps/logging/using.md +msgid "Note that our panic handler can now log details of panics." +msgstr "" + +#: src/bare-metal/aps/logging/using.md +msgid "" +"Run the example in QEMU with `make qemu_logger` under `src/bare-metal/aps/" +"examples`." +msgstr "" + +#: src/bare-metal/aps/exceptions.md +msgid "" +"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 +msgid "EL is exception level; all our examples this afternoon run in EL1." +msgstr "" + +#: src/bare-metal/aps/exceptions.md +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 +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 +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/aarch64-rt.md +msgid "" +"The `aarch64-rt` crate provides the assembly entry point and exception " +"vector that we implemented before. We just need to mark our main function " +"with the `entry!` macro." +msgstr "" + +#: src/bare-metal/aps/aarch64-rt.md +msgid "" +"It also provides the `initial_pagetable!` macro to let us define an initial " +"static pagetable in Rust, rather than in assembly code like we did before." +msgstr "" + +#: src/bare-metal/aps/aarch64-rt.md +msgid "" +"We can also use the UART driver from the `arm-pl011-uart` crate rather than " +"writing our own." +msgstr "" + +#: src/bare-metal/aps/aarch64-rt.md +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Attributes to use for device memory in the initial identity map.\n" +msgstr "" + +#: src/bare-metal/aps/aarch64-rt.md +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Attributes to use for normal memory in the initial identity map.\n" +msgstr "" + +#: src/bare-metal/aps/aarch64-rt.md +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "// 1 GiB of device memory.\n" +msgstr "" + +#: src/bare-metal/aps/aarch64-rt.md +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "// 1 GiB of normal memory.\n" +msgstr "" + +#: src/bare-metal/aps/aarch64-rt.md +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "// Another 1 GiB of device memory starting at 256 GiB.\n" +msgstr "" + +#: src/bare-metal/aps/aarch64-rt.md +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "\"system_off returned\"" +msgstr "" + +#: src/bare-metal/aps/aarch64-rt.md +msgid "" +"Run the example in QEMU with `make qemu_rt` under `src/bare-metal/aps/" +"examples`." +msgstr "" + +#: src/bare-metal/aps/other-projects.md +msgid "[oreboot](https://github.com/oreboot/oreboot)" +msgstr "" + +#: src/bare-metal/aps/other-projects.md +msgid "\"coreboot without the C\"." +msgstr "" + +#: src/bare-metal/aps/other-projects.md +msgid "Supports x86, aarch64 and RISC-V." +msgstr "" + +#: src/bare-metal/aps/other-projects.md +msgid "Relies on LinuxBoot rather than having many drivers itself." +msgstr "" + +#: src/bare-metal/aps/other-projects.md +msgid "" +"[Rust RaspberryPi OS tutorial](https://github.com/rust-embedded/rust-" +"raspberrypi-OS-tutorials)" +msgstr "" + +#: src/bare-metal/aps/other-projects.md +msgid "" +"Initialization, UART driver, simple bootloader, JTAG, exception levels, " +"exception handling, page tables." +msgstr "" + +#: src/bare-metal/aps/other-projects.md +msgid "" +"Some caveats around cache maintenance and initialization in Rust, not " +"necessarily a good example to copy for production code." +msgstr "" + +#: src/bare-metal/aps/other-projects.md +msgid "[`cargo-call-stack`](https://crates.io/crates/cargo-call-stack)" +msgstr "" + +#: src/bare-metal/aps/other-projects.md +msgid "Static analysis to determine maximum stack usage." +msgstr "" + +#: src/bare-metal/aps/other-projects.md +msgid "" +"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, this has " +"the problems mentioned at the beginning of this session regarding unaligned " +"access and cache coherency." +msgstr "" + +#: src/bare-metal/useful-crates.md +msgid "Useful crates" +msgstr "" + +#: src/bare-metal/useful-crates.md +msgid "" +"We'll look at a few crates that solve some common problems in bare-metal " +"programming." +msgstr "" + +#: src/bare-metal/useful-crates/zerocopy.md +msgid "" +"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 +msgid "" +"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 +msgid "" +"`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 +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 +msgid "" +"`zerocopy::byteorder` has types for byte-order aware numeric primitives." +msgstr "" + +#: src/bare-metal/useful-crates/zerocopy.md +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 +msgid "" +"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 +msgid "// Create a new page table with identity mapping.\n" +msgstr "" + +#: src/bare-metal/useful-crates/aarch64-paging.md +msgid "// Map a 2 MiB region of memory as read-only.\n" +msgstr "" + +#: src/bare-metal/useful-crates/aarch64-paging.md +msgid "// Set `TTBR0_EL1` to activate the page table.\n" +msgstr "" + +#: src/bare-metal/useful-crates/aarch64-paging.md +msgid "" +"This is used in Android for the [Protected VM Firmware](https://" +"cs.android.com/android/platform/superproject/main/+/main:packages/modules/" +"Virtualization/guest/pvmfw/)." +msgstr "" + +#: src/bare-metal/useful-crates/aarch64-paging.md +msgid "" +"There's no easy way to run this example by itself, as it needs to run on " +"real hardware or under QEMU." +msgstr "" + +#: src/bare-metal/useful-crates/buddy_system_allocator.md +msgid "" +"[`buddy_system_allocator`](https://crates.io/crates/buddy_system_allocator) " +"is a crate that implements a basic buddy system allocator. It can be used " +"both to implement [`GlobalAlloc`](https://doc.rust-lang.org/core/alloc/" +"trait.GlobalAlloc.html) (using [`LockedHeap`](https://docs.rs/" +"buddy_system_allocator/0.9.0/buddy_system_allocator/struct.LockedHeap.html)) " +"so you can use the standard `alloc` crate (as we saw [before](../alloc.md)), " +"or for allocating other address space (using [`FrameAllocator`](https://" +"docs.rs/buddy_system_allocator/0.9.0/buddy_system_allocator/" +"struct.FrameAllocator.html)) . For example, we might want to allocate MMIO " +"space for PCI BARs:" +msgstr "" + +#: src/bare-metal/useful-crates/buddy_system_allocator.md +msgid "PCI BARs always have alignment equal to their size." +msgstr "" + +#: src/bare-metal/useful-crates/buddy_system_allocator.md +msgid "" +"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 +msgid "" +"Sometimes you want something that 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, that 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 +msgid "" +"`tinyvec` requires that the element type implement `Default` for " +"initialization." +msgstr "" + +#: src/bare-metal/useful-crates/tinyvec.md +msgid "" +"The Rust Playground includes `tinyvec`, so this example will run fine inline." +msgstr "" + +#: src/bare-metal/useful-crates/spin.md +msgid "" +"`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 +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 +msgid "Be careful to avoid deadlock if you take locks in interrupt handlers." +msgstr "" + +#: src/bare-metal/useful-crates/spin.md +msgid "" +"`spin` also has a ticket lock mutex implementation; equivalents of `RwLock`, " +"`Barrier` and `Once` from `std::sync`; and `Lazy` for lazy initialization." +msgstr "" + +#: src/bare-metal/useful-crates/spin.md +msgid "" +"The [`once_cell`](https://crates.io/crates/once_cell) crate also has some " +"useful types for late initialization with a slightly different approach to " +"`spin::once::Once`." +msgstr "" + +#: src/bare-metal/useful-crates/spin.md +msgid "" +"The Rust Playground includes `spin`, so this example will run fine inline." +msgstr "" + +#: src/bare-metal/android.md +msgid "" +"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/vmbase.md +msgid "vmbase" +msgstr "vmbase" + +#: src/bare-metal/android/vmbase.md +msgid "" +"For VMs running under crosvm on aarch64, the [vmbase](https://" +"android.googlesource.com/platform/packages/modules/Virtualization/+/refs/" +"heads/main/libs/libvmbase/) 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 +msgid "" +"The `main!` macro marks your main function, to be called from the `vmbase` " +"entry point." +msgstr "" + +#: src/bare-metal/android/vmbase.md +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 +msgid "We will write a driver for the PL031 real-time clock device." +msgstr "" + +#: src/exercises/bare-metal/afternoon.md +msgid "" +"After looking at the exercises, you can look at the [solutions](solutions-" +"afternoon.md) provided." +msgstr "" + +#: src/exercises/bare-metal/rtc.md +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "RTC driver" +msgstr "" + +#: src/exercises/bare-metal/rtc.md +msgid "" +"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 +msgid "" +"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 +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 +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 +msgid "Use the RTC interrupt, which is wired to the GIC as `IntId::spi(2)`." +msgstr "" + +#: src/exercises/bare-metal/rtc.md +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 +msgid "" +"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 +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 +msgid "_src/logger.rs_ (you shouldn't need to change this):" +msgstr "" + +#: src/exercises/bare-metal/rtc.md +msgid "_build.rs_ (you shouldn't need to change this):" +msgstr "" + +#: src/exercises/bare-metal/rtc.md +msgid "_memory.ld_ (you shouldn't need to change this):" +msgstr "" + +#: src/exercises/bare-metal/rtc.md +msgid "_Makefile_ (you shouldn't need to change this):" +msgstr "" + +#: src/exercises/bare-metal/rtc.md +msgid "Run the code in QEMU with `make qemu`." +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "Bare Metal Rust Afternoon" +msgstr "Rå jern Rust eftermiddag" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "([back to exercise](rtc.md))" +msgstr "([tilbage til øvelsen](rtc.md))" + +#: src/exercises/bare-metal/solutions-afternoon.md +#, fuzzy +msgid "_main.rs_:" +msgstr "_src/main.rs_:" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Base addresses of the GICv3.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Base address of the PL031 RTC.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// The IRQ used by the PL031 RTC.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "\"main({:#x}, {:#x}, {:#x}, {:#x})\"" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "" +"// SAFETY: `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" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "" +"// SAFETY: `PL031_BASE_ADDRESS` is the base address of a PL031 device, and\n" +" // nothing else accesses that address range.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "\"RTC: {time}\"" +msgstr "\"RTC: {time}\"" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "// Wait for 3 seconds, without interrupts.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "\"Waiting for {}\"" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "\"matched={}, interrupt_pending={}\"" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "\"Finished waiting\"" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "// Wait another 3 seconds for an interrupt.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +#, fuzzy +msgid "_pl031.rs_:" +msgstr "`pl031.rs`:" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Data register\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Match register\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Load register\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Control register\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Interrupt Mask Set or Clear register\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Raw Interrupt Status\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Masked Interrupt Status\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Interrupt Clear Register\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Driver for a PL031 real-time clock.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "" +"/// Constructs a new instance of the RTC driver for a PL031 device with the\n" +" /// given set of registers.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Reads the current RTC value.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "" +"/// Writes a match value. When the RTC value matches this then an interrupt\n" +" /// will be generated (if it is enabled).\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "" +"/// Returns whether the match register matches the RTC value, whether or " +"not\n" +" /// the interrupt is enabled.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "" +"/// Returns whether there is currently an interrupt pending.\n" +" ///\n" +" /// This should be true if and only if `matched` returns true and the\n" +" /// interrupt is masked.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "" +"/// Sets or clears the interrupt mask.\n" +" ///\n" +" /// When the mask is true the interrupt is enabled; when it is false " +"the\n" +" /// interrupt is disabled.\n" +msgstr "" + +#: src/exercises/bare-metal/solutions-afternoon.md +msgid "/// Clears a pending interrupt, if any.\n" +msgstr "" + +#: src/concurrency/welcome.md +msgid "Welcome to Concurrency in Rust" +msgstr "Velkommen til Concurrency i Rust" + +#: src/concurrency/welcome.md +msgid "" +"Rust has full support for concurrency using OS threads with mutexes and " +"channels." +msgstr "" + +#: src/concurrency/welcome.md +msgid "" +"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/welcome.md +msgid "" +"Including 10 minute breaks, this session should take about 3 hours and 20 " +"minutes. It contains:" +msgstr "" + +#: src/concurrency/welcome.md +msgid "" +"Rust lets us access OS concurrency toolkit: threads, sync. primitives, etc." +msgstr "" + +#: src/concurrency/welcome.md +msgid "" +"The type system gives us safety for concurrency without any special features." +msgstr "" + +#: src/concurrency/welcome.md +msgid "" +"The same tools that help with \"concurrent\" access in a single thread " +"(e.g., a called function that might mutate an argument or save references to " +"it to read later) save us from multi-threading issues." +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "Rust threads work similarly to threads in other languages:" +msgstr "Tråde (eng: _threads_) i Rust virker på samme måde som i andre sprog:" + +#: src/concurrency/threads/plain.md +msgid "\"Count in thread: {i}!\"" +msgstr "\"Tæller i tråden: {i}!\"" + +#: src/concurrency/threads/plain.md +msgid "\"Main thread: {i}\"" +msgstr "\"Hovedtråden: {i}\"" + +#: src/concurrency/threads/plain.md +msgid "" +"Spawning new threads does not automatically delay program termination at the " +"end of `main`." +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "Thread panics are independent of each other." +msgstr "Hver tråd kan gå i panik uafhængigt af andre tråde." + +#: src/concurrency/threads/plain.md +#, fuzzy +msgid "" +"Panics can carry a payload, which can be unpacked with [`Any::downcast_ref`]" +"(https://doc.rust-lang.org/std/any/trait.Any.html#method.downcast_ref)." +msgstr "En panik kan have en nyttelast som kan udpakkes med `downcast_ref`." + +#: src/concurrency/threads/plain.md +#, fuzzy +msgid "Run the example." +msgstr "Rust by Example" + +#: src/concurrency/threads/plain.md +msgid "" +"5ms timing is loose enough that main and spawned threads stay mostly in " +"lockstep." +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "Notice that the program ends before the spawned thread reaches 10!" +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "" +"This is because `main` ends the program and spawned threads do not make it " +"persist." +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "Compare to `pthreads`/C++ `std::thread`/`boost::thread` if desired." +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "How do we wait around for the spawned thread to complete?" +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "" +"[`thread::spawn`](https://doc.rust-lang.org/std/thread/fn.spawn.html) " +"returns a `JoinHandle`. Look at the docs." +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "" +"`JoinHandle` has a [`.join()`](https://doc.rust-lang.org/std/thread/" +"struct.JoinHandle.html#method.join) method that blocks." +msgstr "" + +#: src/concurrency/threads/plain.md +#, fuzzy +msgid "" +"Use `let handle = thread::spawn(...)` and later `handle.join()` to wait for " +"the thread to finish and have the program count all the way to 10." +msgstr "" +"Brug `let handle = thread::spawn(...)` og senere `handle.join()` for at " +"vente på at tråden afsluttes." + +#: src/concurrency/threads/plain.md +msgid "Now what if we want to return a value?" +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "Look at docs again:" +msgstr "" + +#: src/concurrency/threads/plain.md +#, fuzzy +msgid "" +"[`thread::spawn`](https://doc.rust-lang.org/std/thread/fn.spawn.html)'s " +"closure returns `T`" +msgstr "" +"Du kan dog bruge en [tråd med virkefelt (eng: _scoped thread_)](https://" +"doc.rust-lang.org/std/thread/fn.scope.html) for at opnå dette:" + +#: src/concurrency/threads/plain.md +msgid "" +"`JoinHandle` [`.join()`](https://doc.rust-lang.org/std/thread/" +"struct.JoinHandle.html#method.join) returns `thread::Result`" +msgstr "" + +#: src/concurrency/threads/plain.md +#, fuzzy +msgid "" +"Use the `Result` return value from `handle.join()` to get access to the " +"returned value." +msgstr "" +"Bruge `Result`\\-returværdien fra `handle.join()` til at få adgang til " +"panikkens nyttelast. Dette er et godt tidspunkt til at snakke om [`Any`]" +"(https://doc.rust-lang.org/std/any/index.html)." + +#: src/concurrency/threads/plain.md +msgid "Ok, what about the other case?" +msgstr "" + +#: src/concurrency/threads/plain.md +#, fuzzy +msgid "Trigger a panic in the thread. Note that this doesn't panic `main`." +msgstr "Skab en panik i tråden, bemærk hvordan dette ikke påvirker `main`." + +#: src/concurrency/threads/plain.md +#, fuzzy +msgid "" +"Access the panic payload. This is a good time to talk about [`Any`](https://" +"doc.rust-lang.org/std/any/index.html)." +msgstr "" +"Bruge `Result`\\-returværdien fra `handle.join()` til at få adgang til " +"panikkens nyttelast. Dette er et godt tidspunkt til at snakke om [`Any`]" +"(https://doc.rust-lang.org/std/any/index.html)." + +#: src/concurrency/threads/plain.md +msgid "Now we can return values from threads! What about taking inputs?" +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "Capture something by reference in the thread closure." +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "An error message indicates we must move it." +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "Move it in, see we can compute and then return a derived value." +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "If we want to borrow?" +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "" +"Main kills child threads when it returns, but another function would just " +"return and leave them running." +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "That would be stack use-after-return, which violates memory safety!" +msgstr "" + +#: src/concurrency/threads/plain.md +msgid "How do we avoid this? See next slide." +msgstr "" + +#: src/concurrency/threads/scoped.md +msgid "Normal threads cannot borrow from their environment:" +msgstr "Normale tråde kan ikke låne fra deres omgivelser:" + +#: src/concurrency/threads/scoped.md +msgid "" +"However, you can use a [scoped thread](https://doc.rust-lang.org/std/thread/" +"fn.scope.html) for this:" +msgstr "" +"Du kan dog bruge en [tråd med virkefelt (eng: _scoped thread_)](https://" +"doc.rust-lang.org/std/thread/fn.scope.html) for at opnå dette:" + +#: src/concurrency/threads/scoped.md +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." +msgstr "" +"Grunden er, at `thread::scope`\\-funktionen garanterer at alle trådene er " +"blevet forenet med hovedtråden når kaldet afsluttet. De vil således " +"returnere det lånte data." + +#: src/concurrency/threads/scoped.md +msgid "" +"Normal Rust borrowing rules apply: you can either borrow mutably by one " +"thread, or immutably by any number of threads." +msgstr "" +"De normale låneregler for Rust gælder: du kan enten lade én tråd låne data " +"for at ændre på det, eller du kan lade flere tråde låne data uden at ændre " +"på det." + +#: src/concurrency/channels.md src/concurrency/async-control-flow.md +#: src/unsafe-deep-dive/motivations.md +msgid "This segment should take about 20 minutes. It contains:" +msgstr "" + +#: src/concurrency/channels/senders-receivers.md +msgid "" +"Rust channels have two parts: a [`Sender`](https://doc.rust-lang.org/std/" +"sync/mpsc/struct.Sender.html) and a [`Receiver`](https://doc.rust-" +"lang.org/std/sync/mpsc/struct.Receiver.html). The two parts are connected " +"via the channel, but you only see the end-points." +msgstr "" + +#: src/concurrency/channels/senders-receivers.md +msgid "\"Received: {:?}\"" +msgstr "\"Modtaget: {:?}\"" + +#: src/concurrency/channels/senders-receivers.md +msgid "" +"[`mpsc`](https://doc.rust-lang.org/std/sync/mpsc/index.html) 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/senders-receivers.md +msgid "" +"[`send()`](https://doc.rust-lang.org/std/sync/mpsc/" +"struct.Sender.html#method.send) and [`recv()`](https://doc.rust-lang.org/std/" +"sync/mpsc/struct.Receiver.html#method.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 +msgid "" +"You get an unbounded and asynchronous channel with [`mpsc::channel()`]" +"(https://doc.rust-lang.org/std/sync/mpsc/fn.channel.html):" +msgstr "" + +#: src/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md +msgid "\"Message {i}\"" +msgstr "\"Besked {i}\"" + +#: src/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md +msgid "\"{thread_id:?}: sent Message {i}\"" +msgstr "\"{thread_id:?}: sendte Besked {i}\"" + +#: src/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md +msgid "\"{thread_id:?}: done\"" +msgstr "\"{thread_id:?}: færdig\"" + +#: src/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md +msgid "\"Main: got {msg}\"" +msgstr "\"Hovedtråden: modtog {msg}\"" + +#: src/concurrency/channels/unbounded.md +msgid "" +"An unbounded channel will allocate as much space as is necessary to store " +"pending messages. The `send()` method will not block the calling thread." +msgstr "" + +#: src/concurrency/channels/unbounded.md +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 +msgid "" +"With bounded (synchronous) channels, [`send()`](https://doc.rust-lang.org/" +"std/sync/mpsc/struct.SyncSender.html#method.send) can block the current " +"thread:" +msgstr "" + +#: src/concurrency/channels/bounded.md +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." +msgstr "" + +#: src/concurrency/channels/bounded.md +msgid "" +"Like unbounded channels, a call to `send()` will abort with an error if the " +"channel is closed." +msgstr "" + +#: src/concurrency/channels/bounded.md +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 " +"[`recv()`](https://doc.rust-lang.org/std/sync/mpsc/" +"struct.Receiver.html#method.recv)." +msgstr "" + +#: src/concurrency/send-sync.md +msgid "Send" +msgstr "Send" + +#: src/concurrency/send-sync.md +msgid "Sync" +msgstr "Sync" + +#: src/concurrency/send-sync/marker-traits.md +msgid "" +"How does Rust know to forbid shared access across threads? The answer is in " +"two traits:" +msgstr "" + +#: src/concurrency/send-sync/marker-traits.md +msgid "" +"[`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/marker-traits.md +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/marker-traits.md +msgid "" +"`Send` and `Sync` are [unsafe traits](../../unsafe-rust/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/marker-traits.md +msgid "" +"One can think of these traits as markers that the type has certain thread-" +"safety properties." +msgstr "" + +#: src/concurrency/send-sync/marker-traits.md +msgid "They can be used in the generic constraints as normal traits." +msgstr "" + +#: src/concurrency/send-sync/send.md +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 +msgid "" +"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 +msgid "" +"As an example, a connection to the SQLite library must only be accessed from " +"a single thread." +msgstr "" + +#: src/concurrency/send-sync/sync.md +msgid "" +"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 +msgid "More precisely, the definition is:" +msgstr "" + +#: src/concurrency/send-sync/sync.md +msgid "`T` is `Sync` if and only if `&T` is `Send`" +msgstr "" + +#: src/concurrency/send-sync/sync.md +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." +msgstr "" + +#: src/concurrency/send-sync/sync.md +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 +msgid "`Send + Sync`" +msgstr "`Send + Sync`" + +#: src/concurrency/send-sync/examples.md +msgid "Most types you come across are `Send + Sync`:" +msgstr "" + +#: src/concurrency/send-sync/examples.md +msgid "`i8`, `f32`, `bool`, `char`, `&str`, ..." +msgstr "`i8`, `f32`, `bool`, `char`, `&str`, ..." + +#: src/concurrency/send-sync/examples.md +msgid "`(T1, T2)`, `[T; N]`, `&[T]`, `struct { x: T }`, ..." +msgstr "`(T1, T2)`, `[T; N]`, `&[T]`, `struct { x: T }`, ..." + +#: src/concurrency/send-sync/examples.md +msgid "`String`, `Option`, `Vec`, `Box`, ..." +msgstr "`String`, `Option`, `Vec`, `Box`, ..." + +#: src/concurrency/send-sync/examples.md +msgid "`Arc`: Explicitly thread-safe via atomic reference count." +msgstr "" + +#: src/concurrency/send-sync/examples.md +msgid "`Mutex`: Explicitly thread-safe via internal locking." +msgstr "" + +#: src/concurrency/send-sync/examples.md +#, fuzzy +msgid "`mpsc::Sender`: As of 1.72.0." +msgstr "`mpsc::Sender`" + +#: src/concurrency/send-sync/examples.md +msgid "`AtomicBool`, `AtomicU8`, ...: Uses special atomic instructions." +msgstr "" + +#: src/concurrency/send-sync/examples.md +msgid "" +"The generic types are typically `Send + Sync` when the type parameters are " +"`Send + Sync`." +msgstr "" + +#: src/concurrency/send-sync/examples.md +msgid "`Send + !Sync`" +msgstr "`Send + !Sync`" + +#: src/concurrency/send-sync/examples.md +msgid "" +"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 +msgid "`mpsc::Receiver`" +msgstr "`mpsc::Receiver`" + +#: src/concurrency/send-sync/examples.md +msgid "`Cell`" +msgstr "`Cell`" + +#: src/concurrency/send-sync/examples.md +msgid "`RefCell`" +msgstr "`RefCell`" + +#: src/concurrency/send-sync/examples.md +msgid "`!Send + Sync`" +msgstr "`!Send + Sync`" + +#: src/concurrency/send-sync/examples.md +msgid "" +"These types are safe to access (via shared references) from multiple " +"threads, but they cannot be moved to another thread:" +msgstr "" + +#: src/concurrency/send-sync/examples.md +msgid "" +"`MutexGuard`: Uses OS level primitives which must be deallocated on " +"the thread which created them. However, an already-locked mutex can have its " +"guarded variable read by any thread with which the guard is shared." +msgstr "" + +#: src/concurrency/send-sync/examples.md +msgid "`!Send + !Sync`" +msgstr "`!Send + !Sync`" + +#: src/concurrency/send-sync/examples.md +msgid "These types are not thread-safe and cannot be moved to other threads:" +msgstr "" + +#: src/concurrency/send-sync/examples.md +msgid "" +"`Rc`: each `Rc` has a reference to an `RcBox`, which contains a non-" +"atomic reference count." +msgstr "" + +#: src/concurrency/send-sync/examples.md +msgid "" +"`*const T`, `*mut T`: Rust assumes raw pointers may have special concurrency " +"considerations." +msgstr "" + +#: src/concurrency/shared-state.md +msgid "Arc" +msgstr "Arc" + +#: src/concurrency/shared-state.md +msgid "Mutex" +msgstr "Mutex" + +#: src/concurrency/shared-state/arc.md +msgid "" +"[`Arc`](https://doc.rust-lang.org/std/sync/struct.Arc.html) allows " +"shared, read-only ownership via `Arc::clone`:" +msgstr "" + +#: src/concurrency/shared-state/arc.md +msgid "/// A struct that prints which thread drops it.\n" +msgstr "" + +#: src/concurrency/shared-state/arc.md +#, fuzzy +msgid "\"Dropped by {:?}\"" +msgstr "\"Dropper {}\"" + +#: src/concurrency/shared-state/arc.md +msgid "// Sleep for 0-500ms.\n" +msgstr "" + +#: src/concurrency/shared-state/arc.md +msgid "\"{thread_id:?}: {v:?}\"" +msgstr "" + +#: src/concurrency/shared-state/arc.md +msgid "// Now only the spawned threads will hold clones of `v`.\n" +msgstr "" + +#: src/concurrency/shared-state/arc.md +msgid "" +"// When the last spawned thread finishes, it will drop `v`'s contents.\n" +msgstr "" + +#: src/concurrency/shared-state/arc.md +msgid "" +"`Arc` stands for \"Atomic Reference Counted\", a thread safe version of `Rc` " +"that uses atomic operations." +msgstr "" + +#: src/concurrency/shared-state/arc.md +msgid "" +"`Arc` implements `Clone` whether or not `T` does. It implements `Send` " +"and `Sync` if and only if `T` implements them both." +msgstr "" + +#: src/concurrency/shared-state/arc.md +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 +msgid "" +"Beware of reference cycles, `Arc` does not use a garbage collector to detect " +"them." +msgstr "" + +#: src/concurrency/shared-state/arc.md +msgid "`std::sync::Weak` can help." +msgstr "`std::sync::Weak` kan hjælpe." + +#: src/concurrency/shared-state/mutex.md +msgid "" +"[`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 (another form of [interior mutability](../../borrowing/interior-" +"mutability.md)):" +msgstr "" + +#: src/concurrency/shared-state/mutex.md +msgid "\"v: {:?}\"" +msgstr "\"v: {:?}\"" + +#: src/concurrency/shared-state/mutex.md +msgid "" +"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 +msgid "" +"`Mutex` in Rust looks like a collection with just one element --- the " +"protected data." +msgstr "" + +#: src/concurrency/shared-state/mutex.md +msgid "" +"It is not possible to forget to acquire the mutex before accessing the " +"protected data." +msgstr "" + +#: src/concurrency/shared-state/mutex.md +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 +msgid "" +"`Mutex` implements both `Send` and `Sync` if and only if `T` implements " +"`Send`." +msgstr "" + +#: src/concurrency/shared-state/mutex.md +msgid "A read-write lock counterpart: `RwLock`." +msgstr "" + +#: src/concurrency/shared-state/mutex.md +msgid "Why does `lock()` return a `Result`?" +msgstr "" + +#: src/concurrency/shared-state/mutex.md +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 +msgid "Let us see `Arc` and `Mutex` in action:" +msgstr "" + +#: src/concurrency/shared-state/example.md +msgid "// use std::sync::{Arc, Mutex};\n" +msgstr "// use std::sync::{Arc, Mutex};\n" + +#: src/concurrency/shared-state/example.md +msgid "\"v: {v:?}\"" +msgstr "" + +#: src/concurrency/shared-state/example.md +msgid "Possible solution:" +msgstr "" + +#: src/concurrency/shared-state/example.md +msgid "Notable parts:" +msgstr "" + +#: src/concurrency/shared-state/example.md +msgid "" +"`v` is wrapped in both `Arc` and `Mutex`, because their concerns are " +"orthogonal." +msgstr "" + +#: src/concurrency/shared-state/example.md +msgid "" +"Wrapping a `Mutex` in an `Arc` is a common pattern to share mutable state " +"between threads." +msgstr "" + +#: src/concurrency/shared-state/example.md +msgid "" +"`v: Arc<_>` needs to be cloned to make a new reference for each new spawned " +"thread. Note `move` was added to the lambda signature." +msgstr "" + +#: src/concurrency/shared-state/example.md +msgid "" +"Blocks are introduced to narrow the scope of the `LockGuard` as much as " +"possible." +msgstr "" + +#: src/concurrency/sync-exercises.md src/concurrency/async-exercises.md +msgid "This segment should take about 1 hour and 10 minutes. It contains:" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +msgid "The dining philosophers problem is a classic problem in concurrency:" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +msgid "" +"Five philosophers dine together at the same table. Each philosopher has " +"their own place at the table. There is a chopstick between each plate. The " +"dish served is spaghetti which requires two chopsticks to eat. Each " +"philosopher can only alternately think and eat. Moreover, a philosopher can " +"only eat their spaghetti when they have both a left and right chopstick. " +"Thus two chopsticks will only be available when their two nearest neighbors " +"are thinking, not eating. After an individual philosopher finishes eating, " +"they will put down both chopsticks." +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +msgid "" +"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/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/dining-philosophers.md +msgid "" +"// left_chopstick: ...\n" +" // right_chopstick: ...\n" +" // thoughts: ...\n" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/sync-exercises/solutions.md +#: src/concurrency/async-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/solutions.md +msgid "\"Eureka! {} has a new idea!\"" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +msgid "// Pick up chopsticks...\n" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/sync-exercises/solutions.md +#: src/concurrency/async-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/solutions.md +msgid "\"{} is eating...\"" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/sync-exercises/solutions.md +#: src/concurrency/async-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/solutions.md +msgid "\"Socrates\"" +msgstr "\"Sokrates\"" + +#: src/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/sync-exercises/solutions.md +#: src/concurrency/async-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/solutions.md +msgid "\"Hypatia\"" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/sync-exercises/solutions.md +msgid "\"Plato\"" +msgstr "\"Plato\"" + +#: src/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/sync-exercises/solutions.md +msgid "\"Aristotle\"" +msgstr "\"Aristoteles\"" + +#: src/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/sync-exercises/solutions.md +msgid "\"Pythagoras\"" +msgstr "\"Pythagoras\"" + +#: src/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/solutions.md +msgid "// Create chopsticks\n" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/solutions.md +msgid "// Create philosophers\n" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +msgid "// Make each of them think and eat 100 times\n" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/solutions.md +msgid "// Output their thoughts\n" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +msgid "You can use the following `Cargo.toml`:" +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +#, fuzzy +msgid "" +"```toml\n" +"[package]\n" +"name = \"dining-philosophers\"\n" +"version = \"0.1.0\"\n" +"edition = \"2024\"\n" +"```" +msgstr "" +"```toml\n" +"[package]\n" +"name = \"dining-philosophers\"\n" +"version = \"0.1.0\"\n" +"edition = \"2021\"\n" +"```" + +#: src/concurrency/sync-exercises/dining-philosophers.md +msgid "" +"Encourage students to focus first on implementing a solution that \"mostly\" " +"works." +msgstr "" + +#: src/concurrency/sync-exercises/dining-philosophers.md +msgid "" +"The deadlock in the simplest solution is a general concurrency problem and " +"highlights that Rust does not automatically prevent this sort of bug." +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +msgid "" +"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/concurrency/sync-exercises/link-checker.md +msgid "" +"For this, you will need an HTTP client such as [`reqwest`](https://docs.rs/" +"reqwest/). You will also need a way to find links, we can use [`scraper`]" +"(https://docs.rs/scraper/). Finally, we'll need some way of handling errors, " +"we will use [`thiserror`](https://docs.rs/thiserror/)." +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +msgid "Create a new Cargo project and `reqwest` it as a dependency with:" +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +msgid "" +"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/concurrency/sync-exercises/link-checker.md +msgid "" +"The `cargo add` calls will update the `Cargo.toml` file to look like this:" +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +#, fuzzy +msgid "" +"```toml\n" +"[package]\n" +"name = \"link-checker\"\n" +"version = \"0.1.0\"\n" +"edition = \"2024\"\n" +"publish = false\n" +"\n" +"[dependencies]\n" +"reqwest = { version = \"0.11.12\", features = [\"blocking\", \"rustls-" +"tls\"] }\n" +"scraper = \"0.13.0\"\n" +"thiserror = \"1.0.37\"\n" +"```" +msgstr "" +"```toml\n" +"[package]\n" +"name = \"link-checker\"\n" +"version = \"0.1.0\"\n" +"edition = \"2021\"\n" +"publish = false\n" +"\n" +"[dependencies]\n" +"reqwest = { version = \"0.11.12\", features = [\"blocking\", \"rustls-" +"tls\"] }\n" +"scraper = \"0.13.0\"\n" +"thiserror = \"1.0.37\"\n" +"```" + +#: src/concurrency/sync-exercises/link-checker.md +msgid "" +"You can now download the start page. Try with a small site such as `https://" +"www.google.org/`." +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +msgid "Your `src/main.rs` file should look something like this:" +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +#: src/concurrency/sync-exercises/solutions.md +msgid "\"request error: {0}\"" +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +#: src/concurrency/sync-exercises/solutions.md +msgid "\"bad http response: {0}\"" +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +#: src/concurrency/sync-exercises/solutions.md +msgid "\"Checking {:#}\"" +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +#: src/concurrency/sync-exercises/solutions.md +msgid "\"href\"" +msgstr "\"href\"" + +#: src/concurrency/sync-exercises/link-checker.md +#: src/concurrency/sync-exercises/solutions.md +msgid "\"On {base_url:#}: ignored unparsable {href:?}: {err}\"" +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +#: src/concurrency/sync-exercises/solutions.md +msgid "\"https://www.google.org\"" +msgstr "\"https://www.google.org\"" + +#: src/concurrency/sync-exercises/link-checker.md +msgid "\"Links: {links:#?}\"" +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +msgid "\"Could not extract links: {err:#}\"" +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +msgid "Run the code in `src/main.rs` with" +msgstr "" + +#: src/concurrency/sync-exercises/link-checker.md +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/concurrency/sync-exercises/link-checker.md +msgid "" +"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/concurrency/sync-exercises/link-checker.md +msgid "" +"This is a complex exercise and intended to give students an opportunity to " +"work on a larger project than others. A success condition for this exercise " +"is to get stuck on some \"real\" issue and work through it with the support " +"of other students or the instructor." +msgstr "" + +#: src/concurrency/sync-exercises/solutions.md +msgid "\"{} is trying to eat\"" +msgstr "" + +#: src/concurrency/sync-exercises/solutions.md +msgid "" +"// To avoid a deadlock, we have to break the symmetry\n" +" // somewhere. This will swap the chopsticks without deinitializing\n" +" // either of them.\n" +msgstr "" + +#: src/concurrency/sync-exercises/solutions.md +msgid "\"{thought}\"" +msgstr "" + +#: src/concurrency/sync-exercises/solutions.md +msgid "Link Checker" +msgstr "Linktjekker" + +#: src/concurrency/sync-exercises/solutions.md +msgid "" +"/// Determine whether links within the given page should be extracted.\n" +msgstr "" + +#: src/concurrency/sync-exercises/solutions.md +msgid "" +"/// Mark the given page as visited, returning false if it had already\n" +" /// been visited.\n" +msgstr "" + +#: src/concurrency/sync-exercises/solutions.md +msgid "// To multiplex the non-cloneable Receiver, wrap it in Arc>.\n" +msgstr "" + +#: src/concurrency/sync-exercises/solutions.md +msgid "// The sender got dropped. No more commands coming in.\n" +msgstr "" + +#: src/concurrency/sync-exercises/solutions.md +msgid "\"Got crawling error: {:#}\"" +msgstr "" + +#: src/concurrency/sync-exercises/solutions.md +msgid "\"Bad URLs: {:#?}\"" +msgstr "" + +#: src/concurrency/welcome-async.md +msgid "" +"\"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/concurrency/welcome-async.md +msgid "" +"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/concurrency/welcome-async.md +msgid "" +"Futures are polled by an async runtime, and several different runtimes are " +"available." +msgstr "" + +#: src/concurrency/welcome-async.md +msgid "" +"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/concurrency/welcome-async.md +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/concurrency/welcome-async.md +msgid "" +"Including 10 minute breaks, this session should take about 3 hours and 30 " +"minutes. It contains:" +msgstr "" + +#: src/concurrency/async.md +msgid "async/await" +msgstr "async/await" + +#: src/concurrency/async/async-await.md +msgid "" +"At a high level, async Rust code looks very much like \"normal\" sequential " +"code:" +msgstr "" + +#: src/concurrency/async/async-await.md +msgid "\"Count is: {i}!\"" +msgstr "" + +#: src/concurrency/async/async-await.md +msgid "" +"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/concurrency/async/async-await.md +msgid "" +"The \"async\" keyword is syntactic sugar. The compiler replaces the return " +"type with a future." +msgstr "" + +#: src/concurrency/async/async-await.md +msgid "" +"You cannot make `main` async, without additional instructions to the " +"compiler on how to use the returned future." +msgstr "" + +#: src/concurrency/async/async-await.md +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/concurrency/async/async-await.md +msgid "" +"`.await` asynchronously waits for the completion of another operation. " +"Unlike `block_on`, `.await` doesn't block the current thread." +msgstr "" + +#: src/concurrency/async/async-await.md +msgid "" +"`.await` can only be used inside an `async` function (or block; these are " +"introduced later)." +msgstr "" + +#: src/concurrency/async/futures.md +msgid "" +"[`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/concurrency/async/futures.md +msgid "" +"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/concurrency/async/futures.md +msgid "" +"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/concurrency/async/futures.md +msgid "" +"The `Future` and `Poll` types are implemented exactly as shown; click the " +"links to show the implementations in the docs." +msgstr "" + +#: src/concurrency/async/futures.md +msgid "" +"`Context` allows a Future to schedule itself to be polled again when an " +"event such as a timeout occurs." +msgstr "" + +#: src/concurrency/async/futures.md +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`. We will address `Pin` in the \"Pitfalls\" segment." +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "" +"Rust transforms an async function or block to a hidden type that implements " +"`Future`, using a state machine to track the function's progress. The " +"details of this transform are complex, but it helps to have a schematic " +"understanding of what is happening. The following function" +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "/// Sum two D10 rolls plus a modifier.\n" +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "is transformed to something like" +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "// Function has not begun yet.\n" +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "// Waiting for first `.await` to complete.\n" +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "// Waiting for second `.await` to complete.\n" +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "// Create future for first dice roll.\n" +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "// Poll sub-future for first dice roll.\n" +msgstr "" + +#: src/concurrency/async/state-machine.md +#, fuzzy +msgid "// Create future for second roll.\n" +msgstr "/// Clear to send.\n" + +#: src/concurrency/async/state-machine.md +msgid "// Poll sub-future for second dice roll.\n" +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "" +"This example is illustrative, and isn't an accurate representation of the " +"Rust compiler's transformation. The important things to notice here are:" +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "" +"Calling an async function does nothing but construct and return a future." +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "" +"All local variables are stored in the function's future, using an enum to " +"identify where execution is currently suspended." +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "" +"An `.await` in the async function is translated into an a new state " +"containing all live variables and the awaited future. The `loop` then " +"handles that updated state, polling the future until it returns " +"`Poll::Ready`." +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "" +"Execution continues eagerly until a `Poll::Pending` occurs. In this simple " +"example, every future is ready immediately." +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "" +"`main` contains a naïve executor, which just busy-loops until the future is " +"ready. We will discuss real executors shortly." +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "" +"Imagine the `Future` data structure for a deeply nested stack of async " +"functions. Each function's `Future` contains the `Future` structures for the " +"functions it calls. This can result in unexpectedly large compiler-generated " +"`Future` types." +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "" +"This also means that recursive async functions are challenging. Compare to " +"the common error of building recursive type, such as" +msgstr "" + +#: src/concurrency/async/state-machine.md +msgid "" +"The fix for a recursive type is to add a layer of indrection, such as with " +"`Box`. Similarly, a recursive async function must box the recursive future:" +msgstr "" + +#: src/concurrency/async/state-machine.md +#: src/unsafe-deep-dive/foundations/less-powerful.md +#, fuzzy +msgid "\"{n}\"" +msgstr "\"{} {}\"" + +#: src/concurrency/async/runtimes.md +msgid "" +"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/concurrency/async/runtimes.md +msgid "" +"[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/concurrency/async/runtimes.md +msgid "[smol](https://docs.rs/smol/latest/smol/): simple and lightweight" +msgstr "" + +#: src/concurrency/async/runtimes.md +msgid "" +"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/concurrency/async/runtimes.md +msgid "" +"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/concurrency/async/runtimes.md +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/concurrency/async/runtimes/tokio.md +msgid "Tokio provides:" +msgstr "" + +#: src/concurrency/async/runtimes/tokio.md +msgid "A multi-threaded runtime for executing asynchronous code." +msgstr "" + +#: src/concurrency/async/runtimes/tokio.md +msgid "An asynchronous version of the standard library." +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "" -"// ANCHOR: Uart\n" -"/// Driver for a PL011 UART.\n" +#: src/concurrency/async/runtimes/tokio.md +msgid "A large ecosystem of libraries." msgstr "" -"// ANCHOR: Uart\n" -"/// Driver for a PL011 UART.\n" -#: src/exercises/bare-metal/rtc.md +#: src/concurrency/async/runtimes/tokio.md +msgid "\"Count in task: {i}!\"" +msgstr "" + +#: src/concurrency/async/runtimes/tokio.md +msgid "\"Main task: {i}\"" +msgstr "" + +#: src/concurrency/async/runtimes/tokio.md +msgid "With the `tokio::main` macro we can now make `main` async." +msgstr "" + +#: src/concurrency/async/runtimes/tokio.md +msgid "The `spawn` function creates a new, concurrent \"task\"." +msgstr "" + +#: src/concurrency/async/runtimes/tokio.md +msgid "Note: `spawn` takes a `Future`, you don't call `.await` on `count_to`." +msgstr "" + +#: src/concurrency/async/runtimes/tokio.md +msgid "**Further exploration:**" +msgstr "" + +#: src/concurrency/async/runtimes/tokio.md msgid "" -"/// 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" -" /// as device memory and not have any other aliases.\n" +"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 "" -"/// 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" -" /// as device memory and not have any other aliases.\n" -#: src/exercises/bare-metal/rtc.md -msgid "// ANCHOR_END: Uart\n" -msgstr "// ANCHOR_END: Uart\n" +#: src/concurrency/async/runtimes/tokio.md +msgid "Try `count_to(10).await` instead of spawning." +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "_build.rs_ (you shouldn't need to change this):" +#: src/concurrency/async/runtimes/tokio.md +msgid "Try awaiting the task returned from `tokio::spawn`." msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"linux\"" -msgstr "\"linux\"" +#: src/concurrency/async/tasks.md +msgid "Rust has a task system, which is a form of lightweight threading." +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"CROSS_COMPILE\"" -msgstr "\"CROSS_COMPILE\"" +#: src/concurrency/async/tasks.md +msgid "" +"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/exercises/bare-metal/rtc.md -msgid "\"aarch64-linux-gnu\"" -msgstr "\"aarch64-linux-gnu\"" +#: src/concurrency/async/tasks.md +#, fuzzy +msgid "\"127.0.0.1:0\"" +msgstr "\"127.0.0.1:2000\"" -#: src/exercises/bare-metal/rtc.md -msgid "\"aarch64-none-elf\"" -msgstr "\"aarch64-none-elf\"" +#: src/concurrency/async/tasks.md +msgid "\"listening on port {}\"" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"entry.S\"" -msgstr "\"entry.S\"" +#: src/concurrency/async/tasks.md +msgid "\"connection from {addr:?}\"" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"exceptions.S\"" -msgstr "\"exceptions.S\"" +#: src/concurrency/async/tasks.md +msgid "b\"Who are you?\\n\"" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "\"idmap.S\"" -msgstr "\"idmap.S\"" +#: src/concurrency/async/tasks.md +#, fuzzy +msgid "\"socket error\"" +msgstr "\"IO-fejl: {e}\"" -#: src/exercises/bare-metal/rtc.md -msgid "\"empty\"" -msgstr "\"empty\"" +#: src/concurrency/async/tasks.md +msgid "\"Thanks for dialing in, {name}!\\n\"" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "_entry.S_ (you shouldn't need to change this):" +#: src/concurrency/async/tasks.md src/concurrency/async-control-flow/join.md +msgid "" +"Copy this example into your prepared `src/main.rs` and run it from there." msgstr "" -#: src/exercises/bare-metal/rtc.md +#: src/concurrency/async/tasks.md msgid "" -"```armasm\n" -"/*\n" -" * Copyright 2023 Google LLC\n" -" *\n" -" * Licensed under the Apache License, Version 2.0 (the \"License\");\n" -" * you may not use this file except in compliance with the License.\n" -" * You may obtain a copy of the License at\n" -" *\n" -" * https://www.apache.org/licenses/LICENSE-2.0\n" -" *\n" -" * Unless required by applicable law or agreed to in writing, software\n" -" * distributed under the License is distributed on an \"AS IS\" BASIS,\n" -" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" -" * See the License for the specific language governing permissions and\n" -" * limitations under the License.\n" -" */\n" -"\n" -".macro adr_l, reg:req, sym:req\n" -"\tadrp \\reg, \\sym\n" -"\tadd \\reg, \\reg, :lo12:\\sym\n" -".endm\n" -"\n" -".macro mov_i, reg:req, imm:req\n" -"\tmovz \\reg, :abs_g3:\\imm\n" -"\tmovk \\reg, :abs_g2_nc:\\imm\n" -"\tmovk \\reg, :abs_g1_nc:\\imm\n" -"\tmovk \\reg, :abs_g0_nc:\\imm\n" -".endm\n" -"\n" -".set .L_MAIR_DEV_nGnRE,\t0x04\n" -".set .L_MAIR_MEM_WBWA,\t0xff\n" -".set .Lmairval, .L_MAIR_DEV_nGnRE | (.L_MAIR_MEM_WBWA << 8)\n" -"\n" -"/* 4 KiB granule size for TTBR0_EL1. */\n" -".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" -".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" -" * 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" -" * 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" -"\n" -"/* Stage 1 instruction access cacheability is unaffected. */\n" -".set .L_SCTLR_ELx_I, 0x1 << 12\n" -"/* SP alignment fault if SP is not aligned to a 16 byte boundary. */\n" -".set .L_SCTLR_ELx_SA, 0x1 << 3\n" -"/* Stage 1 data access cacheability is unaffected. */\n" -".set .L_SCTLR_ELx_C, 0x1 << 2\n" -"/* EL0 and EL1 stage 1 MMU enabled. */\n" -".set .L_SCTLR_ELx_M, 0x1 << 0\n" -"/* Privileged Access Never is unchanged on taking an exception to EL1. */\n" -".set .L_SCTLR_EL1_SPAN, 0x1 << 23\n" -"/* SETEND instruction disabled at EL0 in aarch32 mode. */\n" -".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" -"\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" -" * 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" -"\tadrp x30, idmap\n" -"\tmsr ttbr0_el1, x30\n" -"\n" -"\tmov_i x30, .Lmairval\n" -"\tmsr mair_el1, x30\n" -"\n" -"\tmov_i x30, .Ltcrval\n" -"\t/* Copy the supported PA range into TCR_EL1.IPS. */\n" -"\tmrs x29, id_aa64mmfr0_el1\n" -"\tbfi x30, x29, #32, #4\n" -"\n" -"\tmsr tcr_el1, x30\n" -"\n" -"\tmov_i x30, .Lsctlrval\n" -"\n" -"\t/*\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" -"\ttlbi vmalle1\n" -"\tic iallu\n" -"\tdsb nsh\n" -"\tisb\n" -"\n" -"\t/*\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" -"\n" -"\t/* Disable trapping floating point access in EL1. */\n" -"\tmrs x30, cpacr_el1\n" -"\torr x30, x30, #(0x3 << 20)\n" -"\tmsr cpacr_el1, x30\n" -"\tisb\n" -"\n" -"\t/* Zero out the bss section. */\n" -"\tadr_l x29, bss_begin\n" -"\tadr_l x30, bss_end\n" -"0:\tcmp x29, x30\n" -"\tb.hs 1f\n" -"\tstp xzr, xzr, [x29], #16\n" -"\tb 0b\n" -"\n" -"1:\t/* Prepare the stack. */\n" -"\tadr_l x30, boot_stack_end\n" -"\tmov sp, x30\n" -"\n" -"\t/* Set up exception vector. */\n" -"\tadr x30, vector_table_el1\n" -"\tmsr vbar_el1, x30\n" -"\n" -"\t/* Call into Rust code. */\n" -"\tbl main\n" -"\n" -"\t/* Loop forever waiting for interrupts. */\n" -"2:\twfi\n" -"\tb 2b\n" -"```" +"Try connecting to it with a TCP connection tool like [nc](https://" +"www.unix.com/man-page/linux/1/nc/) or [telnet](https://www.unix.com/man-page/" +"linux/1/telnet/)." msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "_exceptions.S_ (you shouldn't need to change this):" +#: src/concurrency/async/tasks.md +msgid "" +"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/exercises/bare-metal/rtc.md +#: src/concurrency/async/tasks.md msgid "" -"```armasm\n" -"/*\n" -" * Copyright 2023 Google LLC\n" -" *\n" -" * Licensed under the Apache License, Version 2.0 (the \"License\");\n" -" * you may not use this file except in compliance with the License.\n" -" * You may obtain a copy of the License at\n" -" *\n" -" * https://www.apache.org/licenses/LICENSE-2.0\n" -" *\n" -" * Unless required by applicable law or agreed to in writing, software\n" -" * distributed under the License is distributed on an \"AS IS\" BASIS,\n" -" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" -" * See the License for the specific language governing permissions and\n" -" * limitations under the License.\n" -" */\n" -"\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" -" * 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" -" */\n" -".macro save_volatile_to_stack\n" -"\t/* Reserve stack space and save registers x0-x18, x29 & x30. */\n" -"\tstp x0, x1, [sp, #-(8 * 24)]!\n" -"\tstp x2, x3, [sp, #8 * 2]\n" -"\tstp x4, x5, [sp, #8 * 4]\n" -"\tstp x6, x7, [sp, #8 * 6]\n" -"\tstp x8, x9, [sp, #8 * 8]\n" -"\tstp x10, x11, [sp, #8 * 10]\n" -"\tstp x12, x13, [sp, #8 * 12]\n" -"\tstp x14, x15, [sp, #8 * 14]\n" -"\tstp x16, x17, [sp, #8 * 16]\n" -"\tstr x18, [sp, #8 * 18]\n" -"\tstp x29, x30, [sp, #8 * 20]\n" -"\n" -"\t/*\n" -"\t * Save elr_el1 & spsr_el1. This such that we can take nested exception\n" -"\t * and still be able to unwind.\n" -"\t */\n" -"\tmrs x0, elr_el1\n" -"\tmrs x1, spsr_el1\n" -"\tstp x0, x1, [sp, #8 * 22]\n" -".endm\n" -"\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 left; if paired with save_volatile_to_stack, there are 4\n" -" * instructions to spare.\n" -" */\n" -".macro restore_volatile_from_stack\n" -"\t/* Restore registers x2-x18, x29 & x30. */\n" -"\tldp x2, x3, [sp, #8 * 2]\n" -"\tldp x4, x5, [sp, #8 * 4]\n" -"\tldp x6, x7, [sp, #8 * 6]\n" -"\tldp x8, x9, [sp, #8 * 8]\n" -"\tldp x10, x11, [sp, #8 * 10]\n" -"\tldp x12, x13, [sp, #8 * 12]\n" -"\tldp x14, x15, [sp, #8 * 14]\n" -"\tldp x16, x17, [sp, #8 * 16]\n" -"\tldr x18, [sp, #8 * 18]\n" -"\tldp x29, x30, [sp, #8 * 20]\n" -"\n" -"\t/* Restore registers elr_el1 & spsr_el1, using x0 & x1 as scratch. */\n" -"\tldp x0, x1, [sp, #8 * 22]\n" -"\tmsr elr_el1, x0\n" -"\tmsr spsr_el1, x1\n" -"\n" -"\t/* Restore x0 & x1, and release stack space. */\n" -"\tldp x0, x1, [sp], #8 * 24\n" -".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" -" * 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" -" * the whole handler within the allotted 32 instructions.\n" -" */\n" -".macro current_exception_sp0 handler:req\n" -"\tmsr spsel, #1\n" -"\tsave_volatile_to_stack\n" -"\tbl \\handler\n" -"\trestore_volatile_from_stack\n" -"\tmsr spsel, #0\n" -"\teret\n" -".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" -" * 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" -" * handler in 30 instructions, under the limit of 32.\n" -" */\n" -".macro current_exception_spx handler:req\n" -"\tsave_volatile_to_stack\n" -"\tbl \\handler\n" -"\trestore_volatile_from_stack\n" -"\teret\n" -".endm\n" -"\n" -".section .text.vector_table_el1, \"ax\"\n" -".global vector_table_el1\n" -".balign 0x800\n" -"vector_table_el1:\n" -"sync_cur_sp0:\n" -"\tcurrent_exception_sp0 sync_exception_current\n" -"\n" -".balign 0x80\n" -"irq_cur_sp0:\n" -"\tcurrent_exception_sp0 irq_current\n" -"\n" -".balign 0x80\n" -"fiq_cur_sp0:\n" -"\tcurrent_exception_sp0 fiq_current\n" -"\n" -".balign 0x80\n" -"serr_cur_sp0:\n" -"\tcurrent_exception_sp0 serr_current\n" -"\n" -".balign 0x80\n" -"sync_cur_spx:\n" -"\tcurrent_exception_spx sync_exception_current\n" -"\n" -".balign 0x80\n" -"irq_cur_spx:\n" -"\tcurrent_exception_spx irq_current\n" -"\n" -".balign 0x80\n" -"fiq_cur_spx:\n" -"\tcurrent_exception_spx fiq_current\n" -"\n" -".balign 0x80\n" -"serr_cur_spx:\n" -"\tcurrent_exception_spx serr_current\n" -"\n" -".balign 0x80\n" -"sync_lower_64:\n" -"\tcurrent_exception_spx sync_lower\n" -"\n" -".balign 0x80\n" -"irq_lower_64:\n" -"\tcurrent_exception_spx irq_lower\n" -"\n" -".balign 0x80\n" -"fiq_lower_64:\n" -"\tcurrent_exception_spx fiq_lower\n" -"\n" -".balign 0x80\n" -"serr_lower_64:\n" -"\tcurrent_exception_spx serr_lower\n" -"\n" -".balign 0x80\n" -"sync_lower_32:\n" -"\tcurrent_exception_spx sync_lower\n" -"\n" -".balign 0x80\n" -"irq_lower_32:\n" -"\tcurrent_exception_spx irq_lower\n" -"\n" -".balign 0x80\n" -"fiq_lower_32:\n" -"\tcurrent_exception_spx fiq_lower\n" -"\n" -".balign 0x80\n" -"serr_lower_32:\n" -"\tcurrent_exception_spx serr_lower\n" -"```" +"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/exercises/bare-metal/rtc.md -msgid "_idmap.S_ (you shouldn't need to change this):" +#: src/concurrency/async/tasks.md +msgid "" +"Refactor the async block into a function, and improve the error handling " +"using `?`." msgstr "" -#: src/exercises/bare-metal/rtc.md +#: src/concurrency/async-control-flow/channels.md msgid "" -"```armasm\n" -"/*\n" -" * Copyright 2023 Google LLC\n" -" *\n" -" * Licensed under the Apache License, Version 2.0 (the \"License\");\n" -" * you may not use this file except in compliance with the License.\n" -" * You may obtain a copy of the License at\n" -" *\n" -" * https://www.apache.org/licenses/LICENSE-2.0\n" -" *\n" -" * Unless required by applicable law or agreed to in writing, software\n" -" * distributed under the License is distributed on an \"AS IS\" BASIS,\n" -" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" -" * See the License for the specific language governing permissions and\n" -" * limitations under the License.\n" -" */\n" -"\n" -".set .L_TT_TYPE_BLOCK, 0x1\n" -".set .L_TT_TYPE_PAGE, 0x3\n" -".set .L_TT_TYPE_TABLE, 0x3\n" -"\n" -"/* Access flag. */\n" -".set .L_TT_AF, 0x1 << 10\n" -"/* Not global. */\n" -".set .L_TT_NG, 0x1 << 11\n" -".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" -"\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" -"\n" -".section \".rodata.idmap\", \"a\", %progbits\n" -".global idmap\n" -".align 12\n" -"idmap:\n" -"\t/* level 1 */\n" -"\t.quad\t\t.L_BLOCK_DEV | 0x0\t\t // 1 GiB of device mappings\n" -"\t.quad\t\t.L_BLOCK_MEM | 0x40000000\t// 1 GiB of DRAM\n" -"\t.fill\t\t254, 8, 0x0\t\t\t// 254 GiB of unmapped VA space\n" -"\t.quad\t\t.L_BLOCK_DEV | 0x4000000000 // 1 GiB of device mappings\n" -"\t.fill\t\t255, 8, 0x0\t\t\t// 255 GiB of remaining VA space\n" -"```" +"Several crates have support for asynchronous channels. For instance `tokio`:" msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "_image.ld_ (you shouldn't need to change this):" +#: src/concurrency/async-control-flow/channels.md +msgid "\"Received {count} pings so far.\"" msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "" -"```ld\n" -"/*\n" -" * Copyright 2023 Google LLC\n" -" *\n" -" * Licensed under the Apache License, Version 2.0 (the \"License\");\n" -" * you may not use this file except in compliance with the License.\n" -" * You may obtain a copy of the License at\n" -" *\n" -" * https://www.apache.org/licenses/LICENSE-2.0\n" -" *\n" -" * Unless required by applicable law or agreed to in writing, software\n" -" * distributed under the License is distributed on an \"AS IS\" BASIS,\n" -" * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n" -" * See the License for the specific language governing permissions and\n" -" * limitations under the License.\n" -" */\n" -"\n" -"/*\n" -" * Code will start running at this symbol which is placed at the start of " -"the\n" -" * image.\n" -" */\n" -"ENTRY(entry)\n" -"\n" -"MEMORY\n" -"{\n" -"\timage : ORIGIN = 0x40080000, LENGTH = 2M\n" -"}\n" -"\n" -"SECTIONS\n" -"{\n" -"\t/*\n" -"\t * Collect together the code.\n" -"\t */\n" -"\t.init : ALIGN(4096) {\n" -"\t\ttext_begin = .;\n" -"\t\t*(.init.entry)\n" -"\t\t*(.init.*)\n" -"\t} >image\n" -"\t.text : {\n" -"\t\t*(.text.*)\n" -"\t} >image\n" -"\ttext_end = .;\n" -"\n" -"\t/*\n" -"\t * Collect together read-only data.\n" -"\t */\n" -"\t.rodata : ALIGN(4096) {\n" -"\t\trodata_begin = .;\n" -"\t\t*(.rodata.*)\n" -"\t} >image\n" -"\t.got : {\n" -"\t\t*(.got)\n" -"\t} >image\n" -"\trodata_end = .;\n" -"\n" -"\t/*\n" -"\t * Collect together the read-write data including .bss at the end which\n" -"\t * will be zero'd by the entry code.\n" -"\t */\n" -"\t.data : ALIGN(4096) {\n" -"\t\tdata_begin = .;\n" -"\t\t*(.data.*)\n" -"\t\t/*\n" -"\t\t * The entry point code assumes that .data is a multiple of 32\n" -"\t\t * bytes long.\n" -"\t\t */\n" -"\t\t. = ALIGN(32);\n" -"\t\tdata_end = .;\n" -"\t} >image\n" -"\n" -"\t/* Everything beyond this point will not be included in the binary. */\n" -"\tbin_end = .;\n" -"\n" -"\t/* The entry point code assumes that .bss is 16-byte aligned. */\n" -"\t.bss : ALIGN(16) {\n" -"\t\tbss_begin = .;\n" -"\t\t*(.bss.*)\n" -"\t\t*(COMMON)\n" -"\t\t. = ALIGN(16);\n" -"\t\tbss_end = .;\n" -"\t} >image\n" -"\n" -"\t.stack (NOLOAD) : ALIGN(4096) {\n" -"\t\tboot_stack_begin = .;\n" -"\t\t. += 40 * 4096;\n" -"\t\t. = ALIGN(4096);\n" -"\t\tboot_stack_end = .;\n" -"\t} >image\n" -"\n" -"\t. = ALIGN(4K);\n" -"\tPROVIDE(dma_region = .);\n" -"\n" -"\t/*\n" -"\t * Remove unused sections from the image.\n" -"\t */\n" -"\t/DISCARD/ : {\n" -"\t\t/* The image loads itself so doesn't need these sections. */\n" -"\t\t*(.gnu.hash)\n" -"\t\t*(.hash)\n" -"\t\t*(.interp)\n" -"\t\t*(.eh_frame_hdr)\n" -"\t\t*(.eh_frame)\n" -"\t\t*(.note.gnu.build-id)\n" -"\t}\n" -"}\n" -"```" +#: src/concurrency/async-control-flow/channels.md +msgid "\"ping_handler complete\"" msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "_Makefile_ (you shouldn't need to change this):" +#: src/concurrency/async-control-flow/channels.md +msgid "\"Failed to send ping.\"" msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "# Copyright 2023 Google LLC" -msgstr "# Copyright 2023 Google LLC" +#: src/concurrency/async-control-flow/channels.md +msgid "\"Sent {} pings so far.\"" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "$(shell uname -s)" -msgstr "$(shell uname -s)" +#: src/concurrency/async-control-flow/channels.md +msgid "\"Something went wrong in ping handler task.\"" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "aarch64-linux-gnu" -msgstr "aarch64-linux-gnu" +#: src/concurrency/async-control-flow/channels.md +msgid "Change the channel size to `3` and see how it affects the execution." +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "stdio -display none -kernel $< -s" -msgstr "stdio -display none -kernel $< -s" +#: src/concurrency/async-control-flow/channels.md +msgid "" +"Overall, the interface is similar to the `sync` channels as seen in the " +"[morning class](../channels.md)." +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "cargo clean" -msgstr "cargo clean" +#: src/concurrency/async-control-flow/channels.md +msgid "Try removing the `std::mem::drop` call. What happens? Why?" +msgstr "" -#: src/exercises/bare-metal/rtc.md -msgid "Run the code in QEMU with `make qemu`." +#: src/concurrency/async-control-flow/channels.md +msgid "" +"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/exercises/bare-metal/solutions-afternoon.md -msgid "Bare Metal Rust Afternoon" -msgstr "Rå jern Rust eftermiddag" +#: src/concurrency/async-control-flow/channels.md +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/concurrency/async-control-flow/join.md +msgid "" +"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 "" + +#: src/concurrency/async-control-flow/join.md +msgid "\"https://google.com\"" +msgstr "\"https://google.com\"" + +#: src/concurrency/async-control-flow/join.md +msgid "\"https://httpbin.org/ip\"" +msgstr "\"https://httpbin.org/ip\"" + +#: src/concurrency/async-control-flow/join.md +msgid "\"https://play.rust-lang.org/\"" +msgstr "\"https://play.rust-lang.org/\"" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "([back to exercise](rtc.md))" -msgstr "([tilbage til øvelsen](rtc.md))" +#: src/concurrency/async-control-flow/join.md +msgid "\"BAD_URL\"" +msgstr "\"BAD_URL\"" -#: src/exercises/bare-metal/solutions-afternoon.md +#: src/concurrency/async-control-flow/join.md #, fuzzy -msgid "_main.rs_:" -msgstr "_src/main.rs_:" - -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Base address of the PL031 RTC.\n" -msgstr "" +msgid "\"{page_sizes_dict:?}\"" +msgstr "\"{page_counts:#?}\"" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// The IRQ used by the PL031 RTC.\n" +#: src/concurrency/async-control-flow/join.md +msgid "" +"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/exercises/bare-metal/solutions-afternoon.md +#: src/concurrency/async-control-flow/join.md msgid "" -"// Safe because `PL031_BASE_ADDRESS` is the base address of a PL031 device,\n" -" // and nothing else accesses that address range.\n" +"The risk of `join` is that one of the futures may never resolve, this would " +"cause your program to stall." msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "\"RTC: {time}\"" -msgstr "\"RTC: {time}\"" - -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "// Wait for 3 seconds, without interrupts.\n" +#: src/concurrency/async-control-flow/join.md +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/exercises/bare-metal/solutions-afternoon.md -msgid "\"Waiting for {}\"" +#: src/concurrency/async-control-flow/select.md +msgid "" +"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/exercises/bare-metal/solutions-afternoon.md -msgid "\"matched={}, interrupt_pending={}\"" +#: src/concurrency/async-control-flow/select.md +msgid "" +"Similar to a match statement, the body of `select!` has a number of arms, " +"each of the form `pattern = future => statement`. When a `future` is ready, " +"its return value is destructured by the `pattern`. The `statement` is then " +"run with the resulting variables. The `statement` result becomes the result " +"of the `select!` macro." msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "\"Finished waiting\"" -msgstr "" +#: src/concurrency/async-control-flow/select.md +#, fuzzy +msgid "\"got: {msg}\"" +msgstr "\"Hovedtråden: modtog {msg}\"" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "// Wait another 3 seconds for an interrupt.\n" +#: src/concurrency/async-control-flow/select.md +msgid "\"timeout\"" msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md +#: src/concurrency/async-control-flow/select.md #, fuzzy -msgid "_pl031.rs_:" -msgstr "`pl031.rs`:" +msgid "\"Failed to send greeting\"" +msgstr "\"Kunne ikke sende katten.\"" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Data register\n" +#: src/concurrency/async-control-flow/select.md +msgid "\"Listener failed\"" msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Match register\n" +#: src/concurrency/async-control-flow/select.md +msgid "" +"The `listener` async block here is a common form: wait for some async event, " +"or for a timeout. Change the `sleep` to sleep longer to see it fail. Why " +"does the `send` also fail in this situation?" msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Load register\n" +#: src/concurrency/async-control-flow/select.md +msgid "" +"`select!` is also often used in a loop in \"actor\" architectures, where a " +"task reacts to events in a loop. That has some pitfalls, which will be " +"discussed in the next segment." msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Control register\n" +#: src/concurrency/async-pitfalls.md +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." msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Interrupt Mask Set or Clear register\n" -msgstr "" +#: src/concurrency/async-pitfalls.md +msgid "Pin" +msgstr "Pin" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Raw Interrupt Status\n" +#: src/concurrency/async-pitfalls/blocking-executor.md +msgid "Blocking the executor" msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Masked Interrupt Status\n" +#: src/concurrency/async-pitfalls/blocking-executor.md +msgid "" +"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/exercises/bare-metal/solutions-afternoon.md -msgid "/// Interrupt Clear Register\n" +#: src/concurrency/async-pitfalls/blocking-executor.md +msgid "\"future {id} slept for {duration_ms}ms, finished after {}ms\"" msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Driver for a PL031 real-time clock.\n" +#: src/concurrency/async-pitfalls/blocking-executor.md +msgid "\"current_thread\"" msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md +#: src/concurrency/async-pitfalls/blocking-executor.md msgid "" -"/// 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" -" /// as device memory and not have any other aliases.\n" -msgstr "" - -#: src/exercises/bare-metal/solutions-afternoon.md -msgid "/// Reads the current RTC value.\n" +"Run the code and see that the sleeps happen consecutively rather than " +"concurrently." msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md +#: src/concurrency/async-pitfalls/blocking-executor.md msgid "" -"// Safe because we know that self.registers points to the control\n" -" // registers of a PL031 device which is appropriately mapped.\n" +"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/exercises/bare-metal/solutions-afternoon.md +#: src/concurrency/async-pitfalls/blocking-executor.md msgid "" -"/// Writes a match value. When the RTC value matches this then an interrupt\n" -" /// will be generated (if it is enabled).\n" +"Switch the `std::thread::sleep` to `tokio::time::sleep` and await its result." msgstr "" -#: src/exercises/bare-metal/solutions-afternoon.md +#: src/concurrency/async-pitfalls/blocking-executor.md msgid "" -"/// Returns whether the match register matches the RTC value, whether or " -"not\n" -" /// the interrupt is enabled.\n" +"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/exercises/bare-metal/solutions-afternoon.md +#: src/concurrency/async-pitfalls/blocking-executor.md msgid "" -"/// Returns whether there is currently an interrupt pending.\n" -" ///\n" -" /// This should be true if and only if `matched` returns true and the\n" -" /// interrupt is masked.\n" +"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/exercises/bare-metal/solutions-afternoon.md +#: src/concurrency/async-pitfalls/blocking-executor.md msgid "" -"/// Sets or clears the interrupt mask.\n" -" ///\n" -" /// When the mask is true the interrupt is enabled; when it is false " -"the\n" -" /// interrupt is disabled.\n" +"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/exercises/bare-metal/solutions-afternoon.md -msgid "/// Clears a pending interrupt, if any.\n" +#: src/concurrency/async-pitfalls/pin.md +msgid "" +"Recall an async function or block creates a type implementing `Future` and " +"containing all of the local variables. Some of those variables can hold " +"references (pointers) to other local variables. To ensure those remain " +"valid, the future can never be moved to a different memory location." msgstr "" -#: src/concurrency.md -msgid "Welcome to Concurrency in Rust" -msgstr "Velkommen til Concurrency i Rust" - -#: src/concurrency.md +#: src/concurrency/async-pitfalls/pin.md msgid "" -"Rust has full support for concurrency using OS threads with mutexes and " -"channels." +"To prevent moving the future type in memory, it can only be polled through a " +"pinned pointer. `Pin` is a wrapper around a reference that disallows all " +"operations that would move the instance it points to into a different memory " +"location." msgstr "" -#: src/concurrency.md +#: src/concurrency/async-pitfalls/pin.md msgid "" -"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." +"// A work item. In this case, just sleep for the given time and respond\n" +"// with a message on the `respond_on` channel.\n" msgstr "" -#: src/concurrency/threads.md -msgid "Rust threads work similarly to threads in other languages:" -msgstr "Tråde (eng: _threads_) i Rust virker på samme måde som i andre sprog:" - -#: src/concurrency/threads.md -msgid "\"Count in thread: {i}!\"" -msgstr "\"Tæller i tråden: {i}!\"" +#: src/concurrency/async-pitfalls/pin.md +msgid "// A worker which listens for work on a queue and performs it.\n" +msgstr "" -#: src/concurrency/threads.md -msgid "\"Main thread: {i}\"" -msgstr "\"Hovedtråden: {i}\"" +#: src/concurrency/async-pitfalls/pin.md +msgid "// Pretend to work.\n" +msgstr "" -#: src/concurrency/threads.md -msgid "Threads are all daemon threads, the main thread does not wait for them." +#: src/concurrency/async-pitfalls/pin.md +msgid "\"failed to send response\"" msgstr "" -"Tråde er alle dæmontråde (eng: _daemon threads_), hvilket vil sige at " -"hovedtråden ikke venter på dem." -#: src/concurrency/threads.md -msgid "Thread panics are independent of each other." -msgstr "Hver tråd kan gå i panik uafhængigt af andre tråde." +#: src/concurrency/async-pitfalls/pin.md +msgid "// TODO: report number of iterations every 100ms\n" +msgstr "" -#: src/concurrency/threads.md -msgid "Panics can carry a payload, which can be unpacked with `downcast_ref`." -msgstr "En panik kan have en nyttelast som kan udpakkes med `downcast_ref`." +#: src/concurrency/async-pitfalls/pin.md +msgid "// A requester which requests work and waits for it to complete.\n" +msgstr "" -#: src/concurrency/threads.md -#, fuzzy -msgid "" -"Notice that the thread is stopped before it reaches 10 --- the main thread " -"is not waiting." -msgstr "Bemærk at tråden stopper før den når 10 --- hovedtråden venter ikke." +#: src/concurrency/async-pitfalls/pin.md +msgid "\"failed to send on work queue\"" +msgstr "" -#: src/concurrency/threads.md -msgid "" -"Use `let handle = thread::spawn(...)` and later `handle.join()` to wait for " -"the thread to finish." +#: src/concurrency/async-pitfalls/pin.md +msgid "\"failed waiting for response\"" msgstr "" -"Brug `let handle = thread::spawn(...)` og senere `handle.join()` for at " -"vente på at tråden afsluttes." -#: src/concurrency/threads.md -msgid "Trigger a panic in the thread, notice how this doesn't affect `main`." -msgstr "Skab en panik i tråden, bemærk hvordan dette ikke påvirker `main`." +#: src/concurrency/async-pitfalls/pin.md +msgid "\"work result for iteration {i}: {resp}\"" +msgstr "" -#: src/concurrency/threads.md +#: src/concurrency/async-pitfalls/pin.md 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)." +"You may recognize this as an example of the actor pattern. Actors typically " +"call `select!` in a loop." msgstr "" -"Bruge `Result`\\-returværdien fra `handle.join()` til at få adgang til " -"panikkens nyttelast. Dette er et godt tidspunkt til at snakke om [`Any`]" -"(https://doc.rust-lang.org/std/any/index.html)." - -#: src/concurrency/scoped-threads.md -msgid "Normal threads cannot borrow from their environment:" -msgstr "Normale tråde kan ikke låne fra deres omgivelser:" -#: src/concurrency/scoped-threads.md +#: src/concurrency/async-pitfalls/pin.md msgid "" -"However, you can use a [scoped thread](https://doc.rust-lang.org/std/thread/" -"fn.scope.html) for this:" +"This serves as a summation of a few of the previous lessons, so take your " +"time with it." msgstr "" -"Du kan dog bruge en [tråd med virkefelt (eng: _scoped thread_)](https://doc." -"rust-lang.org/std/thread/fn.scope.html) for at opnå dette:" -#: src/concurrency/scoped-threads.md +#: src/concurrency/async-pitfalls/pin.md 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." +"Naively add a `_ = sleep(Duration::from_millis(100)) => { println!(..) }` to " +"the `select!`. This will never execute. Why?" msgstr "" -"Grunden er, at `thread::scope`\\-funktionen garanterer at alle trådene er " -"blevet forenet med hovedtråden når kaldet afsluttet. De vil således " -"returnere det lånte data." -#: src/concurrency/scoped-threads.md +#: src/concurrency/async-pitfalls/pin.md msgid "" -"Normal Rust borrowing rules apply: you can either borrow mutably by one " -"thread, or immutably by any number of threads." +"Instead, add a `timeout_fut` containing that future outside of the `loop`:" msgstr "" -"De normale låneregler for Rust gælder: du kan enten lade én tråd låne data " -"for at ændre på det, eller du kan lade flere tråde låne data uden at ændre " -"på det." -#: src/concurrency/channels.md +#: src/concurrency/async-pitfalls/pin.md msgid "" -"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." +"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/concurrency/channels.md -msgid "\"Received: {:?}\"" -msgstr "\"Modtaget: {:?}\"" - -#: src/concurrency/channels.md +#: src/concurrency/async-pitfalls/pin.md msgid "" -"`mpsc` stands for Multi-Producer, Single-Consumer. `Sender` and `SyncSender` " -"implement `Clone` (so you can make multiple producers) but `Receiver` does " -"not." +"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/concurrency/channels.md +#: src/concurrency/async-pitfalls/pin.md msgid "" -"`send()` and `recv()` return `Result`. If they return `Err`, it means the " -"counterpart `Sender` or `Receiver` is dropped and the channel is closed." +"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/concurrency/channels/unbounded.md -msgid "You get an unbounded and asynchronous channel with `mpsc::channel()`:" +#: src/concurrency/async-pitfalls/pin.md +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/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md -msgid "\"Message {i}\"" -msgstr "\"Besked {i}\"" - -#: src/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md -msgid "\"{thread_id:?}: sent Message {i}\"" -msgstr "\"{thread_id:?}: sendte Besked {i}\"" - -#: src/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md -msgid "\"{thread_id:?}: done\"" -msgstr "\"{thread_id:?}: færdig\"" - -#: src/concurrency/channels/unbounded.md src/concurrency/channels/bounded.md -msgid "\"Main: got {msg}\"" -msgstr "\"Hovedtråden: modtog {msg}\"" - -#: src/concurrency/channels/bounded.md +#: src/concurrency/async-pitfalls/pin.md msgid "" -"With bounded (synchronous) channels, `send` can block the current thread:" +"Data that contains pointers to itself is called self-referential. Normally, " +"the Rust borrow checker would prevent self-referential data from being " +"moved, as the references cannot outlive the data they point to. However, the " +"code transformation for async blocks and functions is not verified by the " +"borrow checker." msgstr "" -#: src/concurrency/channels/bounded.md +#: src/concurrency/async-pitfalls/pin.md 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." +"`Pin` is a wrapper around a reference. An object cannot be moved from its " +"place using a pinned pointer. However, it can still be moved through an " +"unpinned pointer." msgstr "" -#: src/concurrency/channels/bounded.md +#: src/concurrency/async-pitfalls/pin.md 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." +"The `poll` method of the `Future` trait uses `Pin<&mut Self>` instead of " +"`&mut Self` to refer to the instance. That's why it can only be called on a " +"pinned pointer." msgstr "" -#: src/concurrency/channels/bounded.md +#: src/concurrency/async-pitfalls/async-traits.md 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`." +"Async methods in traits were stabilized in the 1.75 release. This required " +"support for using return-position `impl Trait` in traits, as the desugaring " +"for `async fn` includes `-> impl Future`." msgstr "" -#: src/concurrency/send-sync.md +#: src/concurrency/async-pitfalls/async-traits.md msgid "" -"How does Rust know to forbid shared access across threads? The answer is in " -"two traits:" +"However, even with the native support, there are some pitfalls around `async " +"fn`:" msgstr "" -#: src/concurrency/send-sync.md +#: src/concurrency/async-pitfalls/async-traits.md msgid "" -"[`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." +"Return-position `impl Trait` captures all in-scope lifetimes (so some " +"patterns of borrowing cannot be expressed)." msgstr "" -#: src/concurrency/send-sync.md +#: src/concurrency/async-pitfalls/async-traits.md 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." +"Async traits cannot be used with [trait objects](../../smart-pointers/trait-" +"objects.md) (`dyn Trait` support)." msgstr "" -#: src/concurrency/send-sync.md +#: src/concurrency/async-pitfalls/async-traits.md msgid "" -"`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." +"The [async_trait](https://docs.rs/async-trait/) crate provides a workaround " +"for `dyn` support through a macro, with some caveats:" msgstr "" -#: src/concurrency/send-sync.md -msgid "" -"One can think of these traits as markers that the type has certain thread-" -"safety properties." +#: src/concurrency/async-pitfalls/async-traits.md +msgid "\"Running all sleepers...\"" msgstr "" -#: src/concurrency/send-sync.md -msgid "They can be used in the generic constraints as normal traits." -msgstr "" +#: src/concurrency/async-pitfalls/async-traits.md +#, fuzzy +msgid "\"Slept for {} ms\"" +msgstr "\"expr: {:?}\"" -#: src/concurrency/send-sync/send.md +#: src/concurrency/async-pitfalls/async-traits.md 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." +"`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/concurrency/send-sync/send.md +#: src/concurrency/async-pitfalls/async-traits.md msgid "" -"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." +"The challenges in language support for `async trait` are too deep to " +"describe in-depth in this class. See [this blog post](https://" +"smallcultfollowing.com/babysteps/blog/2019/10/26/async-fn-in-traits-are-" +"hard/) by Niko Matsakis if you are interested in digging deeper. See also " +"these keywords:" msgstr "" -#: src/concurrency/send-sync/send.md +#: src/concurrency/async-pitfalls/async-traits.md msgid "" -"As an example, a connection to the SQLite library must only be accessed from " -"a single thread." +"[RPIT](https://doc.rust-lang.org/reference/types/impl-trait.html#abstract-" +"return-types): short for [return-position `impl Trait`](../../generics/impl-" +"trait.md)." msgstr "" -#: src/concurrency/send-sync/sync.md +#: src/concurrency/async-pitfalls/async-traits.md msgid "" -"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 -msgid "More precisely, the definition is:" -msgstr "" - -#: src/concurrency/send-sync/sync.md -msgid "`T` is `Sync` if and only if `&T` is `Send`" +"[RPITIT](https://blog.rust-lang.org/2023/12/21/async-fn-rpit-in-" +"traits.html): short for return-position `impl Trait` in trait (RPIT in " +"trait)." msgstr "" -#: src/concurrency/send-sync/sync.md +#: src/concurrency/async-pitfalls/async-traits.md 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." +"Try creating a new sleeper struct that will sleep for a random amount of " +"time and adding it to the `Vec`." msgstr "" -#: src/concurrency/send-sync/sync.md +#: src/concurrency/async-pitfalls/cancellation.md 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 -msgid "`Send + Sync`" -msgstr "`Send + Sync`" - -#: src/concurrency/send-sync/examples.md -msgid "Most types you come across are `Send + Sync`:" +"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/concurrency/send-sync/examples.md -msgid "`i8`, `f32`, `bool`, `char`, `&str`, ..." -msgstr "`i8`, `f32`, `bool`, `char`, `&str`, ..." - -#: src/concurrency/send-sync/examples.md -msgid "`(T1, T2)`, `[T; N]`, `&[T]`, `struct { x: T }`, ..." -msgstr "`(T1, T2)`, `[T; N]`, `&[T]`, `struct { x: T }`, ..." - -#: src/concurrency/send-sync/examples.md -msgid "`String`, `Option`, `Vec`, `Box`, ..." -msgstr "`String`, `Option`, `Vec`, `Box`, ..." - -#: src/concurrency/send-sync/examples.md -msgid "`Arc`: Explicitly thread-safe via atomic reference count." +#: src/concurrency/async-pitfalls/cancellation.md +msgid "\"not UTF-8\"" msgstr "" -#: src/concurrency/send-sync/examples.md -msgid "`Mutex`: Explicitly thread-safe via internal locking." +#: src/concurrency/async-pitfalls/cancellation.md +msgid "\"hi\\nthere\\n\"" msgstr "" -#: src/concurrency/send-sync/examples.md -msgid "`AtomicBool`, `AtomicU8`, ...: Uses special atomic instructions." +#: src/concurrency/async-pitfalls/cancellation.md +msgid "\"tick!\"" msgstr "" -#: src/concurrency/send-sync/examples.md +#: src/concurrency/async-pitfalls/cancellation.md msgid "" -"The generic types are typically `Send + Sync` when the type parameters are " -"`Send + Sync`." +"The compiler doesn't help with cancellation-safety. You need to read API " +"documentation and consider what state your `async fn` holds." msgstr "" -#: src/concurrency/send-sync/examples.md -msgid "`Send + !Sync`" -msgstr "`Send + !Sync`" - -#: src/concurrency/send-sync/examples.md +#: src/concurrency/async-pitfalls/cancellation.md msgid "" -"These types can be moved to other threads, but they're not thread-safe. " -"Typically because of interior mutability:" +"Unlike `panic` and `?`, cancellation is part of normal control flow (vs " +"error-handling)." msgstr "" -#: src/concurrency/send-sync/examples.md -msgid "`mpsc::Sender`" -msgstr "`mpsc::Sender`" - -#: src/concurrency/send-sync/examples.md -msgid "`mpsc::Receiver`" -msgstr "`mpsc::Receiver`" - -#: src/concurrency/send-sync/examples.md -msgid "`Cell`" -msgstr "`Cell`" - -#: src/concurrency/send-sync/examples.md -msgid "`RefCell`" -msgstr "`RefCell`" - -#: src/concurrency/send-sync/examples.md -msgid "`!Send + Sync`" -msgstr "`!Send + Sync`" +#: src/concurrency/async-pitfalls/cancellation.md +msgid "The example loses parts of the string." +msgstr "" -#: src/concurrency/send-sync/examples.md +#: src/concurrency/async-pitfalls/cancellation.md msgid "" -"These types are thread-safe, but they cannot be moved to another thread:" +"Whenever the `tick()` branch finishes first, `next()` and its `buf` are " +"dropped." msgstr "" -#: src/concurrency/send-sync/examples.md +#: src/concurrency/async-pitfalls/cancellation.md msgid "" -"`MutexGuard`: Uses OS level primitives which must be deallocated on " -"the thread which created them." +"`LinesReader` can be made cancellation-safe by making `buf` part of the " +"struct:" msgstr "" -#: src/concurrency/send-sync/examples.md -msgid "`!Send + !Sync`" -msgstr "`!Send + !Sync`" - -#: src/concurrency/send-sync/examples.md -msgid "These types are not thread-safe and cannot be moved to other threads:" +#: src/concurrency/async-pitfalls/cancellation.md +msgid "// prefix buf and bytes with self.\n" msgstr "" -#: src/concurrency/send-sync/examples.md +#: src/concurrency/async-pitfalls/cancellation.md msgid "" -"`Rc`: each `Rc` has a reference to an `RcBox`, which contains a non-" -"atomic reference count." +"[`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/concurrency/send-sync/examples.md +#: src/concurrency/async-pitfalls/cancellation.md msgid "" -"`*const T`, `*mut T`: Rust assumes raw pointers may have special concurrency " -"considerations." +"[`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/concurrency/shared_state.md +#: src/concurrency/async-pitfalls/cancellation.md msgid "" -"Rust uses the type system to enforce synchronization of shared data. This is " -"primarily done via two types:" +"[`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/concurrency/shared_state.md +#: src/concurrency/async-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/solutions.md +#, fuzzy +msgid "Dining Philosophers --- Async" +msgstr "Filosoffer omkring spisebordet" + +#: src/concurrency/async-exercises/dining-philosophers.md msgid "" -"[`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," +"See [dining philosophers](../sync-exercises/dining-philosophers.md) for a " +"description of the problem." msgstr "" -#: src/concurrency/shared_state.md +#: src/concurrency/async-exercises/dining-philosophers.md msgid "" -"[`Mutex`](https://doc.rust-lang.org/std/sync/struct.Mutex.html): ensures " -"mutually exclusive access to the `T` value." +"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/concurrency/shared_state/arc.md -msgid "" -"[`Arc`](https://doc.rust-lang.org/std/sync/struct.Arc.html) allows shared " -"read-only access via `Arc::clone`:" +#: src/concurrency/async-exercises/dining-philosophers.md +msgid "// Keep trying until we have both chopsticks\n" msgstr "" -#: src/concurrency/shared_state/arc.md -msgid "\"{thread_id:?}: {v:?}\"" +#: src/concurrency/async-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/solutions.md +msgid "// tokio scheduler doesn't deadlock with 5 philosophers, so have 2.\n" msgstr "" -#: src/concurrency/shared_state/arc.md src/concurrency/shared_state/example.md -msgid "\"v: {v:?}\"" +#: src/concurrency/async-exercises/dining-philosophers.md +#: src/concurrency/async-exercises/solutions.md +msgid "// Make them think and eat\n" msgstr "" -#: src/concurrency/shared_state/arc.md +#: src/concurrency/async-exercises/dining-philosophers.md msgid "" -"`Arc` stands for \"Atomic Reference Counted\", a thread safe version of `Rc` " -"that uses atomic operations." +"Since this time you are using Async Rust, you'll need a `tokio` dependency. " +"You can use the following `Cargo.toml`:" msgstr "" -#: src/concurrency/shared_state/arc.md +#: src/concurrency/async-exercises/dining-philosophers.md +#, fuzzy msgid "" -"`Arc` implements `Clone` whether or not `T` does. It implements `Send` " -"and `Sync` if and only if `T` implements them both." +"```toml\n" +"[package]\n" +"name = \"dining-philosophers-async-dine\"\n" +"version = \"0.1.0\"\n" +"edition = \"2024\"\n" +"\n" +"[dependencies]\n" +"tokio = { version = \"1.26.0\", features = [\"sync\", \"time\", \"macros\", " +"\"rt-multi-thread\"] }\n" +"```" msgstr "" +"```toml\n" +"[package]\n" +"name = \"link-checker\"\n" +"version = \"0.1.0\"\n" +"edition = \"2021\"\n" +"publish = false\n" +"\n" +"[dependencies]\n" +"reqwest = { version = \"0.11.12\", features = [\"blocking\", \"rustls-" +"tls\"] }\n" +"scraper = \"0.13.0\"\n" +"thiserror = \"1.0.37\"\n" +"```" -#: src/concurrency/shared_state/arc.md +#: src/concurrency/async-exercises/dining-philosophers.md msgid "" -"`Arc::clone()` has the cost of atomic operations that get executed, but " -"after that the use of the `T` is free." +"Also note that this time you have to use the `Mutex` and the `mpsc` module " +"from the `tokio` crate." msgstr "" -#: src/concurrency/shared_state/arc.md -msgid "" -"Beware of reference cycles, `Arc` does not use a garbage collector to detect " -"them." +#: src/concurrency/async-exercises/dining-philosophers.md +msgid "Can you make your implementation single-threaded?" msgstr "" -#: src/concurrency/shared_state/arc.md -msgid "`std::sync::Weak` can help." -msgstr "`std::sync::Weak` kan hjælpe." +#: src/concurrency/async-exercises/chat-app.md +msgid "" +"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/concurrency/shared_state/mutex.md +#: src/concurrency/async-exercises/chat-app.md msgid "" -"[`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 (another form of [interior mutability](../../borrowing/interior-" -"mutability)):" +"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/) for the communication between the client " +"and the server." msgstr "" -#: src/concurrency/shared_state/mutex.md -msgid "\"v: {:?}\"" -msgstr "\"v: {:?}\"" +#: src/concurrency/async-exercises/chat-app.md +msgid "Create a new Cargo project and add the following dependencies:" +msgstr "" + +#: src/concurrency/async-exercises/chat-app.md +msgid "_Cargo.toml_:" +msgstr "" -#: src/concurrency/shared_state/mutex.md +#: src/concurrency/async-exercises/chat-app.md +#, fuzzy msgid "" -"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." +"```toml\n" +"[package]\n" +"name = \"chat-async\"\n" +"version = \"0.1.0\"\n" +"edition = \"2024\"\n" +"\n" +"[dependencies]\n" +"futures-util = { version = \"0.3.31\", features = [\"sink\"] }\n" +"http = \"1.3.1\"\n" +"tokio = { version = \"1.47.1\", features = [\"full\"] }\n" +"tokio-websockets = { version = \"0.12.1\", features = [\"client\", " +"\"fastrand\", \"server\", \"sha1_smol\"] }\n" +"```" +msgstr "" +"```toml\n" +"[package]\n" +"name = \"link-checker\"\n" +"version = \"0.1.0\"\n" +"edition = \"2021\"\n" +"publish = false\n" +"\n" +"[dependencies]\n" +"reqwest = { version = \"0.11.12\", features = [\"blocking\", \"rustls-" +"tls\"] }\n" +"scraper = \"0.13.0\"\n" +"thiserror = \"1.0.37\"\n" +"```" + +#: src/concurrency/async-exercises/chat-app.md +msgid "The required APIs" msgstr "" -#: src/concurrency/shared_state/mutex.md +#: src/concurrency/async-exercises/chat-app.md msgid "" -"`Mutex` in Rust looks like a collection with just one element --- the " -"protected data." +"You are going to need the following functions from `tokio` and " +"[`tokio_websockets`](https://docs.rs/tokio-websockets/). Spend a few minutes " +"to familiarize yourself with the API." msgstr "" -#: src/concurrency/shared_state/mutex.md +#: src/concurrency/async-exercises/chat-app.md msgid "" -"It is not possible to forget to acquire the mutex before accessing the " -"protected data." +"[StreamExt::next()](https://docs.rs/futures-util/0.3.28/futures_util/stream/" +"trait.StreamExt.html#method.next) implemented by `WebSocketStream`: for " +"asynchronously reading messages from a Websocket Stream." msgstr "" -#: src/concurrency/shared_state/mutex.md +#: src/concurrency/async-exercises/chat-app.md 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." +"[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/concurrency/shared_state/mutex.md +#: src/concurrency/async-exercises/chat-app.md msgid "" -"`Mutex` implements both `Send` and `Sync` iff (if and only if) `T` " -"implements `Send`." +"[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/concurrency/shared_state/mutex.md -msgid "A read-write lock counterpart: `RwLock`." +#: src/concurrency/async-exercises/chat-app.md +msgid "" +"[Sender::subscribe()](https://docs.rs/tokio/latest/tokio/sync/broadcast/" +"struct.Sender.html#method.subscribe): for subscribing to a broadcast channel." msgstr "" -#: src/concurrency/shared_state/mutex.md -msgid "Why does `lock()` return a `Result`?" +#: src/concurrency/async-exercises/chat-app.md +msgid "Two binaries" msgstr "" -#: src/concurrency/shared_state/mutex.md +#: src/concurrency/async-exercises/chat-app.md 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." +"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/concurrency/shared_state/example.md -msgid "Let us see `Arc` and `Mutex` in action:" +#: src/concurrency/async-exercises/chat-app.md +msgid "" +"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/concurrency/shared_state/example.md -msgid "// use std::sync::{Arc, Mutex};\n" -msgstr "// use std::sync::{Arc, Mutex};\n" +#: src/concurrency/async-exercises/chat-app.md +#: src/concurrency/async-exercises/solutions.md +msgid "_src/bin/server.rs_:" +msgstr "_src/bin/server.rs_:" -#: src/concurrency/shared_state/example.md -msgid "Possible solution:" +#: src/concurrency/async-exercises/chat-app.md +msgid "// TODO: For a hint, see the description of the task below.\n" msgstr "" -#: src/concurrency/shared_state/example.md -msgid "Notable parts:" -msgstr "" +#: src/concurrency/async-exercises/chat-app.md +#: src/concurrency/async-exercises/solutions.md +msgid "\"127.0.0.1:2000\"" +msgstr "\"127.0.0.1:2000\"" -#: src/concurrency/shared_state/example.md -msgid "" -"`v` is wrapped in both `Arc` and `Mutex`, because their concerns are " -"orthogonal." +#: src/concurrency/async-exercises/chat-app.md +#: src/concurrency/async-exercises/solutions.md +msgid "\"listening on port 2000\"" msgstr "" -#: src/concurrency/shared_state/example.md -msgid "" -"Wrapping a `Mutex` in an `Arc` is a common pattern to share mutable state " -"between threads." +#: src/concurrency/async-exercises/chat-app.md +#: src/concurrency/async-exercises/solutions.md +msgid "\"New connection from {addr:?}\"" msgstr "" -#: src/concurrency/shared_state/example.md -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." +#: src/concurrency/async-exercises/chat-app.md +#: src/concurrency/async-exercises/solutions.md +msgid "// Wrap the raw TCP stream into a websocket.\n" msgstr "" -#: src/concurrency/shared_state/example.md -msgid "" -"Blocks are introduced to narrow the scope of the `LockGuard` as much as " -"possible." +#: src/concurrency/async-exercises/chat-app.md +#: src/concurrency/async-exercises/solutions.md +msgid "_src/bin/client.rs_:" +msgstr "_src/bin/client.rs_:" + +#: src/concurrency/async-exercises/chat-app.md +#: src/concurrency/async-exercises/solutions.md +msgid "\"ws://127.0.0.1:2000\"" +msgstr "\"ws://127.0.0.1:2000\"" + +#: src/concurrency/async-exercises/chat-app.md +msgid "Running the binaries" +msgstr "Afvikling af binære filer" + +#: src/concurrency/async-exercises/chat-app.md +msgid "Run the server with:" msgstr "" -#: src/exercises/concurrency/morning.md -msgid "Let us practice our new concurrency skills with" +#: src/concurrency/async-exercises/chat-app.md +msgid "and the client with:" msgstr "" -#: src/exercises/concurrency/morning.md -msgid "Dining philosophers: a classic problem in concurrency." +#: src/concurrency/async-exercises/chat-app.md +msgid "Implement the `handle_connection` function in `src/bin/server.rs`." msgstr "" -#: src/exercises/concurrency/morning.md +#: src/concurrency/async-exercises/chat-app.md msgid "" -"Multi-threaded link checker: a larger project where you'll use Cargo to " -"download dependencies and then check links in parallel." +"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/dining-philosophers.md -msgid "The dining philosophers problem is a classic problem in concurrency:" +#: src/concurrency/async-exercises/chat-app.md +msgid "Complete the main function in `src/bin/client.rs`." msgstr "" -#: src/exercises/concurrency/dining-philosophers.md +#: src/concurrency/async-exercises/chat-app.md msgid "" -"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." +"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/exercises/concurrency/dining-philosophers.md +#: src/concurrency/async-exercises/chat-app.md msgid "" -"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:" +"Optional: Once you are done, change the code to broadcast messages to all " +"clients, but the sender of the message." msgstr "" -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/dining-philosophers-async.md +#: src/concurrency/async-exercises/solutions.md msgid "" -"// left_fork: ...\n" -" // right_fork: ...\n" -" // thoughts: ...\n" +"// Keep trying until we have both chopsticks\n" +" // Pick up chopsticks...\n" msgstr "" -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/solutions-morning.md -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"Eureka! {} has a new idea!\"" +#: src/concurrency/async-exercises/solutions.md +msgid "// The locks are dropped here\n" msgstr "" -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "// Pick up forks...\n" +#: src/concurrency/async-exercises/solutions.md +msgid "// tx is dropped here, so we don't need to explicitly drop it later\n" msgstr "" -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/solutions-morning.md -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"{} is eating...\"" +#: src/concurrency/async-exercises/solutions.md +msgid "\"Here is a thought: {thought}\"" msgstr "" -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/solutions-morning.md -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"Socrates\"" -msgstr "\"Sokrates\"" - -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/solutions-morning.md -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"Hypatia\"" +#: src/concurrency/async-exercises/solutions.md +msgid "\"Welcome to chat! Type a message\"" msgstr "" -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/solutions-morning.md -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"Plato\"" -msgstr "\"Plato\"" - -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/solutions-morning.md -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"Aristotle\"" -msgstr "\"Aristoteles\"" - -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/solutions-morning.md -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"Pythagoras\"" -msgstr "\"Pythagoras\"" - -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "// Create forks\n" +#: src/concurrency/async-exercises/solutions.md +msgid "" +"// 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" msgstr "" -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "// Create philosophers\n" +#: src/concurrency/async-exercises/solutions.md +msgid "\"From client {addr:?} {text:?}\"" msgstr "" -#: src/exercises/concurrency/dining-philosophers.md -msgid "// Make each of them think and eat 100 times\n" +#: src/concurrency/async-exercises/solutions.md +msgid "// Continuous loop for concurrently sending and receiving messages.\n" msgstr "" -#: src/exercises/concurrency/dining-philosophers.md -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "// Output their thoughts\n" +#: src/concurrency/async-exercises/solutions.md +msgid "\"From server: {}\"" msgstr "" -#: src/exercises/concurrency/dining-philosophers.md -msgid "You can use the following `Cargo.toml`:" -msgstr "" +#: src/idiomatic/welcome.md +#, fuzzy +msgid "Welcome to Idiomatic Rust" +msgstr "Velkommen til Rust på det rå jern" -#: src/exercises/concurrency/dining-philosophers.md +#: src/idiomatic/welcome.md msgid "" -"```toml\n" -"[package]\n" -"name = \"dining-philosophers\"\n" -"version = \"0.1.0\"\n" -"edition = \"2021\"\n" -"```" +"[Rust Fundamentals](../welcome-day-1.md) introduced Rust syntax and core " +"concepts. We now want to go one step further: how do you use Rust " +"_effectively_ in your projects? What does _idiomatic_ Rust look like?" msgstr "" -"```toml\n" -"[package]\n" -"name = \"dining-philosophers\"\n" -"version = \"0.1.0\"\n" -"edition = \"2021\"\n" -"```" -#: src/exercises/concurrency/link-checker.md +#: src/idiomatic/welcome.md msgid "" -"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." +"This course is opinionated: we will nudge you towards some patterns, and " +"away from others. Nonetheless, we do recognize that some projects may have " +"different needs. We always provide the necessary information to help you " +"make informed decisions within the context and constraints of your own " +"projects." msgstr "" -#: src/exercises/concurrency/link-checker.md -msgid "" -"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:" +#: src/idiomatic/welcome.md +msgid "⚠️ This course is under **active development**." msgstr "" -#: src/exercises/concurrency/link-checker.md +#: src/idiomatic/welcome.md msgid "" -"If `cargo add` fails with `error: no such subcommand`, then please edit the " -"`Cargo.toml` file by hand. Add the dependencies listed below." +"The material may change frequently and there might be errors that have not " +"yet been spotted. Nonetheless, we encourage you to browse through and " +"provide early feedback!" msgstr "" -#: src/exercises/concurrency/link-checker.md +#: src/idiomatic/welcome.md msgid "" -"You will also need a way to find links. We can use [`scraper`](https://docs." -"rs/scraper/) for that:" +"Including 10 minute breaks, this session should take about 25 minutes. It " +"contains:" msgstr "" -#: src/exercises/concurrency/link-checker.md +#: src/idiomatic/welcome.md msgid "" -"Finally, we'll need some way of handling errors. We use [`thiserror`]" -"(https://docs.rs/thiserror/) for that:" +"The course will cover the topics listed below. Each topic may be covered in " +"one or more slides, depending on its complexity and relevance." msgstr "" -#: src/exercises/concurrency/link-checker.md -msgid "" -"The `cargo add` calls will update the `Cargo.toml` file to look like this:" +#: src/idiomatic/welcome.md +msgid "Foundations of API design" msgstr "" -#: src/exercises/concurrency/link-checker.md +#: src/idiomatic/welcome.md msgid "" -"```toml\n" -"[package]\n" -"name = \"link-checker\"\n" -"version = \"0.1.0\"\n" -"edition = \"2021\"\n" -"publish = false\n" -"\n" -"[dependencies]\n" -"reqwest = { version = \"0.11.12\", features = [\"blocking\", \"rustls-" -"tls\"] }\n" -"scraper = \"0.13.0\"\n" -"thiserror = \"1.0.37\"\n" -"```" +"Golden rule: prioritize clarity and readability at the callsite. People will " +"spend much more time reading the call sites than declarations of the " +"functions being called." msgstr "" -"```toml\n" -"[package]\n" -"name = \"link-checker\"\n" -"version = \"0.1.0\"\n" -"edition = \"2021\"\n" -"publish = false\n" -"\n" -"[dependencies]\n" -"reqwest = { version = \"0.11.12\", features = [\"blocking\", \"rustls-" -"tls\"] }\n" -"scraper = \"0.13.0\"\n" -"thiserror = \"1.0.37\"\n" -"```" -#: src/exercises/concurrency/link-checker.md -msgid "" -"You can now download the start page. Try with a small site such as `https://" -"www.google.org/`." +#: src/idiomatic/welcome.md +msgid "Make your API predictable" msgstr "" -#: src/exercises/concurrency/link-checker.md -msgid "Your `src/main.rs` file should look something like this:" +#: src/idiomatic/welcome.md +msgid "" +"Follow naming conventions (case conventions, prefer vocabulary precedented " +"in the standard library - e.g., methods should be called \"push\" not " +"\"push_back\", \"is_empty\" not \"empty\" etc.)" msgstr "" -#: src/exercises/concurrency/link-checker.md -#: src/exercises/concurrency/solutions-morning.md -msgid "\"request error: {0}\"" +#: src/idiomatic/welcome.md +msgid "" +"Know the vocabulary types and traits in the standard library, and use them " +"in your APIs. If something feels like a basic type/algorithm, check in the " +"standard library first." msgstr "" -#: src/exercises/concurrency/link-checker.md -#: src/exercises/concurrency/solutions-morning.md -msgid "\"bad http response: {0}\"" +#: src/idiomatic/welcome.md +msgid "" +"Use well-established API design patterns that we will discuss later in this " +"class (e.g., newtype, owned/view type pairs, error handling)" msgstr "" -#: src/exercises/concurrency/link-checker.md -#: src/exercises/concurrency/solutions-morning.md -msgid "\"Checking {:#}\"" +#: src/idiomatic/welcome.md +msgid "" +"Write meaningful and effective doc comments (e.g., don't merely repeat the " +"method name with spaces instead of underscores, don't repeat the same " +"information just to fill out every markdown tag, provide usage examples)" msgstr "" -#: src/exercises/concurrency/link-checker.md -#: src/exercises/concurrency/solutions-morning.md -msgid "\"href\"" -msgstr "\"href\"" - -#: src/exercises/concurrency/link-checker.md -#: src/exercises/concurrency/solutions-morning.md -msgid "\"On {base_url:#}: ignored unparsable {href:?}: {err}\"" +#: src/idiomatic/welcome.md +msgid "Leveraging the type system" msgstr "" -#: src/exercises/concurrency/link-checker.md -#: src/exercises/concurrency/solutions-morning.md -msgid "\"https://www.google.org\"" -msgstr "\"https://www.google.org\"" - -#: src/exercises/concurrency/link-checker.md -msgid "\"Links: {links:#?}\"" +#: src/idiomatic/welcome.md +msgid "Short recap on enums, structs and type aliases" msgstr "" -#: src/exercises/concurrency/link-checker.md -msgid "\"Could not extract links: {err:#}\"" +#: src/idiomatic/welcome.md +msgid "Newtype pattern and encapsulation: parse, don't validate" msgstr "" -#: src/exercises/concurrency/link-checker.md -msgid "Run the code in `src/main.rs` with" +#: src/idiomatic/welcome.md +msgid "" +"Extension traits: avoid the newtype pattern when you want to provide " +"additional behaviour" msgstr "" -#: src/exercises/concurrency/link-checker.md +#: src/idiomatic/welcome.md 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." +"RAII, scope guards and drop bombs: using `Drop` to clean up resources, " +"trigger actions or enforce invariants" msgstr "" -#: src/exercises/concurrency/link-checker.md +#: src/idiomatic/welcome.md msgid "" -"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." +"\"Token\" types: force users to prove they've performed a specific action" msgstr "" -#: src/exercises/concurrency/solutions-morning.md -msgid "Concurrency Morning Exercise" +#: src/idiomatic/welcome.md +msgid "" +"The typestate pattern: enforce correct state transitions at compile-time" msgstr "" -#: src/exercises/concurrency/solutions-morning.md -msgid "([back to exercise](dining-philosophers.md))" +#: src/idiomatic/welcome.md +msgid "" +"Using the borrow checker to enforce invariants that have nothing to do with " +"memory ownership" msgstr "" -#: src/exercises/concurrency/solutions-morning.md -msgid "\"{} is trying to eat\"" +#: src/idiomatic/welcome.md +msgid "OwnedFd/BorrowedFd in the standard library" msgstr "" -#: src/exercises/concurrency/solutions-morning.md -msgid "" -"// To avoid a deadlock, we have to break the symmetry\n" -" // somewhere. This will swap the forks without deinitializing\n" -" // either of them.\n" +#: src/idiomatic/welcome.md +msgid "[Branded types](https://plv.mpi-sws.org/rustbelt/ghostcell/paper.pdf)" msgstr "" -#: src/exercises/concurrency/solutions-morning.md -msgid "\"{thought}\"" +#: src/idiomatic/welcome.md +msgid "Don't fight the borrow checker" msgstr "" -#: src/exercises/concurrency/solutions-morning.md -msgid "Link Checker" -msgstr "Linktjekker" - -#: src/exercises/concurrency/solutions-morning.md -msgid "([back to exercise](link-checker.md))" -msgstr "([tilbage til øvelsen](link-checker.md))" - -#: src/exercises/concurrency/solutions-morning.md +#: src/idiomatic/welcome.md msgid "" -"/// Determine whether links within the given page should be extracted.\n" +"\"Owned\" types and \"view\" types: `&str` and `String`, `Path` and " +"`PathBuf`, etc." msgstr "" -#: src/exercises/concurrency/solutions-morning.md +#: src/idiomatic/welcome.md msgid "" -"/// Mark the given page as visited, returning false if it had already\n" -" /// been visited.\n" +"Don't hide ownership requirements: avoid hidden `.clone()`, learn to love " +"`Cow`" msgstr "" -#: src/exercises/concurrency/solutions-morning.md -msgid "// The sender got dropped. No more commands coming in.\n" +#: src/idiomatic/welcome.md +msgid "Split types along ownership boundaries" msgstr "" -#: src/exercises/concurrency/solutions-morning.md -msgid "\"Got crawling error: {:#}\"" +#: src/idiomatic/welcome.md +msgid "Structure your ownership hierarchy like a tree" msgstr "" -#: src/exercises/concurrency/solutions-morning.md -msgid "\"Bad URLs: {:#?}\"" +#: src/idiomatic/welcome.md +msgid "" +"Strategies to manage circular dependencies: reference counting, using " +"indexes instead of references" msgstr "" -#: src/async.md -msgid "Async Rust" +#: src/idiomatic/welcome.md +msgid "Interior mutability (Cell, RefCell)" msgstr "" -#: src/async.md -msgid "" -"\"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." +#: src/idiomatic/welcome.md +msgid "Working with lifetime parameters on user-defined data types" msgstr "" -#: src/async.md -msgid "" -"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." +#: src/idiomatic/welcome.md +msgid "Polymorphism in Rust" msgstr "" -#: src/async.md -msgid "" -"Futures are polled by an async runtime, and several different runtimes are " -"available." +#: src/idiomatic/welcome.md +msgid "A quick refresher on traits and generic functions" msgstr "" -#: src/async.md -msgid "" -"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." +#: src/idiomatic/welcome.md +msgid "Rust has no inheritance: what are the implications?" msgstr "" -#: src/async.md -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." +#: src/idiomatic/welcome.md +msgid "Using enums for polymorphism" msgstr "" -#: src/async/async-await.md -msgid "" -"At a high level, async Rust code looks very much like \"normal\" sequential " -"code:" +#: src/idiomatic/welcome.md +msgid "Using traits for polymorphism" msgstr "" -#: src/async/async-await.md -msgid "\"Count is: {i}!\"" +#: src/idiomatic/welcome.md +msgid "Using composition" msgstr "" -#: src/async/async-await.md -msgid "" -"Note that this is a simplified example to show the syntax. There is no long " -"running operation or any real concurrency in it!" +#: src/idiomatic/welcome.md +msgid "How do I pick the most appropriate pattern?" msgstr "" -#: src/async/async-await.md -msgid "What is the return type of an async call?" +#: src/idiomatic/welcome.md +msgid "Working with generics" msgstr "" -#: src/async/async-await.md -msgid "Use `let future: () = async_main(10);` in `main` to see the type." +#: src/idiomatic/welcome.md +msgid "Generic type parameter in a function or trait object as an argument?" msgstr "" -#: src/async/async-await.md -msgid "" -"The \"async\" keyword is syntactic sugar. The compiler replaces the return " -"type with a future." +#: src/idiomatic/welcome.md +msgid "Trait bounds don't have to refer to the generic parameter" msgstr "" -#: src/async/async-await.md +#: src/idiomatic/welcome.md msgid "" -"You cannot make `main` async, without additional instructions to the " -"compiler on how to use the returned future." +"Type parameters in traits: should it be a generic parameter or an associated " +"type?" msgstr "" -#: src/async/async-await.md +#: src/idiomatic/welcome.md msgid "" -"You need an executor to run async code. `block_on` blocks the current thread " -"until the provided future has run to completion." +"Macros: a valuable tool to DRY up code when traits are not enough (or too " +"complex)" msgstr "" -#: src/async/async-await.md -msgid "" -"`.await` asynchronously waits for the completion of another operation. " -"Unlike `block_on`, `.await` doesn't block the current thread." +#: src/idiomatic/welcome.md +msgid "What is the purpose of errors? Recovery vs. reporting." msgstr "" -#: src/async/async-await.md -msgid "" -"`.await` can only be used inside an `async` function (or block; these are " -"introduced later)." +#: src/idiomatic/welcome.md +msgid "Result vs. Option" msgstr "" -#: src/async/futures.md -msgid "" -"[`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)." +#: src/idiomatic/welcome.md +msgid "Designing good errors:" msgstr "" -#: src/async/futures.md -msgid "" -"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." +#: src/idiomatic/welcome.md +msgid "Determine the error scope." msgstr "" -#: src/async/futures.md +#: src/idiomatic/welcome.md msgid "" -"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." +"Capture additional context as the error flows upwards, crossing scope " +"boundaries." msgstr "" -#: src/async/futures.md -msgid "" -"The `Future` and `Poll` types are implemented exactly as shown; click the " -"links to show the implementations in the docs." +#: src/idiomatic/welcome.md +msgid "Leverage the `Error` trait to keep track of the full error chain." +msgstr "" + +#: src/idiomatic/welcome.md +msgid "Leverage `thiserror` to reduce boilerplate when defining error types." msgstr "" -#: src/async/futures.md +#: src/idiomatic/welcome.md msgid "" -"We will not get to `Pin` and `Context`, as we will focus on writing async " -"code, rather than building new async primitives. Briefly:" +"Distinguish fatal errors from recoverable errors using `Result, FatalError>`." msgstr "" -#: src/async/futures.md +#: src/idiomatic/leveraging-the-type-system.md msgid "" -"`Context` allows a Future to schedule itself to be polled again when an " -"event occurs." +"Rust's type system is _expressive_: you can use types and traits to build " +"abstractions that make your code harder to misuse." msgstr "" -#: src/async/futures.md +#: src/idiomatic/leveraging-the-type-system.md 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`." +"In some cases, you can go as far as enforcing correctness at _compile-time_, " +"with no runtime overhead." msgstr "" -#: src/async/runtimes.md +#: src/idiomatic/leveraging-the-type-system.md msgid "" -"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:" +"Types and traits can model concepts and constraints from your business " +"domain. With careful design, you can improve the clarity and maintainability " +"of the entire codebase." msgstr "" -#: src/async/runtimes.md -msgid "" -"[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." +#: src/idiomatic/leveraging-the-type-system.md +msgid "Additional items speaker may mention:" msgstr "" -#: src/async/runtimes.md +#: src/idiomatic/leveraging-the-type-system.md msgid "" -"[async-std](https://async.rs/): aims to be a \"std for async\", and includes " -"a basic runtime in `async::task`." +"Rust's type system borrows a lot of ideas from functional programming " +"languages." msgstr "" -#: src/async/runtimes.md -msgid "[smol](https://docs.rs/smol/latest/smol/): simple and lightweight" +#: src/idiomatic/leveraging-the-type-system.md +msgid "" +"For example, Rust's enums are known as \"algebraic data types\" in languages " +"like Haskell and OCaml. You can take inspiration from learning material " +"geared towards functional languages when looking for guidance on how to " +"design with types. [\"Domain Modeling Made Functional\"](https://" +"pragprog.com/titles/swdddf/domain-modeling-made-functional/) is a great " +"resource on the topic, with examples written in F#." msgstr "" -#: src/async/runtimes.md +#: src/idiomatic/leveraging-the-type-system.md msgid "" -"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." +"Despite Rust's functional roots, not all functional design patterns can be " +"easily translated to Rust." msgstr "" -#: src/async/runtimes.md +#: src/idiomatic/leveraging-the-type-system.md msgid "" -"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." +"For example, you must have a solid grasp on a broad selection of advanced " +"topics to design APIs that leverage higher-order functions and higher-kinded " +"types in Rust." msgstr "" -#: src/async/runtimes.md +#: src/idiomatic/leveraging-the-type-system.md 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." +"Evaluate, on a case-by-case basis, whether a more imperative approach may be " +"easier to implement. Consider using in-place mutation, relying on Rust's " +"borrow-checker and type system to control what can be mutated, and where." msgstr "" -#: src/async/runtimes/tokio.md -msgid "Tokio provides:" +#: src/idiomatic/leveraging-the-type-system.md +msgid "" +"The same caution should be applied to object-oriented design patterns. Rust " +"doesn't support inheritance, and object decomposition should take into " +"account the constraints introduced by the borrow checker." msgstr "" -#: src/async/runtimes/tokio.md -msgid "A multi-threaded runtime for executing asynchronous code." +#: src/idiomatic/leveraging-the-type-system.md +msgid "" +"Mention that type-level programming can be often used to create \"zero-cost " +"abstractions\", although the label can be misleading: the impact on compile " +"times and code complexity may be significant." msgstr "" -#: src/async/runtimes/tokio.md -msgid "An asynchronous version of the standard library." +#: src/idiomatic/leveraging-the-type-system.md +#: src/unsafe-deep-dive/foundations.md +msgid "This segment should take about 25 minutes. It contains:" msgstr "" -#: src/async/runtimes/tokio.md -msgid "A large ecosystem of libraries." +#: src/idiomatic/leveraging-the-type-system/newtype-pattern.md +msgid "A _newtype_ is a wrapper around an existing type, often a primitive:" msgstr "" -#: src/async/runtimes/tokio.md -msgid "\"Count in task: {i}!\"" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern.md +msgid "/// A unique user identifier, implemented as a newtype around `u64`.\n" msgstr "" -#: src/async/runtimes/tokio.md -msgid "\"Main task: {i}\"" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern.md +msgid "" +"Unlike type aliases, newtypes aren't interchangeable with the wrapped type:" msgstr "" -#: src/async/runtimes/tokio.md -msgid "With the `tokio::main` macro we can now make `main` async." +#: src/idiomatic/leveraging-the-type-system/newtype-pattern.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md +msgid "// 🛠️❌\n" msgstr "" -#: src/async/runtimes/tokio.md -msgid "The `spawn` function creates a new, concurrent \"task\"." +#: src/idiomatic/leveraging-the-type-system/newtype-pattern.md +msgid "" +"The Rust compiler won't let you use methods or operators defined on the " +"underlying type either:" msgstr "" -#: src/async/runtimes/tokio.md -msgid "Note: `spawn` takes a `Future`, you don't call `.await` on `count_to`." +#: src/idiomatic/leveraging-the-type-system/newtype-pattern.md +msgid "" +"Students should have encountered the newtype pattern in the \"Fundamentals\" " +"course, when they learned about [tuple structs](../../user-defined-types/" +"tuple-structs.md)." msgstr "" -#: src/async/runtimes/tokio.md -msgid "**Further exploration:**" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern.md +msgid "Run the example to show students the error message from the compiler." msgstr "" -#: src/async/runtimes/tokio.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern.md msgid "" -"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." +"Modify the example to use a typealias instead of a newtype, such as `type " +"MessageId = u64`. The modified example should compile, thus highlighting the " +"differences between the two approaches." msgstr "" -#: src/async/runtimes/tokio.md -msgid "Try `count_to(10).await` instead of spawning." +#: src/idiomatic/leveraging-the-type-system/newtype-pattern.md +msgid "" +"Stress that newtypes, out of the box, have no behaviour attached to them. " +"You need to be intentional about which methods and operators you are willing " +"to forward from the underlying type. In our `UserId` example, it is " +"reasonable to allow comparisons between `UserId`s, but it wouldn't make " +"sense to allow arithmetic operations like addition or subtraction." msgstr "" -#: src/async/runtimes/tokio.md -msgid "Try awaiting the task returned from `tokio::spawn`." +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md +msgid "" +"When a function takes multiple arguments of the same type, call sites are " +"unclear:" msgstr "" -#: src/async/tasks.md -msgid "Rust has a task system, which is a form of lightweight threading." +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md +msgid "// [...]\n" msgstr "" -#: src/async/tasks.md -msgid "" -"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." +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md +msgid "\"password\"" msgstr "" -#: src/async/tasks.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md #, fuzzy -msgid "\"127.0.0.1:0\"" -msgstr "\"127.0.0.1:2000\"" +msgid "\"username\"" +msgstr "\"nyt areal: {}\"" -#: src/async/tasks.md -msgid "\"listening on port {}\"" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md +msgid "" +"// In another part of the codebase, we swap arguments by mistake.\n" +"// Bug (best case), security vulnerability (worst case)\n" msgstr "" -#: src/async/tasks.md -msgid "\"connection from {addr:?}\"" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md +msgid "The newtype pattern can prevent this class of errors at compile time:" msgstr "" -#: src/async/tasks.md -msgid "b\"Who are you?\\n\"" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md +msgid "" +"Run both examples to show students the successful compilation for the " +"original example, and the compiler error returned by the modified example." msgstr "" -#: src/async/tasks.md -#, fuzzy -msgid "\"socket error\"" -msgstr "\"IO-fejl: {e}\"" - -#: src/async/tasks.md -msgid "\"Thanks for dialing in, {name}!\\n\"" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md +msgid "" +"Stress the _semantic_ angle. The newtype pattern should be leveraged to use " +"distinct types for distinct concepts, thus ruling out this class of errors " +"entirely." msgstr "" -#: src/async/tasks.md src/async/control-flow/join.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md msgid "" -"Copy this example into your prepared `src/main.rs` and run it from there." +"Nonetheless, note that there are legitimate scenarios where a function may " +"take multiple arguments of the same type. In those scenarios, if correctness " +"is of paramount importance, consider using a struct with named fields as " +"input:" msgstr "" -#: src/async/tasks.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md msgid "" -"Try connecting to it with a TCP connection tool like [nc](https://www.unix." -"com/man-page/linux/1/nc/) or [telnet](https://www.unix.com/man-page/linux/1/" -"telnet/)." +"// No need to check the definition of the `login` function to spot the " +"issue.\n" msgstr "" -#: src/async/tasks.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/semantic-confusion.md msgid "" -"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?" +"Users are forced, at the callsite, to assign values to each field, thus " +"increasing the likelihood of spotting bugs." +msgstr "" + +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/parse-don-t-validate.md +msgid "The newtype pattern can be leveraged to enforce _invariants_." +msgstr "" + +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/parse-don-t-validate.md +msgid "// Other validation checks...\n" msgstr "" -#: src/async/tasks.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/parse-don-t-validate.md 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`." +"The newtype pattern, combined with Rust's module and visibility system, can " +"be used to _guarantee_ that instances of a given type satisfy a set of " +"invariants." msgstr "" -#: src/async/tasks.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/parse-don-t-validate.md msgid "" -"Refactor the async block into a function, and improve the error handling " -"using `?`." +"In the example above, the raw `String` stored inside the `Username` struct " +"can't be accessed directly from other modules or crates, since it's not " +"marked as `pub` or `pub(in ...)`. Consumers of the `Username` type are " +"forced to use the `new` method to create instances. In turn, `new` performs " +"validation, thus ensuring that all instances of `Username` satisfy those " +"checks." msgstr "" -#: src/async/channels.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/parse-don-t-validate.md msgid "" -"Several crates have support for asynchronous channels. For instance `tokio`:" +"The `as_str` method allows consumers to access the raw string representation " +"(e.g., to store it in a database). However, consumers can't modify the " +"underlying value since `&str`, the returned type, restricts them to read-" +"only access." msgstr "" -#: src/async/channels.md -msgid "\"Received {count} pings so far.\"" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/parse-don-t-validate.md +msgid "Type-level invariants have second-order benefits." msgstr "" -#: src/async/channels.md -msgid "\"ping_handler complete\"" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/parse-don-t-validate.md +msgid "" +"The input is validated once, at the boundary, and the rest of the program " +"can rely on the invariants being upheld. We can avoid redundant validation " +"and \"defensive programming\" checks throughout the program, reducing noise " +"and improving performance." msgstr "" -#: src/async/channels.md -msgid "\"Failed to send ping.\"" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/is-it-encapsulated.md +msgid "Is It Truly Encapsulated?" msgstr "" -#: src/async/channels.md -msgid "\"Sent {} pings so far.\"" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/is-it-encapsulated.md +msgid "" +"You must evaluate _the entire API surface_ exposed by a newtype to determine " +"if invariants are indeed bullet-proof. It is crucial to consider all " +"possible interactions, including trait implementations, that may allow users " +"to bypass validation checks." msgstr "" -#: src/async/channels.md -msgid "\"Something went wrong in ping handler task.\"" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/is-it-encapsulated.md +msgid "// Validation checks...\n" msgstr "" -#: src/async/channels.md -msgid "Change the channel size to `3` and see how it affects the execution." +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/is-it-encapsulated.md +msgid "// ‼️\n" msgstr "" -#: src/async/channels.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/is-it-encapsulated.md msgid "" -"Overall, the interface is similar to the `sync` channels as seen in the " -"[morning class](concurrency/channels.md)." +"`DerefMut` allows users to get a mutable reference to the wrapped value." msgstr "" -#: src/async/channels.md -msgid "Try removing the `std::mem::drop` call. What happens? Why?" +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/is-it-encapsulated.md +msgid "" +"The mutable reference can be used to modify the underlying data in ways that " +"may violate the invariants enforced by `Username::new`!" msgstr "" -#: src/async/channels.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/is-it-encapsulated.md msgid "" -"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." +"When auditing the API surface of a newtype, you can narrow down the review " +"scope to methods and traits that provide mutable access to the underlying " +"data." msgstr "" -#: src/async/channels.md +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/is-it-encapsulated.md +msgid "Remind students of privacy boundaries." +msgstr "" + +#: src/idiomatic/leveraging-the-type-system/newtype-pattern/is-it-encapsulated.md 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." +"In particular, functions and methods defined in the same module of the " +"newtype can access its underlying data directly. If possible, move the " +"newtype definition to its own separate module to reduce the scope of the " +"audit." msgstr "" -#: src/async/control-flow.md -msgid "Futures Control Flow" +#: src/unsafe-deep-dive/welcome.md +#, fuzzy +msgid "Welcome to Unsafe Rust" +msgstr "Velkommen til Rust på det rå jern" + +#: src/unsafe-deep-dive/welcome.md +msgid "IMPORTANT: THIS MODULE IS IN AN EARLY STAGE OF DEVELOPMENT" msgstr "" -#: src/async/control-flow.md +#: src/unsafe-deep-dive/welcome.md msgid "" -"Futures can be combined together to produce concurrent compute flow graphs. " -"We have already seen tasks, that function as independent threads of " -"execution." +"Please do not consider this module of Comprehensive Rust to be complete. " +"With that in mind, your feedback, comments, and especially your concerns, " +"are very welcome." msgstr "" -#: src/async/control-flow.md -msgid "[Join](control-flow/join.md)" -msgstr "[Join](control-flow/join.md)" +#: src/unsafe-deep-dive/welcome.md +msgid "" +"To comment on this module's development, please use the [GitHub issue " +"tracker](https://github.com/google/comprehensive-rust/issues)." +msgstr "" -#: src/async/control-flow.md -msgid "[Select](control-flow/select.md)" -msgstr "[Select](control-flow/select.md)" +#: src/unsafe-deep-dive/welcome.md +msgid "" +"The `unsafe` keyword is easy to type, but hard to master. When used " +"appropriately, it forms a useful and indeed essential part of the Rust " +"programming language." +msgstr "" -#: src/async/control-flow/join.md +#: src/unsafe-deep-dive/welcome.md msgid "" -"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." +"By the end of this deep dive, you'll know how to work with `unsafe` code, " +"review others' changes that include the `unsafe` keyword, and produce your " +"own." msgstr "" -#: src/async/control-flow/join.md -msgid "\"https://google.com\"" -msgstr "\"https://google.com\"" +#: src/unsafe-deep-dive/welcome.md +#, fuzzy +msgid "What you'll learn:" +msgstr "Hvad du ser:" -#: src/async/control-flow/join.md -msgid "\"https://httpbin.org/ip\"" -msgstr "\"https://httpbin.org/ip\"" +#: src/unsafe-deep-dive/welcome.md +msgid "What the terms undefined behavior, soundness, and safety mean" +msgstr "" -#: src/async/control-flow/join.md -msgid "\"https://play.rust-lang.org/\"" -msgstr "\"https://play.rust-lang.org/\"" +#: src/unsafe-deep-dive/welcome.md +msgid "Why the `unsafe` keyword exists in the Rust language" +msgstr "" -#: src/async/control-flow/join.md -msgid "\"BAD_URL\"" -msgstr "\"BAD_URL\"" +#: src/unsafe-deep-dive/welcome.md +msgid "How to write your own code using `unsafe` safely" +msgstr "" -#: src/async/control-flow/join.md -msgid "" -"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`." +#: src/unsafe-deep-dive/welcome.md +msgid "How to review `unsafe` code" msgstr "" -#: src/async/control-flow/join.md -msgid "" -"The risk of `join` is that one of the futures may never resolve, this would " -"cause your program to stall." +#: src/unsafe-deep-dive/welcome.md +msgid "Links to other sections of the course" msgstr "" -#: src/async/control-flow/join.md -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!`." +#: src/unsafe-deep-dive/welcome.md +msgid "The `unsafe` keyword has treatment in:" msgstr "" -#: src/async/control-flow/select.md +#: src/unsafe-deep-dive/welcome.md msgid "" -"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)`." +"_Rust Fundamentals_, the main module of Comprehensive Rust, includes a " +"session on [Unsafe Rust](../unsafe-rust.html) in its last day." msgstr "" -#: src/async/control-flow/select.md +#: src/unsafe-deep-dive/welcome.md msgid "" -"Similar to a match statement, the body of `select!` has a number of arms, " -"each of the form `pattern = future => statement`. When a `future` is ready, " -"its return value is destructured by the `pattern`. The `statement` is then " -"run with the resulting variables. The `statement` result becomes the result " -"of the `select!` macro." +"_Rust in Chromium_ discusses how to [interoperate with C++](../chromium/" +"interoperability-with-cpp.md). Consult that material if you are looking into " +"FFI." msgstr "" -#: src/async/control-flow/select.md -msgid "\"Felix\"" -msgstr "\"Felix\"" - -#: src/async/control-flow/select.md -msgid "\"Failed to send cat.\"" -msgstr "\"Kunne ikke sende katten.\"" +#: src/unsafe-deep-dive/welcome.md +msgid "" +"_Bare Metal Rust_ uses unsafe heavily to interact with the underlying host, " +"among other things." +msgstr "" -#: src/async/control-flow/select.md -msgid "\"Rex\"" -msgstr "\"Rex\"" +#: src/unsafe-deep-dive/setup.md +msgid "Setting Up" +msgstr "" -#: src/async/control-flow/select.md -msgid "\"Failed to send dog.\"" -msgstr "\"Kunne ikke sende hunden.\"" +#: src/unsafe-deep-dive/setup.md +#, fuzzy +msgid "Local Rust installation" +msgstr "Installation" -#: src/async/control-flow/select.md -msgid "\"Failed to receive winner\"" -msgstr "\"Kunne ikke modtage vinderen\"" +#: src/unsafe-deep-dive/setup.md +msgid "" +"You should have a Rust compiler installed that supports the 2024 edition of " +"the language, which is any version of rustc higher than 1.84." +msgstr "" -#: src/async/control-flow/select.md -msgid "\"Winner is {winner:?}\"" -msgstr "\"Vinderen er {winner:?}\"" +#: src/unsafe-deep-dive/setup.md +msgid "(Optional) Create a local instance of the course" +msgstr "" -#: src/async/control-flow/select.md +#: src/unsafe-deep-dive/setup.md msgid "" -"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." +"```console\n" +"$ git clone --depth=1 https://github.com/google/comprehensive-rust.git\n" +"Cloning into 'comprehensive-rust'...\n" +"...\n" +"$ cd comprehensive-rust\n" +"$ cargo install-tools\n" +"...\n" +"$ cargo serve # then open http://127.0.0.1:3000/ in a browser\n" +"```" msgstr "" -#: src/async/control-flow/select.md +#: src/unsafe-deep-dive/setup.md msgid "" -"You can use `oneshot` channels in this example as the channels are supposed " -"to receive only one `send`." +"Ask everyone to confirm that everyone is able to execute `rustc` with a " +"version older that 1.87." msgstr "" -#: src/async/control-flow/select.md +#: src/unsafe-deep-dive/setup.md msgid "" -"Try adding a deadline to the race, demonstrating selecting different sorts " -"of futures." +"For those people who do not, tell them that we'll resolve that in the break." +msgstr "" + +#: src/unsafe-deep-dive/motivations.md +msgid "We know that writing code without the guarantees that Rust provides ..." msgstr "" -#: src/async/control-flow/select.md +#: src/unsafe-deep-dive/motivations.md msgid "" -"Note that `select!` drops unmatched branches, which cancels their futures. " -"It is easiest to use when every execution of `select!` creates new futures." +"“Use-after-free (UAF), integer overflows, and out of bounds (OOB) reads/" +"writes comprise 90% of vulnerabilities with OOB being the most common.”" msgstr "" -#: src/async/control-flow/select.md +#: src/unsafe-deep-dive/motivations.md 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." +"\\--— **Jeff Vander Stoep and Chong Zang**, Google. \"[Queue the Hardening " +"Enhancements](https://security.googleblog.com/2019/05/queue-hardening-" +"enhancements.html)\"" +msgstr "" + +#: src/unsafe-deep-dive/motivations.md +msgid "... so why is `unsafe` part of the language?" msgstr "" -#: src/async/pitfalls.md -msgid "Pitfalls of async/await" -msgstr "Faldgruber ved async/await" +#: src/unsafe-deep-dive/motivations.md +msgid "1 minute" +msgstr "" -#: src/async/pitfalls.md +#: src/unsafe-deep-dive/motivations.md 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:" +"The `unsafe` keyword exists because there is no compiler technology " +"available today that makes it obsolete. Compilers cannot verify everything." msgstr "" -#: src/async/pitfalls.md -msgid "[Blocking the Executor](pitfalls/blocking-executor.md)" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "" +"TODO: Refactor this content into multiple slides as this slide is intended " +"as an introduction to the motivations only, rather than to be an elaborate " +"discussion of the whole problem." msgstr "" -#: src/async/pitfalls.md -msgid "[Pin](pitfalls/pin.md)" -msgstr "[Pin](pitfalls/pin.md)" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "Language interoperability allows you to:" +msgstr "" -#: src/async/pitfalls.md -msgid "[Async Traits](pitfalls/async-traits.md)" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "Call functions written in other languages from Rust" msgstr "" -#: src/async/pitfalls.md -msgid "[Cancellation](pitfalls/cancellation.md)" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "Write functions in Rust that are callable from other languages" msgstr "" -#: src/async/pitfalls/blocking-executor.md -msgid "Blocking the executor" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "However, this requires unsafe." msgstr "" -#: src/async/pitfalls/blocking-executor.md +#: src/unsafe-deep-dive/motivations/interop.md +#, fuzzy +msgid "\"{a:?}\"" +msgstr "\"{:?}\"" + +#: src/unsafe-deep-dive/motivations/interop.md msgid "" -"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." +"The Rust compiler can't enforce any safety guarantees for programs that it " +"hasn't compiled, so it delegates that responsibility to you through the " +"unsafe keyword." msgstr "" -#: src/async/pitfalls/blocking-executor.md -msgid "\"future {id} slept for {duration_ms}ms, finished after {}ms\"" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "" +"The code example we're seeing shows how to call the random function provided " +"by libc within Rust. libc is available to scripts in the Rust Playground." msgstr "" -#: src/async/pitfalls/blocking-executor.md -msgid "\"current_thread\"" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "This uses Rust's _foreign function interface_." msgstr "" -#: src/async/pitfalls/blocking-executor.md +#: src/unsafe-deep-dive/motivations/interop.md msgid "" -"Run the code and see that the sleeps happen consecutively rather than " -"concurrently." +"This isn't the only style of interoperability, however it is the method " +"that's needed if you want to work between Rust and some other language in a " +"zero cost way. Another important strategy is message passing." msgstr "" -#: src/async/pitfalls/blocking-executor.md +#: src/unsafe-deep-dive/motivations/interop.md 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." +"Message passing avoids unsafe, but serialization, allocation, data transfer " +"and parsing all take energy and time." msgstr "" -#: src/async/pitfalls/blocking-executor.md -msgid "" -"Switch the `std::thread::sleep` to `tokio::time::sleep` and await its result." +#: src/unsafe-deep-dive/motivations/interop.md +msgid "Answers to questions" msgstr "" -#: src/async/pitfalls/blocking-executor.md +#: src/unsafe-deep-dive/motivations/interop.md 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." +"_Where does \"random\" come from?_ \n" +"libc is dynamically linked to Rust programs by default, allowing our code to " +"rely on its symbols, including `random`, being available to our program." msgstr "" -#: src/async/pitfalls/blocking-executor.md +#: src/unsafe-deep-dive/motivations/interop.md 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." +"_What is the \"safe\" keyword?_ \n" +"It allows callers to call the function without needing to wrap that call in " +"`unsafe`. The [`safe` function qualifier](https://doc.rust-lang.org/stable/" +"edition-guide/rust-2024/unsafe-extern.html) was introduced in the 2024 " +"edition of Rust and can only be used within `extern` blocks. It was " +"introduced because `unsafe` became a mandatory qualifier for `extern` blocks " +"in that edition." msgstr "" -#: src/async/pitfalls/blocking-executor.md +#: src/unsafe-deep-dive/motivations/interop.md 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." +"_What is the [`std::ffi::c_long`](https://doc.rust-lang.org/std/ffi/" +"type.c_long.html) type?_ \n" +"According to the C standard, an integer that's at least 32 bits wide. On " +"today's systems, It's an `i32` on Windows and an `i64` on Linux." +msgstr "" + +#: src/unsafe-deep-dive/motivations/interop.md +msgid "Consideration: type safety" msgstr "" -#: src/async/pitfalls/pin.md +#: src/unsafe-deep-dive/motivations/interop.md msgid "" -"Async blocks and functions return types implementing the `Future` trait. The " -"type returned is the result of a compiler transformation which turns local " -"variables into data stored inside the future." +"Modify the code example to remove the need for type casting later. Discuss " +"the potential UB - long's width is defined by the target." +msgstr "" + +#: src/unsafe-deep-dive/motivations/interop.md +msgid "Changes from the original:" msgstr "" -#: src/async/pitfalls/pin.md +#: src/unsafe-deep-dive/motivations/interop.md msgid "" -"Some of those variables can hold pointers to other local variables. Because " -"of that, the future should never be moved to a different memory location, as " -"it would invalidate those pointers." +"It's also possible to completely ignore the intended type and create " +"undefined behavior in multiple ways. The code below produces output most of " +"the time, but generally results in a stack overflow. It may also produce " +"illegal `char` values. Although `char` is represented in 4 bytes (32 bits), " +"[not all bit patterns are permitted as a `char`](https://doc.rust-lang.org/" +"std/primitive.char.html#validity-and-layout)." msgstr "" -#: src/async/pitfalls/pin.md +#: src/unsafe-deep-dive/motivations/interop.md msgid "" -"To prevent moving the future type in memory, it can only be polled through a " -"pinned pointer. `Pin` is a wrapper around a reference that disallows all " -"operations that would move the instance it points to into a different memory " -"location." +"Stress that the Rust compiler will trust that the wrapper is telling the " +"truth." msgstr "" -#: src/async/pitfalls/pin.md +#: src/unsafe-deep-dive/motivations/interop.md msgid "" -"// A work item. In this case, just sleep for the given time and respond\n" -"// with a message on the `respond_on` channel.\n" +"Attempting to print a `[char; 2]` from randomly generated input will often " +"produce strange output, including:" msgstr "" -#: src/async/pitfalls/pin.md -msgid "// A worker which listens for work on a queue and performs it.\n" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "" +"Mention that type safety is generally not a large concern in practice. Tools " +"that produce wrappers automatically, i.e. bindgen, are excellent at reading " +"header files and producing values of the correct type." msgstr "" -#: src/async/pitfalls/pin.md -msgid "// Pretend to work.\n" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "Consideration: Ownership and lifetime management" msgstr "" -#: src/async/pitfalls/pin.md -msgid "\"failed to send response\"" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "" +"While libc's `random` function doesn't use pointers, many do. This creates " +"many more possibilities for unsoundness." msgstr "" -#: src/async/pitfalls/pin.md -msgid "// TODO: report number of iterations every 100ms\n" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "both sides might attempt to free the memory (double free)" msgstr "" -#: src/async/pitfalls/pin.md -msgid "// A requester which requests work and waits for it to complete.\n" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "both sides can attempt to write to the data" msgstr "" -#: src/async/pitfalls/pin.md -msgid "\"failed to send on work queue\"" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "" +"For example, some C libraries expose functions that write to static buffers " +"that are re-used between calls." msgstr "" -#: src/async/pitfalls/pin.md -msgid "\"failed waiting for response\"" +#: src/unsafe-deep-dive/motivations/interop.md +msgid "" +"/// Create a formatted time based on time `t`, including trailing newline.\n" +" /// Read `man 3 ctime` details.\n" msgstr "" -#: src/async/pitfalls/pin.md -msgid "\"work result for iteration {i}: {resp}\"" +#: src/unsafe-deep-dive/motivations/interop.md +#, fuzzy +msgid "\"now (1): {}\"" +msgstr "\"pengepremie: {}\"" + +#: src/unsafe-deep-dive/motivations/interop.md +#, fuzzy +msgid "\"future: {}\"" +msgstr "\"five: {}\"" + +#: src/unsafe-deep-dive/motivations/interop.md +#, fuzzy +msgid "\"now (2): {}\"" +msgstr "\"int: {}\"" + +#: src/unsafe-deep-dive/motivations/interop.md +msgid "_Aside:_ Lifetimes in the `format_timestamp()` function" msgstr "" -#: src/async/pitfalls/pin.md +#: src/unsafe-deep-dive/motivations/interop.md msgid "" -"You may recognize this as an example of the actor pattern. Actors typically " -"call `select!` in a loop." +"Neither `'a`, nor `'static`, correctly describe the lifetime of the string " +"that's returned. Rust treats it as an immutable reference, but subsequent " +"calls to `ctime` will overwrite the static buffer that the string occupies." msgstr "" -#: src/async/pitfalls/pin.md -msgid "" -"This serves as a summation of a few of the previous lessons, so take your " -"time with it." +#: src/unsafe-deep-dive/motivations/interop.md +msgid "Consideration: Representation mismatch" msgstr "" -#: src/async/pitfalls/pin.md +#: src/unsafe-deep-dive/motivations/interop.md msgid "" -"Naively add a `_ = sleep(Duration::from_millis(100)) => { println!(..) }` to " -"the `select!`. This will never execute. Why?" +"Different programming languages have made different design decisions and " +"this can create impedance mismatches between different domains." msgstr "" -#: src/async/pitfalls/pin.md +#: src/unsafe-deep-dive/motivations/interop.md msgid "" -"Instead, add a `timeout_fut` containing that future outside of the `loop`:" +"Consider string handling. C++ defines `std::string`, which has an " +"incompatible memory layout with Rust's `String` type. `String` also requires " +"text to be encoded as UTF-8, whereas `std::string` does not. In C, text is " +"represented by a null-terminated sequence of bytes (`char*`)." msgstr "" -#: src/async/pitfalls/pin.md -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`:" +#: src/unsafe-deep-dive/motivations/interop.md +#, fuzzy +msgid "b\"Hello, C\\0\"" +msgstr "\"Hallo \"" + +#: src/unsafe-deep-dive/motivations/interop.md +#, fuzzy +msgid "b\"Hello, Rust\"" +msgstr "\"Hallo \"" + +#: src/unsafe-deep-dive/motivations/interop.md +msgid "\"{c}\"" msgstr "" -#: src/async/pitfalls/pin.md -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." +#: src/unsafe-deep-dive/motivations/interop.md +#, fuzzy +msgid "\"{rust}\"" +msgstr "\"rust\"" + +#: src/unsafe-deep-dive/motivations/data-structures.md +msgid "Some families of data structures are impossible to create in safe Rust." msgstr "" -#: src/async/pitfalls/pin.md -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." +#: src/unsafe-deep-dive/motivations/data-structures.md +msgid "graphs" msgstr "" -#: src/async/pitfalls/pin.md -msgid "" -"Another alternative is to not use `pin` at all but spawn another task that " -"will send to a `oneshot` channel every 100ms." +#: src/unsafe-deep-dive/motivations/data-structures.md +msgid "bit twiddling" +msgstr "" + +#: src/unsafe-deep-dive/motivations/data-structures.md +msgid "self-referential types" msgstr "" -#: src/async/pitfalls/pin.md +#: src/unsafe-deep-dive/motivations/data-structures.md +#, fuzzy +msgid "intrusive data structures" +msgstr "Livstider i datastrukturer" + +#: src/unsafe-deep-dive/motivations/data-structures.md msgid "" -"Data that contains pointers to itself is called self-referential. Normally, " -"the Rust borrow checker would prevent self-referential data from being " -"moved, as the references cannot outlive the data they point to. However, the " -"code transformation for async blocks and functions is not verified by the " -"borrow checker." +"Graphs: General-purpose graphs cannot be created as they may need to " +"represent cycles. Cycles are impossible for the type system to reason about." msgstr "" -#: src/async/pitfalls/pin.md +#: src/unsafe-deep-dive/motivations/data-structures.md msgid "" -"`Pin` is a wrapper around a reference. An object cannot be moved from its " -"place using a pinned pointer. However, it can still be moved through an " -"unpinned pointer." +"Bit twiddling: Overloading bits with multiple meanings. Examples include " +"using the NaN bits in `f64` for some other purpose or the higher-order bits " +"of pointers on `x86_64` platforms. This is somewhat common when writing " +"language interpreters to keep representations within the word size the " +"target platform." msgstr "" -#: src/async/pitfalls/pin.md -msgid "" -"The `poll` method of the `Future` trait uses `Pin<&mut Self>` instead of " -"`&mut Self` to refer to the instance. That's why it can only be called on a " -"pinned pointer." +#: src/unsafe-deep-dive/motivations/data-structures.md +msgid "Self-referential types are too hard for the borrow checker to verify." msgstr "" -#: src/async/pitfalls/async-traits.md +#: src/unsafe-deep-dive/motivations/data-structures.md 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))" +"Intrusive data structures: store structural metadata (like pointers to other " +"elements) inside the elements themselves, which requires careful handling of " +"aliasing." msgstr "" -#: src/async/pitfalls/async-traits.md +#: src/unsafe-deep-dive/motivations/performance.md +msgid "TODO: Stub for now" +msgstr "" + +#: src/unsafe-deep-dive/motivations/performance.md msgid "" -"The crate [async_trait](https://docs.rs/async-trait/latest/async_trait/) " -"provides a workaround through a macro:" +"It's easy to think of performance as the main reason for unsafe, but high " +"performance code makes up the minority of unsafe blocks." msgstr "" -#: src/async/pitfalls/async-traits.md -msgid "\"running all sleepers..\"" +#: src/unsafe-deep-dive/foundations.md +msgid "Some fundamental concepts and terms." msgstr "" -#: src/async/pitfalls/async-traits.md -msgid "\"slept for {}ms\"" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +#, fuzzy +msgid "What is “unsafety”?" +msgstr "Hvad er Rust?" + +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Unsafe Rust is a superset of Safe Rust." msgstr "" -#: src/async/pitfalls/async-traits.md -msgid "" -"`async_trait` is easy to use, but note that it's using heap allocations to " -"achieve this. This heap allocation has performance overhead." +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Let's create a list of things that are enabled by the `unsafe` keyword." msgstr "" -#: src/async/pitfalls/async-traits.md -msgid "" -"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." +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Definitions from authoritative docs:" msgstr "" -#: src/async/pitfalls/async-traits.md -msgid "" -"Try creating a new sleeper struct that will sleep for a random amount of " -"time and adding it to the Vec." +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "From the [unsafe keyword's documentation]():" msgstr "" -#: src/async/pitfalls/cancellation.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md msgid "" -"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." +"Code or interfaces whose memory safety cannot be verified by the type system." msgstr "" -#: src/async/pitfalls/cancellation.md -msgid "\"not UTF-8\"" -msgstr "" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +#, fuzzy +msgid "..." +msgstr "// ...\n" -#: src/async/pitfalls/cancellation.md -msgid "\"hi\\nthere\\n\"" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Here are the abilities Unsafe Rust has in addition to Safe Rust:" msgstr "" -#: src/async/pitfalls/cancellation.md -msgid "\"tick!\"" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Dereference raw pointers" msgstr "" -#: src/async/pitfalls/cancellation.md -msgid "" -"The compiler doesn't help with cancellation-safety. You need to read API " -"documentation and consider what state your `async fn` holds." +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +#, fuzzy +msgid "Implement unsafe traits" +msgstr "Asynkrone egenskaber (eng. Traits)" + +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +#, fuzzy +msgid "Call unsafe functions" +msgstr "Funktioner" + +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Mutate statics (including external ones)" msgstr "" -#: src/async/pitfalls/cancellation.md -msgid "" -"Unlike `panic` and `?`, cancellation is part of normal control flow (vs " -"error-handling)." +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Access fields of unions" msgstr "" -#: src/async/pitfalls/cancellation.md -msgid "The example loses parts of the string." +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "From the [reference](https://doc.rust-lang.org/reference/unsafety.html)" msgstr "" -#: src/async/pitfalls/cancellation.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md msgid "" -"Whenever the `tick()` branch finishes first, `next()` and its `buf` are " -"dropped." +"The following language level features cannot be used in the safe subset of " +"Rust:" msgstr "" -#: src/async/pitfalls/cancellation.md -msgid "" -"`LinesReader` can be made cancellation-safe by making `buf` part of the " -"struct:" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Dereferencing a raw pointer." msgstr "" -#: src/async/pitfalls/cancellation.md -msgid "// prefix buf and bytes with self.\n" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Reading or writing a mutable or external static variable." msgstr "" -#: src/async/pitfalls/cancellation.md -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'." +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Accessing a field of a union, other than to assign to it." msgstr "" -#: src/async/pitfalls/cancellation.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md 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." +"Calling an unsafe function (including an intrinsic or foreign function)." msgstr "" -#: src/async/pitfalls/cancellation.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md 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." +"Calling a safe function marked with a target_feature from a function that " +"does not have a target_feature attribute enabling the same features (see " +"attributes.codegen.target_feature.safety-restrictions)." msgstr "" -#: src/exercises/concurrency/afternoon.md -msgid "" -"To practice your Async Rust skills, we have again two exercises for you:" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Implementing an unsafe trait." msgstr "" -#: src/exercises/concurrency/afternoon.md -msgid "" -"Dining philosophers: we already saw this problem in the morning. This time " -"you are going to implement it with Async Rust." +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Declaring an extern block." msgstr "" -#: src/exercises/concurrency/afternoon.md -msgid "" -"A Broadcast Chat Application: this is a larger project that allows you " -"experiment with more advanced Async Rust features." +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Applying an unsafe attribute to an item." msgstr "" -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md #, fuzzy -msgid "Dining Philosophers --- Async" -msgstr "Filosoffer omkring spisebordet" +msgid "Group exercise" +msgstr "Øvelser" -#: src/exercises/concurrency/dining-philosophers-async.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md msgid "" -"See [dining philosophers](dining-philosophers.md) for a description of the " -"problem." +"You may have a group of learners who are not familiar with each other yet. " +"This is a way for you to gather some data about their confidence levels and " +"the psychological safety that they're feeling." msgstr "" -#: src/exercises/concurrency/dining-philosophers-async.md -msgid "" -"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:" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Part 1: Informal definition" msgstr "" -#: src/exercises/concurrency/dining-philosophers-async.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "// Make them think and eat\n" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "" +"Use this to gauge the confidence level of the group. If they are uncertain, " +"then tailor the next section to be more directed." msgstr "" -#: src/exercises/concurrency/dining-philosophers-async.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md msgid "" -"Since this time you are using Async Rust, you'll need a `tokio` dependency. " -"You can use the following `Cargo.toml`:" +"Ask the class: **By raising your hand, indicate if you would feel " +"comfortable defining unsafe?**" msgstr "" -#: src/exercises/concurrency/dining-philosophers-async.md -#, fuzzy -msgid "" -"```toml\n" -"[package]\n" -"name = \"dining-philosophers-async-dine\"\n" -"version = \"0.1.0\"\n" -"edition = \"2021\"\n" -"\n" -"[dependencies]\n" -"tokio = { version = \"1.26.0\", features = [\"sync\", \"time\", \"macros\", " -"\"rt-multi-thread\"] }\n" -"```" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "If anyone's feeling confident, allow them to try to explain." msgstr "" -"```toml\n" -"[package]\n" -"name = \"link-checker\"\n" -"version = \"0.1.0\"\n" -"edition = \"2021\"\n" -"publish = false\n" -"\n" -"[dependencies]\n" -"reqwest = { version = \"0.11.12\", features = [\"blocking\", \"rustls-" -"tls\"] }\n" -"scraper = \"0.13.0\"\n" -"thiserror = \"1.0.37\"\n" -"```" -#: src/exercises/concurrency/dining-philosophers-async.md -msgid "" -"Also note that this time you have to use the `Mutex` and the `mpsc` module " -"from the `tokio` crate." +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Part 2: Evidence gathering" msgstr "" -#: src/exercises/concurrency/dining-philosophers-async.md -msgid "Can you make your implementation single-threaded?" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Ask the class to spend 3-5 minutes." msgstr "" -#: src/exercises/concurrency/chat-app.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md msgid "" -"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." +"Find a use of the unsafe keyword. What contract/invariant/pre-condition is " +"being established or satisfied?" msgstr "" -#: src/exercises/concurrency/chat-app.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md msgid "" -"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/) for the communication between the client " -"and the server." +"Write down terms that need to be defined (unsafe, memory safety, soundness, " +"undefined behavior)" msgstr "" -#: src/exercises/concurrency/chat-app.md -msgid "Create a new Cargo project and add the following dependencies:" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Part 3: Write a working definition" msgstr "" -#: src/exercises/concurrency/chat-app.md -msgid "_Cargo.toml_:" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Part 4: Remarks" msgstr "" -#: src/exercises/concurrency/chat-app.md -#, fuzzy -msgid "" -"```toml\n" -"[package]\n" -"name = \"chat-async\"\n" -"version = \"0.1.0\"\n" -"edition = \"2021\"\n" -"\n" -"[dependencies]\n" -"futures-util = { version = \"0.3.30\", features = [\"sink\"] }\n" -"http = \"1.0.0\"\n" -"tokio = { version = \"1.28.1\", features = [\"full\"] }\n" -"tokio-websockets = { version = \"0.5.1\", features = [\"client\", " -"\"fastrand\", \"server\", \"sha1_smol\"] }\n" -"```" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "Mention that we'll be reviewing our definition at the end of the day." msgstr "" -"```toml\n" -"[package]\n" -"name = \"link-checker\"\n" -"version = \"0.1.0\"\n" -"edition = \"2021\"\n" -"publish = false\n" -"\n" -"[dependencies]\n" -"reqwest = { version = \"0.11.12\", features = [\"blocking\", \"rustls-" -"tls\"] }\n" -"scraper = \"0.13.0\"\n" -"thiserror = \"1.0.37\"\n" -"```" -#: src/exercises/concurrency/chat-app.md -msgid "The required APIs" +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "" +"Note: Avoid detailed discussion about precise semantics of memory safety" msgstr "" -#: src/exercises/concurrency/chat-app.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md msgid "" -"You are going to need the following functions from `tokio` and " -"[`tokio_websockets`](https://docs.rs/tokio-websockets/). Spend a few minutes " -"to familiarize yourself with the API." +"It's possible that the group will slide into a discussion about the precise " +"semantics of what memory safety actually is and how define pointer validity. " +"This isn't a productive line of discussion. It can undermine confidence in " +"less experienced learners." msgstr "" -#: src/exercises/concurrency/chat-app.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md msgid "" -"[StreamExt::next()](https://docs.rs/futures-util/0.3.28/futures_util/stream/" -"trait.StreamExt.html#method.next) implemented by `WebSocketStream`: for " -"asynchronously reading messages from a Websocket Stream." +"Perhaps refer people who wish to discuss this to the discussion within the " +"official [documentation for pointer types](https://doc.rust-lang.org/std/ptr/" +"index.html#safety) (excerpt below) as a place for further research." msgstr "" -#: src/exercises/concurrency/chat-app.md +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md 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." +"Many functions in [this module](https://doc.rust-lang.org/std/ptr/" +"index.html) take raw pointers as arguments and read from or write to them. " +"For this to be safe, these pointers must be _valid_ for the given access." msgstr "" -#: src/exercises/concurrency/chat-app.md -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." +#: src/unsafe-deep-dive/foundations/what-is-unsafe.md +msgid "The precise rules for validity are not determined yet." msgstr "" -#: src/exercises/concurrency/chat-app.md +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md msgid "" -"[Sender::subscribe()](https://docs.rs/tokio/latest/tokio/sync/broadcast/" -"struct.Sender.html#method.subscribe): for subscribing to a broadcast channel." +"The unsafe keyword indicates that the programmer is responsible for " +"upholding Rust's safety guarantees." msgstr "" -#: src/exercises/concurrency/chat-app.md -msgid "Two binaries" +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "The keyword has two roles:" msgstr "" -#: src/exercises/concurrency/chat-app.md -msgid "" -"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))." +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "define pre-conditions that must be satisfied" msgstr "" -#: src/exercises/concurrency/chat-app.md +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md msgid "" -"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." +"assert to the compiler (= promise) that those defined pre-conditions are " +"satisfied" msgstr "" -#: src/exercises/concurrency/chat-app.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "_src/bin/server.rs_:" -msgstr "_src/bin/server.rs_:" +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +#, fuzzy +msgid "Further references" +msgstr "Referencer" -#: src/exercises/concurrency/chat-app.md -msgid "// TODO: For a hint, see the description of the task below.\n" +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "" +"[The unsafe keyword chapter of the Rust Reference](https://doc.rust-lang.org/" +"reference/unsafe-keyword.html)" msgstr "" -#: src/exercises/concurrency/chat-app.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"127.0.0.1:2000\"" -msgstr "\"127.0.0.1:2000\"" - -#: src/exercises/concurrency/chat-app.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"listening on port 2000\"" +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "Places where pre-conditions can be defined (Role 1)" msgstr "" -#: src/exercises/concurrency/chat-app.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"New connection from {addr:?}\"" +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "" +"[unsafe functions](https://doc.rust-lang.org/reference/unsafe-" +"keyword.html#unsafe-functions-unsafe-fn) (`unsafe fn foo() { ... }`). " +"Example: `get_unchecked` method on slices, which requires callers to verify " +"that the index is in-bounds." msgstr "" -#: src/exercises/concurrency/chat-app.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "// Wrap the raw TCP stream into a websocket.\n" +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "" +"unsafe traits (`unsafe trait`). Examples: [`Send`](https://doc.rust-lang.org/" +"std/marker/trait.Send.html) and [`Sync`](https://doc.rust-lang.org/std/" +"marker/trait.Sync.html) marker traits in the standard library." msgstr "" -#: src/exercises/concurrency/chat-app.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "_src/bin/client.rs_:" -msgstr "_src/bin/client.rs_:" +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "Places where pre-conditions must be satisfied (Role 2)" +msgstr "" -#: src/exercises/concurrency/chat-app.md -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"ws://127.0.0.1:2000\"" -msgstr "\"ws://127.0.0.1:2000\"" +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "unsafe blocks (`unafe { ... }`)" +msgstr "" -#: src/exercises/concurrency/chat-app.md -msgid "Running the binaries" -msgstr "Afvikling af binære filer" +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "implementing unsafe traits (`unsafe impl`)" +msgstr "" -#: src/exercises/concurrency/chat-app.md -msgid "Run the server with:" +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "access external items (`unsafe extern`)" msgstr "" -#: src/exercises/concurrency/chat-app.md -msgid "and the client with:" +#: src/unsafe-deep-dive/foundations/when-is-unsafe-used.md +msgid "" +"adding [unsafe attributes](https://doc.rust-lang.org/reference/" +"attributes.html) o an item. Examples: [`export_name`](https://doc.rust-" +"lang.org/reference/abi.html#the-export_name-attribute), [`link_section`]" +"(https://doc.rust-lang.org/reference/abi.html#the-link_section-attribute) " +"and [`no_mangle`](https://doc.rust-lang.org/reference/abi.html#the-no_mangle-" +"attribute). Usage: `#[unsafe(no_mangle)]`" msgstr "" -#: src/exercises/concurrency/chat-app.md -msgid "Implement the `handle_connection` function in `src/bin/server.rs`." +#: src/unsafe-deep-dive/foundations/data-structures-are-safe.md +msgid "Data structures are safe ..." msgstr "" -#: src/exercises/concurrency/chat-app.md -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." +#: src/unsafe-deep-dive/foundations/data-structures-are-safe.md +msgid "Data structures are inert. They cannot do any harm by themselves." msgstr "" -#: src/exercises/concurrency/chat-app.md -msgid "Complete the main function in `src/bin/client.rs`." +#: src/unsafe-deep-dive/foundations/data-structures-are-safe.md +msgid "Safe Rust code can create raw pointers:" msgstr "" -#: src/exercises/concurrency/chat-app.md -msgid "" -"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." +#: src/unsafe-deep-dive/foundations/data-structures-are-safe.md +#: src/unsafe-deep-dive/foundations/actions-might-not-be.md +msgid "\"{safe:p}\"" msgstr "" -#: src/exercises/concurrency/chat-app.md +#: src/unsafe-deep-dive/foundations/data-structures-are-safe.md msgid "" -"Optional: Once you are done, change the code to broadcast messages to all " -"clients, but the sender of the message." +"Consider a raw pointer to an integer, i.e., the value `safe` is the raw " +"pointer type `*const i64`. Raw pointers can be out-of-bounds, misaligned, or " +"be null. But the unsafe keyword is not required when creating them." msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "Concurrency Afternoon Exercise" +#: src/unsafe-deep-dive/foundations/actions-might-not-be.md +msgid "... but actions on them might not be" msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "([back to exercise](dining-philosophers-async.md))" +#: src/unsafe-deep-dive/foundations/actions-might-not-be.md +msgid "Modify the example to de-reference `safe` without an `unsafe` block." msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "" -"// Add a delay before picking the second fork to allow the execution\n" -" // to transfer to another task\n" +#: src/unsafe-deep-dive/foundations/less-powerful.md +msgid "The `unsafe` keyword does not allow you to break Rust." msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "// The locks are dropped here\n" +#: src/unsafe-deep-dive/foundations/less-powerful.md +msgid "b\"RUST\"" msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "" -"// To avoid a deadlock, we have to break the symmetry\n" -" // somewhere. This will swap the forks without deinitializing\n" -" // either of them.\n" +#: src/unsafe-deep-dive/foundations/less-powerful.md +msgid "Suggested outline" msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "// tx is dropped here, so we don't need to explicitly drop it later\n" +#: src/unsafe-deep-dive/foundations/less-powerful.md +msgid "Request that someone explains what `std::mem::transmute` does" msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"Here is a thought: {thought}\"" +#: src/unsafe-deep-dive/foundations/less-powerful.md +msgid "Discuss why it doesn't compile" msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "([back to exercise](chat-app.md))" -msgstr "([tilbage til øvelsen](chat-app.md))" - -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"Welcome to chat! Type a message\"" +#: src/unsafe-deep-dive/foundations/less-powerful.md +msgid "Fix the code" msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "" -"// 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" +#: src/unsafe-deep-dive/foundations/less-powerful.md +msgid "Expected compiler output" msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"From client {addr:?} {text:?}\"" +#: src/unsafe-deep-dive/foundations/less-powerful.md +msgid "Suggested change" msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "// Continuous loop for concurrently sending and receiving messages.\n" +#: src/unsafe-deep-dive/foundations/less-powerful.md +msgid "Notes on less familiar Rust" msgstr "" -#: src/exercises/concurrency/solutions-afternoon.md -msgid "\"From server: {}\"" +#: src/unsafe-deep-dive/foundations/less-powerful.md +msgid "" +"the `b` prefix on a string literal marks it as byte slice (`&[u8]`) rather " +"than a string slice (`&str`)" msgstr "" #: src/thanks.md @@ -19318,6 +21890,14 @@ msgid "" "comprehensive-rust/discussions). We would love to hear from you." msgstr "" +#: src/thanks.md +msgid "" +"Thank you for reading the speaker notes! We hope they have been useful. If " +"you find pages without notes, please send us a PR and link it to [issue " +"#1083](https://github.com/google/comprehensive-rust/issues/1083). We are " +"also very grateful for fixes and improvements to the existing notes." +msgstr "" + #: src/glossary.md msgid "" "The following is a glossary which aims to give a short definition of many " @@ -19325,10 +21905,11 @@ msgid "" "the English original." msgstr "" +#. Please add the English term in italic after your translated term. Also, please keep the hard line breaks to ensure a nice formatting. #: src/glossary.md msgid "" "allocate: \n" -"Dynamic memory allocation on [the heap](memory-management/stack-vs-heap.md)." +"Dynamic memory allocation on [the heap](memory-management/review.md)." msgstr "" #: src/glossary.md @@ -19337,6 +21918,13 @@ msgid "" "Information that is passed into a function or method." msgstr "" +#: src/glossary.md +msgid "" +"associated type: \n" +"A type associated with a specific trait. Useful for defining the " +"relationship between types." +msgstr "" + #: src/glossary.md msgid "" "Bare-metal Rust: \n" @@ -19347,13 +21935,13 @@ msgstr "" #: src/glossary.md msgid "" "block: \n" -"See [Blocks](control-flow/blocks.md) and _scope_." +"See [Blocks](control-flow-basics/blocks-and-scopes.md) and _scope_." msgstr "" #: src/glossary.md msgid "" "borrow: \n" -"See [Borrowing](ownership/borrowing.md)." +"See [Borrowing](borrowing/shared.md)." msgstr "" #: src/glossary.md @@ -19402,7 +21990,7 @@ msgstr "" #: src/glossary.md msgid "" "Concurrency in Rust: \n" -"See [Concurrency in Rust](concurrency.md)." +"See [Concurrency in Rust](concurrency/welcome.md)." msgstr "" #: src/glossary.md @@ -19626,7 +22214,7 @@ msgstr "" #: src/glossary.md msgid "" "Rust Fundamentals: \n" -"Days 1 to 3 of this course." +"Days 1 to 4 of this course." msgstr "" #: src/glossary.md @@ -19670,8 +22258,8 @@ msgstr "" #: src/glossary.md msgid "" "string: \n" -"A data type storing textual data. See [`String` vs `str`](basic-syntax/" -"string-slices.html) for more." +"A data type storing textual data. See [Strings](references/strings.html) for " +"more." msgstr "" #: src/glossary.md @@ -19766,7 +22354,7 @@ msgstr "" msgid "" "unsafe: \n" "The subset of Rust which allows you to trigger _undefined behavior_. See " -"[Unsafe Rust](unsafe.html)." +"[Unsafe Rust](unsafe-rust/unsafe.md)." msgstr "" #: src/glossary.md @@ -19831,6 +22419,12 @@ msgstr "" "[The Rust Reference](https://doc.rust-lang.org/reference/): en ufuldstændig " "bog som beskriver grammatikken og en hukommelsesmodel for Rust." +#: src/other-resources.md +msgid "" +"[Rust API Guidelines](https://rust-lang.github.io/api-guidelines/): " +"recommendations on how to design APIs." +msgstr "" + #: src/other-resources.md msgid "More specialized guides hosted on the official Rust site:" msgstr "Mere specialiserede guider huset på den officielle Rust side:" @@ -19881,9 +22475,9 @@ msgstr "" #: src/other-resources.md 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." +"[Rust for Embedded C Programmers](https://opentitan.org/book/doc/" +"rust_for_c_devs.html): covers Rust from the perspective of developers who " +"write firmware in C." msgstr "" #: src/other-resources.md @@ -19907,20 +22501,29 @@ msgid "" "and async/await are also covered." msgstr "" +#: src/other-resources.md +msgid "" +"[Advanced testing for Rust applications](https://rust-exercises.com/advanced-" +"testing/): a self-paced workshop that goes beyond Rust's built-in testing " +"framework. It covers `googletest`, snapshot testing, mocking as well as how " +"to write your own custom test harness." +msgstr "" + #: src/other-resources.md 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." +"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 msgid "" -"[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." +"[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/other-resources.md @@ -19976,132 +22579,3 @@ msgid "" "uses an image from [CXX](https://cxx.rs/). Please see the `third_party/cxx/` " "directory for details, including the license terms." msgstr "" - -#, fuzzy -#~ msgid "Impl Trait" -#~ msgstr "`impl Trait`" - -#, fuzzy -#~ msgid "Move semantics" -#~ msgstr "Overførselssemantik" - -#, fuzzy -#~ msgid "IntoIterator" -#~ msgstr "`IntoIterator`" - -#, fuzzy -#~ msgid "Try operator" -#~ msgstr "Egenskab" - -#~ msgid "no_std" -#~ msgstr "no_std" - -#~ msgid "alloc" -#~ msgstr "alloc" - -#~ msgid "embedded-hal" -#~ msgstr "embedded-hal" - -#~ msgid "zerocopy" -#~ msgstr "zerocopy" - -#~ msgid "aarch64-paging" -#~ msgstr "aarch64-paging" - -#~ msgid "buddy_system_allocator" -#~ msgstr "buddy_system_allocator" - -#~ msgid "tinyvec" -#~ msgstr "tinyvec" - -#~ msgid "spin" -#~ msgstr "spin" - -#~ msgid "Send and Sync" -#~ msgstr "Send og Sync" - -#~ msgid "Send" -#~ msgstr "Send" - -#~ msgid "Sync" -#~ msgstr "Sync" - -#~ msgid "Arc" -#~ msgstr "Arc" - -#~ msgid "Mutex" -#~ msgstr "Mutex" - -#~ msgid "async/await" -#~ msgstr "async/await" - -#~ msgid "Pin" -#~ msgstr "Pin" - -#, fuzzy -#~ msgid "For example:" -#~ msgstr "C-eksempel" - -#~ msgid "" -#~ "```bob\n" -#~ " Stack Heap\n" -#~ ".- - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - " -#~ "- - -.\n" -#~ ": : : :\n" -#~ ": " -#~ "list : : :\n" -#~ ": +----+----+ : : +----+----+ +----+------" -#~ "+ :\n" -#~ ": | 1 | o--+-----------+-----+--->| 2 | o--+--->| // | null " -#~ "| :\n" -#~ ": +----+----+ : : +----+----+ +----+------" -#~ "+ :\n" -#~ ": : : :\n" -#~ ": : : :\n" -#~ "`- - - - - - - - - - - - -' '- - - - - - - - - - - - - - - - - - - - " -#~ "- - -'\n" -#~ "```" -#~ msgstr "" -#~ "```bob\n" -#~ " Stak Heap\n" -#~ ".- - - - - - - - - - - - -. .- - - - - - - - - - - - - - - - - - - - " -#~ "- - -.\n" -#~ ": : : :\n" -#~ ": " -#~ "list : : :\n" -#~ ": +----+----+ : : +----+----+ +----+------" -#~ "+ :\n" -#~ ": | 1 | o--+-----------+-----+--->| 2 | o--+--->| // | null " -#~ "| :\n" -#~ ": +----+----+ : : +----+----+ +----+------" -#~ "+ :\n" -#~ ": : : :\n" -#~ ": : : :\n" -#~ "`- - - - - - - - - - - - -' '- - - - - - - - - - - - - - - - - - - - " -#~ "- - -'\n" -#~ "```" - -#~ msgid "`Cell` and `RefCell`" -#~ msgstr "`Cell` og `RefCell`" - -#~ msgid "Lifetimes" -#~ msgstr "Livstider" - -#, fuzzy -#~ msgid "\"name: {}\"" -#~ msgstr "\"nyt areal: {}\"" - -#, fuzzy -#~ msgid "\"id: {}\"" -#~ msgstr "\"int: {}\"" - -#, fuzzy -#~ msgid "\" number: {}\"" -#~ msgstr "\"{numbers:?}\"" - -#, fuzzy -#~ msgid "\" type: {}\"" -#~ msgstr "\"int: {}\"" - -#~ msgid "\"127.0.0.1:6142\"" -#~ msgstr "\"127.0.0.1:6142\""