From fdd71c14d379752499bdce5241735b76b48b865f Mon Sep 17 00:00:00 2001 From: qwer252 Date: Thu, 5 Jun 2025 21:24:26 +0800 Subject: [PATCH 1/3] Update main.rs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 对注释进行了翻译 --- .../listing-04-04/src/main.rs | 28 ++++++++----------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/listings/ch04-understanding-ownership/listing-04-04/src/main.rs b/listings/ch04-understanding-ownership/listing-04-04/src/main.rs index c59c77b..4f01fa4 100644 --- a/listings/ch04-understanding-ownership/listing-04-04/src/main.rs +++ b/listings/ch04-understanding-ownership/listing-04-04/src/main.rs @@ -1,30 +1,24 @@ fn main() { - let s1 = gives_ownership(); // gives_ownership moves its return - // value into s1 + let s1 = gives_ownership(); // gives_ownership 将它的返回值传递给s1 - let s2 = String::from("hello"); // s2 comes into scope + let s2 = String::from("hello"); // s2 进入作用域 - let s3 = takes_and_gives_back(s2); // s2 is moved into - // takes_and_gives_back, which also - // moves its return value into s3 -} // Here, s3 goes out of scope and is dropped. s2 was moved, so nothing - // happens. s1 goes out of scope and is dropped. + let s3 = takes_and_gives_back(s2); // s2 被传入takes_and_gives_back, + // 它的返回值又传递给 s3 +} // 此处，s3 移出作用域并被丢弃。s2 被 move ，所以无事发生 + // s1 移出作用域并被丢弃 -fn gives_ownership() -> String { // gives_ownership will move its - // return value into the function - // that calls it +fn gives_ownership() -> String { // gives_ownership 将会把返回值传入 + // 调用它的函数 - let some_string = String::from("yours"); // some_string comes into scope + let some_string = String::from("yours"); // some_string 进入作用域 - some_string // some_string is returned and - // moves out to the calling - // function + some_string // 返回 some_string 并将其移至调用函数 } // 该函数将传入字符串并返回该值 fn takes_and_gives_back(a_string: String) -> String { - // a_string comes into - // scope + // a_string 进入作用域 a_string // 返回 a_string 并移出给调用的函数 } From f7da8ed2d6e8c6dc84039e08b6f17ba909c7d431 Mon Sep 17 00:00:00 2001 From: kazeno Date: Fri, 6 Jun 2025 09:42:55 +0800 Subject: [PATCH 2/3] fix autocorrect --- .../ch04-understanding-ownership/listing-04-04/src/main.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/listings/ch04-understanding-ownership/listing-04-04/src/main.rs b/listings/ch04-understanding-ownership/listing-04-04/src/main.rs index 4f01fa4..94de127 100644 --- a/listings/ch04-understanding-ownership/listing-04-04/src/main.rs +++ b/listings/ch04-understanding-ownership/listing-04-04/src/main.rs @@ -1,11 +1,11 @@ fn main() { - let s1 = gives_ownership(); // gives_ownership 将它的返回值传递给s1 + let s1 = gives_ownership(); // gives_ownership 将它的返回值传递给 s1 let s2 = String::from("hello"); // s2 进入作用域 - let s3 = takes_and_gives_back(s2); // s2 被传入takes_and_gives_back, + let s3 = takes_and_gives_back(s2); // s2 被传入 takes_and_gives_back, // 它的返回值又传递给 s3 -} // 此处，s3 移出作用域并被丢弃。s2 被 move ，所以无事发生 +} // 此处，s3 移出作用域并被丢弃。s2 被 move，所以无事发生 // s1 移出作用域并被丢弃 fn gives_ownership() -> String { // gives_ownership 将会把返回值传入 From f09cbada566a07baf552ce0f21eae46d1f8ce1a9 Mon Sep 17 00:00:00 2001 From: kazeno Date: Fri, 6 Jun 2025 11:22:28 +0800 Subject: [PATCH 3/3] add custom-template.typ --- book.toml | 1 + custom-template.typ | 70 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 custom-template.typ diff --git a/book.toml b/book.toml index e2d91b3..f8fb7d1 100644 --- a/book.toml +++ b/book.toml @@ -19,6 +19,7 @@ git-repository-url = "https://github.com/KaiserY/trpl-zh-cn/tree/main" edit-url-template = "https://github.com/KaiserY/trpl-zh-cn/edit/main/{path}" [output.typst-pdf] +custom-template = "custom-template.typ" pdf = true section-number = true rust-book = true diff --git a/custom-template.typ b/custom-template.typ new file mode 100644 index 0000000..f9fd41b --- /dev/null +++ b/custom-template.typ @@ -0,0 +1,70 @@ +#set text( + lang: "zh", + font: ( + "Noto Sans", + "Noto Sans SC", + "Noto Sans KR", + "Noto Sans Thai", + "Noto Sans Arabic", + "Noto Sans Hebrew", + "Noto Sans Devanagari", + "Noto Emoji", + ), +) + +#show heading: set block(below: 1.5em) + +#show raw: set text( + font: ( + "Noto Sans Mono", + "Noto Sans Devanagari", + ) +) + +#show link: underline + +#show raw.where(block: false): box.with( + fill: luma(240), + inset: 1pt, + radius: 2pt, +) + +#show raw.where(block: true): block.with( + width: 100%, + fill: luma(240), + inset: 10pt, + radius: 4pt, +) + +#show quote.where(block: true): block.with( + width: 100%, + fill: rgb("#f1f6f9"), + inset: 10pt, + radius: 4pt, +) + +#set page( + header: context { + if counter(page).get().first() > 1 [ + MDBOOK_TYPST_PDF_TITLE + ] + }, + footer: context { + if counter(page).get().first() > 1 [ + #counter(page).display( + "1/1", + both: true, + ) + ] + }, +) + +#align(center, text(17pt)[ + *MDBOOK_TYPST_PDF_TITLE* +]) + +#pagebreak() +#outline(depth: 2, indent: 1em) +#pagebreak() + +/**** MDBOOK_TYPST_PDF_PLACEHOLDER ****/