[PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Yanteng Si]

v2:
* As Miguel's comments, translate commit 01848eee20c6
  into Chinese, as well as commit 81889e8523e6. By the way,
  these two patches haven't appeared in the doc development
  tree yet, maybe we could consider merging them into the
  rust tree?
* As Dongliang's comments, translation "在... 前添加" other
  than "前缀".

v1:
The Chinese version of rust seems to be way behind,
even though we did translate to Chinese at the beginning.
Let's keep them up to date. :)

Yanteng Si (4):
  docs/zh_CN/rust: Update the translation of arch-support to 6.9-rc4
  docs/zh_CN/rust: Update the translation of coding-guidelines to
    6.9-rc4
  docs/zh_CN/rust: Update the translation of general-information to
    6.9-rc4
  docs/zh_CN/rust: Update the translation of quick-start to 6.9-rc4

 .../translations/zh_CN/rust/arch-support.rst  | 14 ++++--
 .../zh_CN/rust/coding-guidelines.rst          | 12 +++++
 .../zh_CN/rust/general-information.rst        |  2 +-
 .../translations/zh_CN/rust/quick-start.rst   | 50 +++++++++++++------
 4 files changed, 56 insertions(+), 22 deletions(-)

-- 
2.31.4

[PATCH v2 1/4] docs/zh_CN/rust: Update the translation of arch-support to 6.9-rc4

[Yanteng Si]

