Skip to content

Commit 22733be

Browse files
authored
changed config to config.toml
1 parent 2c7827a commit 22733be

File tree

3 files changed

+13
-13
lines changed

3 files changed

+13
-13
lines changed

src/logging.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,15 +133,15 @@ optimizing the program. Let's check that.
133133

134134
> **PROTIP** You can set `target.thumbv7m-none-eabi.runner` to the long QEMU
135135
> command from before (`qemu-system-arm -cpu (..) -kernel`) in the Cargo
136-
> configuration file (`.cargo/conifg`) to have `cargo run` use that *runner* to
136+
> configuration file (`.cargo/conifg.toml`) to have `cargo run` use that *runner* to
137137
> execute the output binary.
138138
139139
``` console
140-
$ head -n2 .cargo/config
140+
$ head -n2 .cargo/config.toml
141141
```
142142

143143
``` toml
144-
{{#include ../ci/logging/app/.cargo/config:1:2}}
144+
{{#include ../ci/logging/app/.cargo/config.toml:1:2}}
145145
```
146146

147147
``` console
@@ -217,11 +217,11 @@ Before you run this you'll have to append `-Tlog.x` to the arguments passed to
217217
the linker. That can be done in the Cargo configuration file.
218218

219219
``` console
220-
$ cat .cargo/config
220+
$ cat .cargo/config.toml
221221
```
222222

223223
``` toml
224-
{{#include ../ci/logging/app2/.cargo/config}}
224+
{{#include ../ci/logging/app2/.cargo/config.toml}}
225225
```
226226

227227
Now you can run it! Since the output now has a binary format we'll pipe it

src/memory-layout.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ We have to tweak the linker process to make it use our linker script. This is do
174174
passing the `-C link-arg` flag to `rustc`. This can be done with `cargo-rustc` or
175175
`cargo-build`.
176176

177-
**IMPORTANT**: Make sure you have the `.cargo/config` file that was added at the
177+
**IMPORTANT**: Make sure you have the `.cargo/config.toml` file that was added at the
178178
end of the last section before running this command.
179179

180180
Using the `cargo-rustc` subcommand:
@@ -183,17 +183,17 @@ Using the `cargo-rustc` subcommand:
183183
$ cargo rustc -- -C link-arg=-Tlink.x
184184
```
185185

186-
Or you can set the rustflags in `.cargo/config` and continue using the
186+
Or you can set the rustflags in `.cargo/config.toml` and continue using the
187187
`cargo-build` subcommand. We'll do the latter because it better integrates with
188188
`cargo-binutils`.
189189

190190
``` console
191-
# modify .cargo/config so it has these contents
192-
$ cat .cargo/config
191+
# modify .cargo/config.toml so it has these contents
192+
$ cat .cargo/config.toml
193193
```
194194

195195
``` toml
196-
{{#include ../ci/memory-layout/.cargo/config}}
196+
{{#include ../ci/memory-layout/.cargo/config.toml}}
197197
```
198198

199199
The `[target.thumbv7m-none-eabi]` part says that these flags will only be used

src/smallest-no-std.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ Cargo invocation.
9898
``` console
9999
$ mkdir .cargo
100100

101-
$ # modify .cargo/config so it has these contents
102-
$ cat .cargo/config
101+
$ # modify .cargo/config.toml so it has these contents
102+
$ cat .cargo/config.toml
103103
```
104104

105105
``` toml
106-
{{#include ../ci/smallest-no-std/.cargo/config}}
106+
{{#include ../ci/smallest-no-std/.cargo/config.toml}}
107107
```
108108

109109
## eh_personality

0 commit comments

Comments
 (0)