Merge #132

bors[bot] · adamgreen · bors[bot] · commit 54ae5e711a0d · 2018-10-24T07:53:09.000Z
132: Update .cargo/config diff baseline r=adamgreig a=adamgreen

The diff in 06-hello-world/README.md for changes to be made to
.cargo/config are based off of an older version of the config file than
what is found in the repository currently.

Co-authored-by: Adam Green &lt;adamgreen@users.noreply.github.com&gt;
diff --git a/src/05-led-roulette/.cargo/config b/src/05-led-roulette/.cargo/config
@@ -1,6 +1,5 @@
 [target.thumbv7em-none-eabihf]
 runner = "arm-none-eabi-gdb -q"
 rustflags = [
-  "-C", "linker=rust-lld",
   "-C", "link-arg=-Tlink.x",
 ]
diff --git a/src/05-led-roulette/the-challenge.md b/src/05-led-roulette/the-challenge.md
@@ -49,7 +49,6 @@ $ cat .cargo/config
 [target.thumbv7em-none-eabihf]
 runner = "arm-none-eabi-gdb -q -x openocd.gdb" # <-
 rustflags = [
-  "-C", "linker=rust-lld",
   "-C", "link-arg=-Tlink.x",
 ]
 ```
diff --git a/src/06-hello-world/.cargo/config b/src/06-hello-world/.cargo/config
@@ -1,6 +1,5 @@
 [target.thumbv7em-none-eabihf]
 runner = "arm-none-eabi-gdb -q -x openocd.gdb"
 rustflags = [
-  "-C", "linker=rust-lld",
   "-C", "link-arg=-Tlink.x",
 ]
diff --git a/src/06-hello-world/README.md b/src/06-hello-world/README.md
@@ -77,11 +77,9 @@ default target in .cargo/config:
 
 ``` diff
  [target.thumbv7em-none-eabihf]
- runner = "arm-none-eabi-gdb"
+ runner = "arm-none-eabi-gdb -q -x openocd.gdb"
  rustflags = [
    "-C", "link-arg=-Tlink.x",
-   "-C", "linker=arm-none-eabi-ld",
-   "-Z", "linker-flavor=ld",
  ]
 
 +[build]
diff --git a/src/07-registers/.cargo/config b/src/07-registers/.cargo/config
@@ -1,7 +1,6 @@
 [target.thumbv7em-none-eabihf]
 runner = "arm-none-eabi-gdb -q -x openocd.gdb"
 rustflags = [
-  "-C", "linker=rust-lld",
   "-C", "link-arg=-Tlink.x",
 ]
 
diff --git a/src/08-leds-again/.cargo/config b/src/08-leds-again/.cargo/config
@@ -1,7 +1,6 @@
 [target.thumbv7em-none-eabihf]
 runner = "arm-none-eabi-gdb -q -x openocd.gdb"
 rustflags = [
-  "-C", "linker=rust-lld",
   "-C", "link-arg=-Tlink.x",
 ]
 
diff --git a/src/09-clocks-and-timers/.cargo/config b/src/09-clocks-and-timers/.cargo/config
@@ -1,7 +1,6 @@
 [target.thumbv7em-none-eabihf]
 runner = "arm-none-eabi-gdb -q -x openocd.gdb"
 rustflags = [
-  "-C", "linker=rust-lld",
   "-C", "link-arg=-Tlink.x",
 ]
 
diff --git a/src/11-usart/.cargo/config b/src/11-usart/.cargo/config
@@ -1,7 +1,6 @@
 [target.thumbv7em-none-eabihf]
 runner = "arm-none-eabi-gdb -q -x openocd.gdb"
 rustflags = [
-  "-C", "linker=rust-lld",
   "-C", "link-arg=-Tlink.x",
 ]
 
diff --git a/src/14-i2c/.cargo/config b/src/14-i2c/.cargo/config
@@ -1,7 +1,6 @@
 [target.thumbv7em-none-eabihf]
 runner = "arm-none-eabi-gdb -q -x openocd.gdb"
 rustflags = [
-  "-C", "linker=rust-lld",
   "-C", "link-arg=-Tlink.x",
 ]
 
diff --git a/src/15-led-compass/.cargo/config b/src/15-led-compass/.cargo/config
@@ -1,7 +1,6 @@
 [target.thumbv7em-none-eabihf]
 runner = "arm-none-eabi-gdb -q -x openocd.gdb"
 rustflags = [
-  "-C", "linker=rust-lld",
   "-C", "link-arg=-Tlink.x",
 ]
 
diff --git a/src/16-punch-o-meter/.cargo/config b/src/16-punch-o-meter/.cargo/config
@@ -1,7 +1,6 @@
 [target.thumbv7em-none-eabihf]
 runner = "arm-none-eabi-gdb -q -x openocd.gdb"
 rustflags = [
-  "-C", "linker=rust-lld",
   "-C", "link-arg=-Tlink.x",
 ]
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`[target.thumbv7em-none-eabihf]`
`2`	`2`	`runner = "arm-none-eabi-gdb -q"`
`3`	`3`	`rustflags = [`
`4`		`- "-C", "linker=rust-lld",`
`5`	`4`	`"-C", "link-arg=-Tlink.x",`
`6`	`5`	`]`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,6 @@ $ cat .cargo/config`
`49`	`49`	`[target.thumbv7em-none-eabihf]`
`50`	`50`	`runner = "arm-none-eabi-gdb -q -x openocd.gdb" # <-`
`51`	`51`	`rustflags = [`
`52`		`- "-C", "linker=rust-lld",`
`53`	`52`	`"-C", "link-arg=-Tlink.x",`
`54`	`53`	`]`
`55`	`54`	```
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`[target.thumbv7em-none-eabihf]`
`2`	`2`	`runner = "arm-none-eabi-gdb -q -x openocd.gdb"`
`3`	`3`	`rustflags = [`
`4`		`- "-C", "linker=rust-lld",`
`5`	`4`	`"-C", "link-arg=-Tlink.x",`
`6`	`5`	`]`
`7`	`6`