Update to commit 81889e8523e6 ("RISC-V: enable building
64-bit kernels with rust support")
commit 01848eee20c6 ("docs: rust: fix improper rendering in
Arch Supportpage")
commit 724a75ac9542 ("arm64: rust: Enable Rust support
for AArch64")
commit 90868ff9cade ("LoongArch: Enable initial Rust support")
commit e5e86572e3f2 ("rust: sort uml documentation arch support table")
commit 04df97e150c8 ("Documentation: rust: Fix arch support table")
commit 0438aadfa69a ("rust: arch/um: Add support for CONFIG_RUST
under x86_64 UML")

Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
---
 .../translations/zh_CN/rust/arch-support.rst       | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/Documentation/translations/zh_CN/rust/arch-support.rst b/Documentation/translations/zh_CN/rust/arch-support.rst
index afbd02afec45..abd708d48f82 100644
--- a/Documentation/translations/zh_CN/rust/arch-support.rst
+++ b/Documentation/translations/zh_CN/rust/arch-support.rst
@@ -16,8 +16,12 @@
 
 下面是目前可以工作的架构的一般总结。支持程度与 ``MAINTAINERS`` 文件中的``S`` 值相对应:
 
-============  ================  ==============================================
-架构          支持水平          限制因素
-============  ================  ==============================================
-``x86``       Maintained        只有 ``x86_64``
-============  ================  ==============================================
+=============  ================  ==============================================
+架构           支持水平           限制因素
+=============  ================  ==============================================
+``arm64``      Maintained        只有小端序
+``loongarch``  Maintained        \-
+``riscv``      Maintained        只有 ``riscv64``
+``um``         Maintained        只有 ``x86_64``
+``x86``        Maintained        只有 ``x86_64``
+=============  ================  ==============================================
-- 
2.31.4

[PATCH v2 2/4] docs/zh_CN/rust: Update the translation of coding-guidelines to 6.9-rc4

[Yanteng Si]

Update to commit bc2e7d5c298a ("rust: support `srctree`-relative links")

Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
---
 .../translations/zh_CN/rust/coding-guidelines.rst    | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Documentation/translations/zh_CN/rust/coding-guidelines.rst b/Documentation/translations/zh_CN/rust/coding-guidelines.rst
index 6c0bdbbc5a2a..419143b938ed 100644
--- a/Documentation/translations/zh_CN/rust/coding-guidelines.rst
+++ b/Documentation/translations/zh_CN/rust/coding-guidelines.rst
@@ -157,6 +157,18 @@ https://commonmark.org/help/
 
 	https://doc.rust-lang.org/rustdoc/how-to-write-documentation.html
 
+此外，内核支持通过在链接目标前添加 ``srctree/`` 来创建相对于源代码树的链接。例如:
+
+.. code-block:: rust
+
+       //! C header: [`include/linux/printk.h`](srctree/include/linux/printk.h)
+
+或者:
+
+.. code-block:: rust
+
+       /// [`struct mutex`]: srctree/include/linux/mutex.h
+
 
 命名
 ----
-- 
2.31.4

[PATCH v2 3/4] docs/zh_CN/rust: Update the translation of general-information to 6.9-rc4

[Yanteng Si]

Update to commit ba4abeb13d5e ("docs: rust: Move testing to a
separate page")
commit be412baf7240 ("docs: rust: Add rusttest info")
commit bd9e54a42ce2 ("docs: rust: update Rust docs output path")

Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
---
 Documentation/translations/zh_CN/rust/general-information.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/translations/zh_CN/rust/general-information.rst b/Documentation/translations/zh_CN/rust/general-information.rst
index 6b91dfe1834a..251f6ee2bb44 100644
--- a/Documentation/translations/zh_CN/rust/general-information.rst
+++ b/Documentation/translations/zh_CN/rust/general-information.rst
@@ -32,7 +32,7 @@ Rust内核代码使用其内置的文档生成器 ``rustdoc`` 进行记录。
 
 要在你的网络浏览器中本地阅读该文档，请运行如::
 
-	xdg-open rust/doc/kernel/index.html
+	xdg-open Documentation/output/rust/rustdoc/kernel/index.html
 
 要了解如何编写文档，请看 coding-guidelines.rst 。
 
-- 
2.31.4

[PATCH v2 4/4] docs/zh_CN/rust: Update the translation of quick-start to 6.9-rc4

[Yanteng Si]

Update to commit 711cbfc71765 ("docs: rust: Clarify that 'rustup
override' applies to build directory")
commit 7583ce66ddf7 ("docs: rust: remove `CC=clang` mentions")
commit 2285eb2f2429 ("docs: rust: clarify what 'rustup override' does")
commit 8cb40124cf92 ("docs: rust: update instructions for obtaining
'core' source")
commit b603c6cc405a ("docs: rust: add command line to rust-analyzer
section")
commit 08ab786556ff ("rust: bindgen: upgrade to 0.65.1")
commit eae90172c5b8 ("docs: rust: add paragraph about finding a
suitable `libclang`")
commit 6883b29c6cae ("docs: rust: point directly to the standalone
installers")

Signed-off-by: Yanteng Si <siyanteng@loongson.cn>
---
 .../translations/zh_CN/rust/quick-start.rst   | 50 +++++++++++++------
 1 file changed, 34 insertions(+), 16 deletions(-)

diff --git a/Documentation/translations/zh_CN/rust/quick-start.rst b/Documentation/translations/zh_CN/rust/quick-start.rst
index a4b8e8a50a89..8616556ae4d7 100644
--- a/Documentation/translations/zh_CN/rust/quick-start.rst
+++ b/Documentation/translations/zh_CN/rust/quick-start.rst
@@ -37,13 +37,18 @@ rustc
 需要一个特定版本的Rust编译器。较新的版本可能会也可能不会工作，因为就目前而言，内核依赖
 于一些不稳定的Rust特性。
 
-如果使用的是 ``rustup`` ，请进入检出的源代码目录并运行::
+如果使用的是 ``rustup`` ，请进入内核编译目录（或者用 ``--path=<build-dir>`` 参数
+来 ``设置`` sub-command)并运行::
 
 	rustup override set $(scripts/min-tool-version.sh rustc)
 
-或者从以下网址获取一个独立的安装程序或安装 ``rustup`` ：
++这将配置你的工作目录使用正确版本的 ``rustc``，而不影响你的默认工具链。
 
-	https://www.rust-lang.org
+请注意覆盖应用当前的工作目录（和它的子目录）。
+
+如果你使用 ``rustup``， 可以从下面的链接拉取一个单独的安装程序:
+
+	https://forge.rust-lang.org/infra/other-installation-methods.html#standalone
 
 
 Rust标准库源代码
@@ -57,21 +62,23 @@ Rust标准库的源代码是必需的，因为构建系统会交叉编译 ``core
 
 这些组件是按工具链安装的，因此以后升级Rust编译器版本需要重新添加组件。
 
-否则，如果使用独立的安装程序，可以将Rust仓库克隆到工具链的安装文件夹中::
+否则，如果使用独立的安装程序，可以将Rust源码树下载到安装工具链的文件夹中::
 
-	git clone --recurse-submodules \
-		--branch $(scripts/min-tool-version.sh rustc) \
-		https://github.com/rust-lang/rust \
-		$(rustc --print sysroot)/lib/rustlib/src/rust
+       curl -L "https://static.rust-lang.org/dist/rust-src-$(scripts/min-tool-version.sh rustc).tar.gz" |
+               tar -xzf - -C "$(rustc --print sysroot)/lib" \
+               "rust-src-$(scripts/min-tool-version.sh rustc)/rust-src/lib/" \
+               --strip-components=3
 
-在这种情况下，以后升级Rust编译器版本需要手动更新这个克隆的仓库。
+在这种情况下，以后升级Rust编译器版本需要手动更新这个源代码树（这可以通过移除
+``$(rustc --print sysroot)/lib/rustlib/src/rust`` ，然后重新执行上
+面的命令做到）。
 
 
 libclang
 ********
 
 ``bindgen`` 使用 ``libclang`` （LLVM的一部分）来理解内核中的C代码，这意味着需要安
-装LLVM；同在开启 ``CC=clang`` 或 ``LLVM=1`` 时编译内核一样。
+装LLVM；同在开启``LLVM=1`` 时编译内核一样。
 
 Linux发行版中可能会有合适的包，所以最好先检查一下。
 
@@ -94,7 +101,20 @@ bindgen
 
 通过以下方式安装它（注意，这将从源码下载并构建该工具）::
 
-	cargo install --locked --version $(scripts/min-tool-version.sh bindgen) bindgen
+	cargo install --locked --version $(scripts/min-tool-version.sh bindgen) bindgen-cli
+
+``bindgen`` 需要找到合适的 ``libclang`` 才能工作。如果没有找到（或者找到的
+``libclang`` 与应该使用的 ``libclang`` 不同），则可以使用 ``clang-sys``
+理解的环境变量（Rust绑定创建的 ``bindgen`` 用来访问 ``libclang``）:
+
+
+* ``LLVM_CONFIG_PATH`` 可以指向一个 ``llvm-config`` 可执行文件。
+
+* 或者 ``LIBCLANG_PATH`` 可以指向 ``libclang`` 共享库或包含它的目录。
+
+* 或者 ``CLANG_PATH`` 可以指向 ``clang`` 可执行文件。
+
+详情请参阅 ``clang-sys`` 的文档:
 
 
 开发依赖
@@ -163,7 +183,9 @@ rust-analyzer
 一起使用，以实现语法高亮、补全、转到定义和其他功能。
 
 ``rust-analyzer`` 需要一个配置文件， ``rust-project.json``, 它可以由 ``rust-analyzer``
-Make 目标生成。
+Make 目标生成::
+
+       make LLVM=1 rust-analyzer
 
 
 配置
@@ -189,10 +211,6 @@ Rust支持（CONFIG_RUST）需要在 ``General setup`` 菜单中启用。在其
 
 	make LLVM=1
 
-对于不支持完整LLVM工具链的架构，使用::
-
-	make CC=clang
-
 使用GCC对某些配置也是可行的，但目前它是非常试验性的。
 
 
-- 
2.31.4

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Miguel Ojeda]

On Fri, Apr 26, 2024 at 9:00 AM Yanteng Si <siyanteng@loongson.cn> wrote:
>
> v2:
> * As Miguel's comments, translate commit 01848eee20c6
>   into Chinese, as well as commit 81889e8523e6. By the way,
>   these two patches haven't appeared in the doc development
>   tree yet, maybe we could consider merging them into the
>   rust tree?

The former is in `rust-fixes`, which will be sent to Linus for this
cycle. So the English docs will be updated sooner than these updates,
if that is what you are asking.

For the other one, it is in the RISC-V tree and I assume it will be
sent into the next merge window. I don't know how you normally handle
that (i.e. translations being updated at the same time or after a
cycle), but either way, I am not sure why you would want them to be
merged into the Rust tree?

Thanks!

Cheers,
Miguel

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Yanteng Si]

在 2024/4/26 15:37, Miguel Ojeda 写道:
>> v2:
>> * As Miguel's comments, translate commit 01848eee20c6
>>    into Chinese, as well as commit 81889e8523e6. By the way,
>>    these two patches haven't appeared in the doc development
>>    tree yet, maybe we could consider merging them into the
>>    rust tree?
> The former is in `rust-fixes`, which will be sent to Linus for this
> cycle. So the English docs will be updated sooner than these updates,
> if that is what you are asking.

Well, it seems that we will have to wait for the doc tree, because the 
Chinese

translation is now carried out under the doc tree.

>
> For the other one, it is in the RISC-V tree and I assume it will be
> sent into the next merge window. I don't know how you normally handle
> that (i.e. translations being updated at the same time or after a
> cycle), but either way, I am not sure why you would want them to be
> merged into the Rust tree?

I'm thinking that I'm two commits ahead of the doc tree, it doesn't seem 
to fit

merge into the doc tree in this window, and there might be conflicts on

linux-next if I splite the patch out more.


Thanks,

Yanteng

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Miguel Ojeda]

On Fri, Apr 26, 2024 at 12:35 PM Yanteng Si <siyanteng@loongson.cn> wrote:
>
> I'm thinking that I'm two commits ahead of the doc tree, it doesn't seem
> to fit
>
> merge into the doc tree in this window, and there might be conflicts on
>
> linux-next if I splite the patch out more.

Hmm... I am not sure I follow -- conflicts with what? These patches
only change the translations and they all get applied by the doc tree,
right?

Cheers,
Miguel

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Jonathan Corbet]

Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> writes:

> On Fri, Apr 26, 2024 at 9:00 AM Yanteng Si <siyanteng@loongson.cn> wrote:
>>
>> v2:
>> * As Miguel's comments, translate commit 01848eee20c6
>>   into Chinese, as well as commit 81889e8523e6. By the way,
>>   these two patches haven't appeared in the doc development
>>   tree yet, maybe we could consider merging them into the
>>   rust tree?
>
> The former is in `rust-fixes`, which will be sent to Linus for this
> cycle. So the English docs will be updated sooner than these updates,
> if that is what you are asking.
>
> For the other one, it is in the RISC-V tree and I assume it will be
> sent into the next merge window. I don't know how you normally handle
> that (i.e. translations being updated at the same time or after a
> cycle), but either way, I am not sure why you would want them to be
> merged into the Rust tree?

I guess I don't see any reason why the translation couldn't go through
docs-next as usual?  It will all even out during the merge window,
right?  Or am I missing something?

Thanks,

jon

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Miguel Ojeda]

On Fri, Apr 26, 2024 at 3:42 PM Jonathan Corbet <corbet@lwn.net> wrote:
>
> I guess I don't see any reason why the translation couldn't go through
> docs-next as usual?  It will all even out during the merge window,
> right?  Or am I missing something?

Yeah, that is what I am thinking as well, although Yanteng is
mentioning conflicts somewhere, so I may be missing something too.

Cheers,
Miguel

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Yanteng Si]

在 2024/4/26 21:42, Jonathan Corbet 写道:
> Miguel Ojeda <miguel.ojeda.sandonis@gmail.com> writes:
>
>> On Fri, Apr 26, 2024 at 9:00 AM Yanteng Si <siyanteng@loongson.cn> wrote:
>>> v2:
>>> * As Miguel's comments, translate commit 01848eee20c6
>>>    into Chinese, as well as commit 81889e8523e6. By the way,
>>>    these two patches haven't appeared in the doc development
>>>    tree yet, maybe we could consider merging them into the
>>>    rust tree?
>> The former is in `rust-fixes`, which will be sent to Linus for this
>> cycle. So the English docs will be updated sooner than these updates,
>> if that is what you are asking.
>>
>> For the other one, it is in the RISC-V tree and I assume it will be
>> sent into the next merge window. I don't know how you normally handle
>> that (i.e. translations being updated at the same time or after a
>> cycle), but either way, I am not sure why you would want them to be
>> merged into the Rust tree?
> I guess I don't see any reason why the translation couldn't go through
> docs-next as usual?  It will all even out during the merge window,
> right?  Or am I missing something?

Yes, you're right.


I mean, in order of order, I should translate these two patches in the 
next window,

because these two patches are not merged into the doc tree yet, and if 
they are

merged into the doc tree, this may cause confusion for readers and 
reviewers.


That's why I mentioned it on the cover letter. Of course, it would be 
great if the

patch sets were  merged into the doc tree after reviewed.


Thanks,

Yanteng

>
>

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Yanteng Si]

在 2024/4/27 00:47, Miguel Ojeda 写道:
> On Fri, Apr 26, 2024 at 3:42 PM Jonathan Corbet <corbet@lwn.net> wrote:
>> I guess I don't see any reason why the translation couldn't go through
>> docs-next as usual?  It will all even out during the merge window,
>> right?  Or am I missing something?
> Yeah, that is what I am thinking as well, although Yanteng is
> mentioning conflicts somewhere, so I may be missing something too.
>
Sorry, I may have made a mistake, there are no conflicts in this patch set.


What I mean is that if I translate these two patches as two separate 
patches,

merge them into the rust tree, and then merge the rest of the patch set into

the doc tree, it might cause a conflict in the linux-next tree, because 
in order

of order, the two patches have to be applied after this patch set. I'm 
not sure

I've understood the whole process correctly.


Now that the two patches have become part of the patch set, there will be no

conflict no matter which tree is eventually merged into.



Thanks,

Yanteng

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Dongliang Mu]

On 2024/4/26 14:59, Yanteng Si wrote:
> v2:
> * As Miguel's comments, translate commit 01848eee20c6
>    into Chinese, as well as commit 81889e8523e6. By the way,
>    these two patches haven't appeared in the doc development
>    tree yet, maybe we could consider merging them into the
>    rust tree?
> * As Dongliang's comments, translation "在... 前添加" other
>    than "前缀".
>
> v1:
> The Chinese version of rust seems to be way behind,
> even though we did translate to Chinese at the beginning.
> Let's keep them up to date. :)

Looks good to me.

Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>

> Yanteng Si (4):
>    docs/zh_CN/rust: Update the translation of arch-support to 6.9-rc4
>    docs/zh_CN/rust: Update the translation of coding-guidelines to
>      6.9-rc4
>    docs/zh_CN/rust: Update the translation of general-information to
>      6.9-rc4
>    docs/zh_CN/rust: Update the translation of quick-start to 6.9-rc4
>
>   .../translations/zh_CN/rust/arch-support.rst  | 14 ++++--
>   .../zh_CN/rust/coding-guidelines.rst          | 12 +++++
>   .../zh_CN/rust/general-information.rst        |  2 +-
>   .../translations/zh_CN/rust/quick-start.rst   | 50 +++++++++++++------
>   4 files changed, 56 insertions(+), 22 deletions(-)
>

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Dongliang Mu]

