diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-09-28 18:49:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-28 18:49:50 +0000 |
| commit | a79cc083803d126d90d1bb28af61dc6b168a0d41 (patch) | |
| tree | 4c242a8a2ff99c78e1400fe0d2f7adbc462a9e01 /book | |
| parent | 0539c3ca1a5e2d8ec3409e519c375ae4cef56341 (diff) | |
| parent | ea6f824ad2fc02a21383e86baeaa7372ee9909e0 (diff) | |
Merge #660
660: Clarify r=AfoHT a=01joja
I made 3 suggested changes
- `.cargo/config` -> `.cargo/config.toml`. Now extensions for vs code recognizes that it is a toml-file.
- Moved a note about how to configure target in cargo.toml to by-example.md from app_init.md.
- changed all occurrences of `.cargo/config` to `.cargo/config.toml` in the ru and eng version of the book.
Co-authored-by: Jonas Jacobsson <01joja@gmail.com>
Diffstat (limited to 'book')
| -rw-r--r-- | book/en/src/by-example.md | 6 | ||||
| -rw-r--r-- | book/en/src/by-example/app_init.md | 6 | ||||
| -rw-r--r-- | book/ru/src/by-example/new.md | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/book/en/src/by-example.md b/book/en/src/by-example.md index 3a523e5..419a4ba 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 615c299..22c4a28 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`. diff --git a/book/ru/src/by-example/new.md b/book/ru/src/by-example/new.md index fcf5237..0ff8d98 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}} ``` |