Skip to content

Commit c0c13ca

Browse files
committed
Update remaining crates to edition 2021.
MSRV needs to move to 1.71 for this to work since there are deps that depend on that version.
1 parent 9a8d831 commit c0c13ca

10 files changed

Lines changed: 18 additions & 18 deletions

File tree

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
include:
1818
# Test MSRV
19-
- rust: 1.61.0
19+
- rust: 1.71.0
2020

2121
# Test nightly but don't fail
2222
- rust: nightly
@@ -27,8 +27,8 @@ jobs:
2727
with:
2828
toolchain: ${{ matrix.rust }}
2929
- name: Run tests
30-
if: ${{ matrix.rust != '1.61.0' }}
30+
if: ${{ matrix.rust >= '1.81.0' }}
3131
run: cargo test --all --exclude cortex-m-rt --exclude testsuite --features cortex-m/critical-section-single-core
32-
- name: Run tests for 1.61.0 (need to exclude cortex-m-types)
33-
if: ${{ matrix.rust == '1.61.0' }}
32+
- name: Run tests for 1.68.0 (need to exclude cortex-m-types)
33+
if: ${{ matrix.rust <= '1.81.0' }}
3434
run: cargo test --all --exclude cortex-m-rt --exclude testsuite --exclude cortex-m-types --features cortex-m/critical-section-single-core

.github/workflows/rt-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
continue-on-error: ${{ matrix.experimental || false }}
1212
strategy:
1313
matrix:
14-
rust: [nightly, stable, 1.61.0]
14+
rust: [nightly, stable, 1.71.0]
1515

1616
include:
1717
# Nightly is only for reference and allowed to fail

cortex-m-rt/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ version = "0.7.5"
1616
autoexamples = true
1717
links = "cortex-m-rt" # Prevent multiple versions of cortex-m-rt being linked
1818
edition = "2021"
19-
rust-version = "1.61"
19+
rust-version = "1.71"
2020

2121
[dependencies]
2222
cortex-m-rt-macros = { path = "macros", version = "=0.7.5" }

cortex-m-rt/macros/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ name = "cortex-m-rt-macros"
99
repository = "https://github.com/rust-embedded/cortex-m"
1010
version = "0.7.5"
1111
edition = "2021"
12-
rust-version = "1.61"
12+
rust-version = "1.71"
1313

1414
[lib]
1515
proc-macro = true

cortex-m-semihosting/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ readme = "README.md"
1313
repository = "https://github.com/rust-embedded/cortex-m"
1414
version = "0.5.0"
1515
edition = "2021"
16-
rust-version = "1.61"
16+
rust-version = "1.71"
1717

1818
[features]
1919
jlink-quirks = []

cortex-m/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ license = "MIT OR Apache-2.0"
1111
name = "cortex-m"
1212
readme = "README.md"
1313
repository = "https://github.com/rust-embedded/cortex-m"
14-
version = "0.7.7"
15-
edition = "2018"
14+
version = "0.7.8"
15+
edition = "2021"
1616
links = "cortex-m" # prevent multiple versions of this crate to be linked together
17-
rust-version = "1.61"
17+
rust-version = "1.71"
1818

1919
[dependencies]
2020
bare-metal = { version = "0.2.4", features = ["const-fn"] }

panic-itm/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ keywords = ["panic-impl", "panic-handler", "ITM", "ARM", "Cortex-M"]
1010
license = "MIT OR Apache-2.0"
1111
name = "panic-itm"
1212
repository = "https://github.com/rust-embedded/cortex-m"
13-
version = "0.4.2"
14-
edition = "2018"
13+
version = "0.4.3"
14+
edition = "2021"
1515

1616
[dependencies]
1717
cortex-m = { path = "../cortex-m", version = ">= 0.5.8, < 0.8" }

panic-semihosting/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ license = "MIT OR Apache-2.0"
1111
name = "panic-semihosting"
1212
repository = "https://github.com/rust-embedded/cortex-m"
1313
version = "0.6.0"
14-
rust-version = "1.61"
14+
rust-version = "1.71"
1515
edition = "2021"
1616

1717
[dependencies]

testsuite/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
authors = ["The Cortex-M Team <cortex-m@teams.rust-embedded.org>"]
33
name = "testsuite"
44
publish = false
5-
edition = "2018"
6-
version = "0.1.0"
5+
edition = "2021"
6+
version = "0.1.1"
77

88
[features]
99
rtt = ["rtt-target", "minitest/rtt"]

xtask/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[package]
22
name = "xtask"
3-
version = "0.0.0"
3+
version = "0.0.1"
44
authors = ["The Cortex-M Team <cortex-m@teams.rust-embedded.org>"]
5-
edition = "2018"
5+
edition = "2021"
66
publish = false
77

88
[[test]]

0 commit comments

Comments
 (0)