On 2024/4/26 14:59, Yanteng Si wrote:
> v2:
> * As Miguel's comments, translate commit 01848eee20c6
>    into Chinese, as well as commit 81889e8523e6. By the way,
>    these two patches haven't appeared in the doc development
>    tree yet, maybe we could consider merging them into the
>    rust tree?
> * As Dongliang's comments, translation "在... 前添加" other
>    than "前缀".
>
> v1:
> The Chinese version of rust seems to be way behind,
> even though we did translate to Chinese at the beginning.
> Let's keep them up to date. :)

Looks good to me.

Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>

>
> Yanteng Si (4):
>    docs/zh_CN/rust: Update the translation of arch-support to 6.9-rc4
>    docs/zh_CN/rust: Update the translation of coding-guidelines to
>      6.9-rc4
>    docs/zh_CN/rust: Update the translation of general-information to
>      6.9-rc4
>    docs/zh_CN/rust: Update the translation of quick-start to 6.9-rc4
>
>   .../translations/zh_CN/rust/arch-support.rst  | 14 ++++--
>   .../zh_CN/rust/coding-guidelines.rst          | 12 +++++
>   .../zh_CN/rust/general-information.rst        |  2 +-
>   .../translations/zh_CN/rust/quick-start.rst   | 50 +++++++++++++------
>   4 files changed, 56 insertions(+), 22 deletions(-)
>

