Skip to content

Commit 3132ecd

Browse files
bors[bot]wpd
andauthored
Merge #328
328: Fix breaking change in cortex-m 0.5.11. r=adamgreig a=wpd Fix it by sticking with cortex-m 0.5.6. See discussion at #327. This is a much simpler (and certainly more hackish) solution than is proposed in #267. But it doesn't require `unsafe` code nor a custom `memory.x` file, and might fill the gap until the book is rewritten. Co-authored-by: Patrick Doyle <wpdster@gmail.com>
2 parents 5747303 + 574029e commit 3132ecd

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/11-usart/auxiliary/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name = "aux11"
55
version = "0.1.0"
66

77
[dependencies]
8-
cortex-m = "0.5.6"
8+
cortex-m = "=0.5.6" # 0.5.11 introduces a breaking change. Use 0.5.6, since we know it works for this example
99
cortex-m-rt = "0.6.3"
1010
panic-itm = "0.4.0"
1111

src/14-i2c/auxiliary/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name = "aux14"
55
version = "0.1.0"
66

77
[dependencies]
8-
cortex-m = "0.6.3"
8+
cortex-m = "=0.5.6"
99
cortex-m-rt = "0.6.3"
1010
panic-itm = "0.4.0"
1111

src/15-led-compass/auxiliary/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name = "aux15"
55
version = "0.1.0"
66

77
[dependencies]
8-
cortex-m = "0.6.3"
8+
cortex-m = "=0.5.6"
99
cortex-m-rt = "0.6.3"
1010
panic-itm = "0.4.0"
1111

0 commit comments

Comments
 (0)