From e606a2e783f2ca402101421dc2c26d821380d6f6 Mon Sep 17 00:00:00 2001 From: funkill2 Date: Tue, 14 Jan 2025 04:00:19 +0300 Subject: [PATCH] update original --- .../packages/mdbook-trpl/src/listing/mod.rs | 2 +- .../packages/mdbook-trpl/src/listing/tests.rs | 2 +- rustbook-en/src/appendix-01-keywords.md | 21 +++++++++++-------- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/rustbook-en/packages/mdbook-trpl/src/listing/mod.rs b/rustbook-en/packages/mdbook-trpl/src/listing/mod.rs index 1087e9ef..e1f7d00c 100644 --- a/rustbook-en/packages/mdbook-trpl/src/listing/mod.rs +++ b/rustbook-en/packages/mdbook-trpl/src/listing/mod.rs @@ -252,7 +252,7 @@ impl Listing { fn opening_text(&self) -> String { self.file_name .as_ref() - .map(|file_name| format!("Filename: {file_name}\n")) + .map(|file_name| format!("{file_name}\n")) .unwrap_or_default() } diff --git a/rustbook-en/packages/mdbook-trpl/src/listing/tests.rs b/rustbook-en/packages/mdbook-trpl/src/listing/tests.rs index 4efb2474..74790a8e 100644 --- a/rustbook-en/packages/mdbook-trpl/src/listing/tests.rs +++ b/rustbook-en/packages/mdbook-trpl/src/listing/tests.rs @@ -51,7 +51,7 @@ Trailing text."#, &result.unwrap(), r#"Leading text. -Filename: src/main.rs +src/main.rs ```rust fn main() {} diff --git a/rustbook-en/src/appendix-01-keywords.md b/rustbook-en/src/appendix-01-keywords.md index 1df16911..8e00f34f 100644 --- a/rustbook-en/src/appendix-01-keywords.md +++ b/rustbook-en/src/appendix-01-keywords.md @@ -69,6 +69,9 @@ Rust for potential future use. - `box` - `do` - `final` + +* `gen` + - `macro` - `override` - `priv` @@ -124,14 +127,14 @@ This code will compile without any errors. Note the `r#` prefix on the function name in its definition as well as where the function is called in `main`. Raw identifiers allow you to use any word you choose as an identifier, even if -that word happens to be a reserved keyword. This gives us more freedom to -choose identifier names, as well as lets us integrate with programs written in -a language where these words aren’t keywords. In addition, raw identifiers -allow you to use libraries written in a different Rust edition than your crate -uses. For example, `try` isn’t a keyword in the 2015 edition but is in the 2018 -edition. If you depend on a library that’s written using the 2015 edition and -has a `try` function, you’ll need to use the raw identifier syntax, `r#try` in -this case, to call that function from your 2018 edition code. See [Appendix -E][appendix-e] for more information on editions. +that word happens to be a reserved keyword. This gives us more freedom to choose +identifier names, as well as lets us integrate with programs written in a +language where these words aren’t keywords. In addition, raw identifiers allow +you to use libraries written in a different Rust edition than your crate uses. +For example, `try` isn’t a keyword in the 2015 edition but is in the 2018, 2021, +and 2024 editions. If you depend on a library that’s written using the 2015 +edition and has a `try` function, you’ll need to use the raw identifier syntax, +`r#try` in this case, to call that function from your 2018 edition code. See +[Appendix E][appendix-e] for more information on editions. [appendix-e]: appendix-05-editions.html