Re: [PATCH v2 1/4] docs/zh_CN/rust: Update the translation of arch-support to 6.9-rc4

[Dongliang Mu]

On 2024/4/26 14:59, Yanteng Si wrote:
> Update to commit 81889e8523e6 ("RISC-V: enable building
> 64-bit kernels with rust support")
> commit 01848eee20c6 ("docs: rust: fix improper rendering in
> Arch Supportpage")
> commit 724a75ac9542 ("arm64: rust: Enable Rust support
> for AArch64")
> commit 90868ff9cade ("LoongArch: Enable initial Rust support")
> commit e5e86572e3f2 ("rust: sort uml documentation arch support table")
> commit 04df97e150c8 ("Documentation: rust: Fix arch support table")
> commit 0438aadfa69a ("rust: arch/um: Add support for CONFIG_RUST
> under x86_64 UML")
>
> Signed-off-by: Yanteng Si <siyanteng@loongson.cn>

Looks good to me.

Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>

> ---
>   .../translations/zh_CN/rust/arch-support.rst       | 14 +++++++++-----
>   1 file changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/Documentation/translations/zh_CN/rust/arch-support.rst b/Documentation/translations/zh_CN/rust/arch-support.rst
> index afbd02afec45..abd708d48f82 100644
> --- a/Documentation/translations/zh_CN/rust/arch-support.rst
> +++ b/Documentation/translations/zh_CN/rust/arch-support.rst
> @@ -16,8 +16,12 @@
>   
>   下面是目前可以工作的架构的一般总结。支持程度与 ``MAINTAINERS`` 文件中的``S`` 值相对应:
>   
> -============  ================  ==============================================
> -架构          支持水平          限制因素
> -============  ================  ==============================================
> -``x86``       Maintained        只有 ``x86_64``
> -============  ================  ==============================================
> +=============  ================  ==============================================
> +架构           支持水平           限制因素
> +=============  ================  ==============================================
> +``arm64``      Maintained        只有小端序
> +``loongarch``  Maintained        \-
> +``riscv``      Maintained        只有 ``riscv64``
> +``um``         Maintained        只有 ``x86_64``
> +``x86``        Maintained        只有 ``x86_64``
> +=============  ================  ==============================================

Re: [PATCH v2 2/4] docs/zh_CN/rust: Update the translation of coding-guidelines to 6.9-rc4

[Dongliang Mu]

On 2024/4/26 14:59, Yanteng Si wrote:
> Update to commit bc2e7d5c298a ("rust: support `srctree`-relative links")
>
> Signed-off-by: Yanteng Si <siyanteng@loongson.cn>

Looks good to me.

Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>

> ---
>   .../translations/zh_CN/rust/coding-guidelines.rst    | 12 ++++++++++++
>   1 file changed, 12 insertions(+)
>
> diff --git a/Documentation/translations/zh_CN/rust/coding-guidelines.rst b/Documentation/translations/zh_CN/rust/coding-guidelines.rst
> index 6c0bdbbc5a2a..419143b938ed 100644
> --- a/Documentation/translations/zh_CN/rust/coding-guidelines.rst
> +++ b/Documentation/translations/zh_CN/rust/coding-guidelines.rst
> @@ -157,6 +157,18 @@ https://commonmark.org/help/
>   
>   	https://doc.rust-lang.org/rustdoc/how-to-write-documentation.html
>   
> +此外，内核支持通过在链接目标前添加 ``srctree/`` 来创建相对于源代码树的链接。例如:
> +
> +.. code-block:: rust
> +
> +       //! C header: [`include/linux/printk.h`](srctree/include/linux/printk.h)
> +
> +或者:
> +
> +.. code-block:: rust
> +
> +       /// [`struct mutex`]: srctree/include/linux/mutex.h
> +
>   
>   命名
>   ----

Re: [PATCH v2 3/4] docs/zh_CN/rust: Update the translation of general-information to 6.9-rc4

[Dongliang Mu]

On 2024/4/26 15:02, Yanteng Si wrote:
> Update to commit ba4abeb13d5e ("docs: rust: Move testing to a
> separate page")
> commit be412baf7240 ("docs: rust: Add rusttest info")
> commit bd9e54a42ce2 ("docs: rust: update Rust docs output path")
>
> Signed-off-by: Yanteng Si <siyanteng@loongson.cn>

Looks good to me.

Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>

> ---
>   Documentation/translations/zh_CN/rust/general-information.rst | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/Documentation/translations/zh_CN/rust/general-information.rst b/Documentation/translations/zh_CN/rust/general-information.rst
> index 6b91dfe1834a..251f6ee2bb44 100644
> --- a/Documentation/translations/zh_CN/rust/general-information.rst
> +++ b/Documentation/translations/zh_CN/rust/general-information.rst
> @@ -32,7 +32,7 @@ Rust内核代码使用其内置的文档生成器 ``rustdoc`` 进行记录。
>   
>   要在你的网络浏览器中本地阅读该文档，请运行如::
>   
> -	xdg-open rust/doc/kernel/index.html
> +	xdg-open Documentation/output/rust/rustdoc/kernel/index.html
>   
>   要了解如何编写文档，请看 coding-guidelines.rst 。
>   

Re: [PATCH v2 4/4] docs/zh_CN/rust: Update the translation of quick-start to 6.9-rc4

[Dongliang Mu]

On 2024/4/26 15:02, Yanteng Si wrote:
> Update to commit 711cbfc71765 ("docs: rust: Clarify that 'rustup
> override' applies to build directory")
> commit 7583ce66ddf7 ("docs: rust: remove `CC=clang` mentions")
> commit 2285eb2f2429 ("docs: rust: clarify what 'rustup override' does")
> commit 8cb40124cf92 ("docs: rust: update instructions for obtaining
> 'core' source")
> commit b603c6cc405a ("docs: rust: add command line to rust-analyzer
> section")
> commit 08ab786556ff ("rust: bindgen: upgrade to 0.65.1")
> commit eae90172c5b8 ("docs: rust: add paragraph about finding a
> suitable `libclang`")
> commit 6883b29c6cae ("docs: rust: point directly to the standalone
> installers")
>
> Signed-off-by: Yanteng Si <siyanteng@loongson.cn>

Looks good to me.

Reviewed-by: Dongliang Mu <dzm91@hust.edu.cn>

> ---
>   .../translations/zh_CN/rust/quick-start.rst   | 50 +++++++++++++------
>   1 file changed, 34 insertions(+), 16 deletions(-)
>
> diff --git a/Documentation/translations/zh_CN/rust/quick-start.rst b/Documentation/translations/zh_CN/rust/quick-start.rst
> index a4b8e8a50a89..8616556ae4d7 100644
> --- a/Documentation/translations/zh_CN/rust/quick-start.rst
> +++ b/Documentation/translations/zh_CN/rust/quick-start.rst
> @@ -37,13 +37,18 @@ rustc
>   需要一个特定版本的Rust编译器。较新的版本可能会也可能不会工作，因为就目前而言，内核依赖
>   于一些不稳定的Rust特性。
>   
> -如果使用的是 ``rustup`` ，请进入检出的源代码目录并运行::
> +如果使用的是 ``rustup`` ，请进入内核编译目录（或者用 ``--path=<build-dir>`` 参数
> +来 ``设置`` sub-command)并运行::
>   
>   	rustup override set $(scripts/min-tool-version.sh rustc)
>   
> -或者从以下网址获取一个独立的安装程序或安装 ``rustup`` ：
> ++这将配置你的工作目录使用正确版本的 ``rustc``，而不影响你的默认工具链。
>   
> -	https://www.rust-lang.org
> +请注意覆盖应用当前的工作目录（和它的子目录）。
> +
> +如果你使用 ``rustup``， 可以从下面的链接拉取一个单独的安装程序:
> +
> +	https://forge.rust-lang.org/infra/other-installation-methods.html#standalone
>   
>   
>   Rust标准库源代码
> @@ -57,21 +62,23 @@ Rust标准库的源代码是必需的，因为构建系统会交叉编译 ``core
>   
>   这些组件是按工具链安装的，因此以后升级Rust编译器版本需要重新添加组件。
>   
> -否则，如果使用独立的安装程序，可以将Rust仓库克隆到工具链的安装文件夹中::
> +否则，如果使用独立的安装程序，可以将Rust源码树下载到安装工具链的文件夹中::
>   
> -	git clone --recurse-submodules \
> -		--branch $(scripts/min-tool-version.sh rustc) \
> -		https://github.com/rust-lang/rust \
> -		$(rustc --print sysroot)/lib/rustlib/src/rust
> +       curl -L "https://static.rust-lang.org/dist/rust-src-$(scripts/min-tool-version.sh rustc).tar.gz" |
> +               tar -xzf - -C "$(rustc --print sysroot)/lib" \
> +               "rust-src-$(scripts/min-tool-version.sh rustc)/rust-src/lib/" \
> +               --strip-components=3
>   
> -在这种情况下，以后升级Rust编译器版本需要手动更新这个克隆的仓库。
> +在这种情况下，以后升级Rust编译器版本需要手动更新这个源代码树（这可以通过移除
> +``$(rustc --print sysroot)/lib/rustlib/src/rust`` ，然后重新执行上
> +面的命令做到）。
>   
>   
>   libclang
>   ********
>   
>   ``bindgen`` 使用 ``libclang`` （LLVM的一部分）来理解内核中的C代码，这意味着需要安
> -装LLVM；同在开启 ``CC=clang`` 或 ``LLVM=1`` 时编译内核一样。
> +装LLVM；同在开启``LLVM=1`` 时编译内核一样。
>   
>   Linux发行版中可能会有合适的包，所以最好先检查一下。
>   
> @@ -94,7 +101,20 @@ bindgen
>   
>   通过以下方式安装它（注意，这将从源码下载并构建该工具）::
>   
> -	cargo install --locked --version $(scripts/min-tool-version.sh bindgen) bindgen
> +	cargo install --locked --version $(scripts/min-tool-version.sh bindgen) bindgen-cli
> +
> +``bindgen`` 需要找到合适的 ``libclang`` 才能工作。如果没有找到（或者找到的
> +``libclang`` 与应该使用的 ``libclang`` 不同），则可以使用 ``clang-sys``
> +理解的环境变量（Rust绑定创建的 ``bindgen`` 用来访问 ``libclang``）:
> +
> +
> +* ``LLVM_CONFIG_PATH`` 可以指向一个 ``llvm-config`` 可执行文件。
> +
> +* 或者 ``LIBCLANG_PATH`` 可以指向 ``libclang`` 共享库或包含它的目录。
> +
> +* 或者 ``CLANG_PATH`` 可以指向 ``clang`` 可执行文件。
> +
> +详情请参阅 ``clang-sys`` 的文档:
>   
>   
>   开发依赖
> @@ -163,7 +183,9 @@ rust-analyzer
>   一起使用，以实现语法高亮、补全、转到定义和其他功能。
>   
>   ``rust-analyzer`` 需要一个配置文件， ``rust-project.json``, 它可以由 ``rust-analyzer``
> -Make 目标生成。
> +Make 目标生成::
> +
> +       make LLVM=1 rust-analyzer
>   
>   
>   配置
> @@ -189,10 +211,6 @@ Rust支持（CONFIG_RUST）需要在 ``General setup`` 菜单中启用。在其
>   
>   	make LLVM=1
>   
> -对于不支持完整LLVM工具链的架构，使用::
> -
> -	make CC=clang
> -
>   使用GCC对某些配置也是可行的，但目前它是非常试验性的。
>   
>   

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Miguel Ojeda]

On Sat, Apr 27, 2024 at 6:38 AM Yanteng Si <siyanteng@loongson.cn> wrote:
>
> What I mean is that if I translate these two patches as two separate
> patches,

Ah, I see. As far as I know and from a quick look at the history, the
translations try to be in sync with the latest non-translated status
at their own pace, and they don't mimic the development of the
non-translated side commit-by-commit.

So I don't think particular commits should be translated as separate
patches. In other words, what you did here in this v2 seems fine,
since it already contains the "final state".

Of course, there is a small risk of going out of sync with the current
patch series if e.g. the RISC-V PR does not get eventually merged in
the next merge window. This is why I mentioned that I am not sure what
the policy is for translations here (e.g. there may be a requirement
that patches to be applied to translations have been already applied
to mainline, in which case you may want to send the RISC-V bit later
-- but I don't know what the actual policy is).

Thanks!

Cheers,
Miguel

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Yanteng Si]

在 2024/4/27 15:06, Miguel Ojeda 写道:
> On Sat, Apr 27, 2024 at 6:38 AM Yanteng Si <siyanteng@loongson.cn> wrote:
>> What I mean is that if I translate these two patches as two separate
>> patches,
> Ah, I see. As far as I know and from a quick look at the history, the
> translations try to be in sync with the latest non-translated status
> at their own pace, and they don't mimic the development of the
> non-translated side commit-by-commit.
>
> So I don't think particular commits should be translated as separate
> patches. In other words, what you did here in this v2 seems fine,
> since it already contains the "final state".
>
> Of course, there is a small risk of going out of sync with the current
> patch series if e.g. the RISC-V PR does not get eventually merged in
> the next merge window. This is why I mentioned that I am not sure what
> the policy is for translations here (e.g. there may be a requirement
> that patches to be applied to translations have been already applied
> to mainline, in which case you may want to send the RISC-V bit later
> -- but I don't know what the actual policy is).
>
Yes, our current update policy is a bit vague. Most of the time, this is

consistent with the latest state of the linux-next tree, but in the future

it may tend to be consistent with the latest state of the doc tree, Would

avoid the situation you're talking about with riscv.


The optimal solution is always to provide both Chinese and English

modifications. :)


Thanks,

Yanteng

Re: [PATCH v2 0/4] rust: docs: Update the translation of rust to 6.9-rc4

[Jonathan Corbet]

Yanteng Si <siyanteng@loongson.cn> writes:

> v2:
> * As Miguel's comments, translate commit 01848eee20c6
>   into Chinese, as well as commit 81889e8523e6. By the way,
>   these two patches haven't appeared in the doc development
>   tree yet, maybe we could consider merging them into the
>   rust tree?
> * As Dongliang's comments, translation "在... 前添加" other
>   than "前缀".
>
> v1:
> The Chinese version of rust seems to be way behind,
> even though we did translate to Chinese at the beginning.
> Let's keep them up to date. :)
>
> Yanteng Si (4):
>   docs/zh_CN/rust: Update the translation of arch-support to 6.9-rc4
>   docs/zh_CN/rust: Update the translation of coding-guidelines to
>     6.9-rc4
>   docs/zh_CN/rust: Update the translation of general-information to
>     6.9-rc4
>   docs/zh_CN/rust: Update the translation of quick-start to 6.9-rc4
>
>  .../translations/zh_CN/rust/arch-support.rst  | 14 ++++--
>  .../zh_CN/rust/coding-guidelines.rst          | 12 +++++
>  .../zh_CN/rust/general-information.rst        |  2 +-
>  .../translations/zh_CN/rust/quick-start.rst   | 50 +++++++++++++------
>  4 files changed, 56 insertions(+), 22 deletions(-)

Series applied, thanks.

jon