From ccbaea82aa6a55f6774b6eccad975382900f86d9 Mon Sep 17 00:00:00 2001 From: Jonas Jacobsson <01joja@gmail.com> Date: Tue, 27 Sep 2022 15:29:03 +0000 Subject: [PATCH 1/2] .toml and note aboute target --- .cargo/{config => config.toml} | 0 book/en/src/by-example.md | 6 ++++++ book/en/src/by-example/app_init.md | 6 ------ 3 files changed, 6 insertions(+), 6 deletions(-) rename .cargo/{config => config.toml} (100%) diff --git a/.cargo/config b/.cargo/config.toml similarity index 100% rename from .cargo/config rename to .cargo/config.toml diff --git a/book/en/src/by-example.md b/book/en/src/by-example.md index 3a523e51bb..419a4bae64 100644 --- a/book/en/src/by-example.md +++ b/book/en/src/by-example.md @@ -30,3 +30,9 @@ Yields this output: ``` console {{#include ../../../ci/expected/locals.run}} ``` + +> **NOTE**: You can choose target device by passing a target +> triple to cargo (e.g. `cargo run --example init --target thumbv7m-none-eabi`) or +> configure a default target in `.cargo/config.toml`. +> +> For running the examples, we use a Cortex M3 emulated in QEMU, so the target is `thumbv7m-none-eabi`. \ No newline at end of file diff --git a/book/en/src/by-example/app_init.md b/book/en/src/by-example/app_init.md index 615c299102..22c4a28ade 100644 --- a/book/en/src/by-example/app_init.md +++ b/book/en/src/by-example/app_init.md @@ -28,9 +28,3 @@ Running the example will print `init` to the console and then exit the QEMU proc $ cargo run --target thumbv7m-none-eabi --example init {{#include ../../../../ci/expected/init.run}} ``` - -> **NOTE**: You can choose target device by passing a target -> triple to cargo (e.g. `cargo run --example init --target thumbv7m-none-eabi`) or -> configure a default target in `.cargo/config.toml`. -> -> For running the examples, we use a Cortex M3 emulated in QEMU, so the target is `thumbv7m-none-eabi`. From ea6f824ad2fc02a21383e86baeaa7372ee9909e0 Mon Sep 17 00:00:00 2001 From: Jonas Jacobsson <01joja@gmail.com> Date: Tue, 27 Sep 2022 15:37:54 +0000 Subject: [PATCH 2/2] added .toml to .cargo/config in book --- book/ru/src/by-example/new.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/ru/src/by-example/new.md b/book/ru/src/by-example/new.md index fcf523701a..0ff8d986e9 100644 --- a/book/ru/src/by-example/new.md +++ b/book/ru/src/by-example/new.md @@ -78,7 +78,7 @@ $ cargo add panic-semihosting 5. Соберите его, загрузите в микроконтроллер и запустите. ``` console -$ # ПРИМЕЧАНИЕ: Я раскомментировал опцию `runner` в `.cargo/config` +$ # ПРИМЕЧАНИЕ: Я раскомментировал опцию `runner` в `.cargo/config.toml` $ cargo run {{#include ../../../../ci/expected/init.run}} ```