Skip to content

Commit b01678e

Browse files
committed
Merge branch '⬆️-deps' into 🦆
- Not upgrading `env_logger` to 0.8.2 because `quickcheck` depends on `env_logger` version 0.7.x. - Not upgrading `tokio` to 0.3.6 because `tokio-serial` depends on `tokyo` 0.2.x. - Not upgrading `goblin` to 0.3.0 because `probe-rs` 0.10.1 depends on `goblin` 0.2.x. - Not upgrading `probe-rs-rtt` to 0.10.1 because I can't test it right now. - Not upgrading `rtt-target` to 0.3.0 because `panic-rtt-target` 0.1.1 depends on `rtt-target` 0.2.x.
2 parents 7be9372 + d1d878d commit b01678e

File tree

7 files changed

+33
-39
lines changed

7 files changed

+33
-39
lines changed

Cargo.lock

Lines changed: 24 additions & 30 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/r3_port_arm/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ preload-registers = []
1616
r3_portkit = { version = "0.1.0", path = "../r3_portkit" }
1717
r3 = { version = "0.1.0", path = "../r3" }
1818

19-
register = "0.5.1"
20-
r0 = "0.2.2"
19+
register = ">= 0.5.1, < 2.0.0"
20+
r0 = "1.0.0"
2121

2222
[package.metadata.docs.rs]
2323
targets = []

src/r3_port_arm_test_driver/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ arm_semihosting = { path = "../arm_semihosting", optional = true }
3838
r3 = { path = "../r3", optional = true }
3939

4040
staticvec = { version = "0.10.5", optional = true, default-features = false }
41-
register = { version = "0.5.1", optional = true }
41+
register = { version = ">= 0.5.1, < 2.0.0", optional = true }
4242
rza1 = { version = "0.2.0", optional = true, features = ["cpg", "gpio", "scif"] }
4343
log = { version = "0.4.8", optional = true }
4444

src/r3_port_riscv/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ preload-registers = []
1818
r3_portkit = { version = "0.1.1", path = "../r3_portkit" }
1919
r3 = { version = "0.1.1", path = "../r3" }
2020

21-
register = { version = "0.5.1" }
21+
register = { version = ">= 0.5.1, < 2.0.0" }
2222
riscv-rt = { version = ">= 0.6.0, < 0.9.0" }
2323
riscv = { version = ">= 0.5.0, < 0.7.0" }
2424

src/r3_port_riscv_test_driver/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ r3_portkit = { path = "../r3_portkit", optional = true }
5858
r3 = { path = "../r3", optional = true }
5959

6060
rtt-target = { version = "0.2.0", optional = true }
61-
e310x-hal = { version = "0.8.3", optional = true, features = ["g002"] }
61+
e310x-hal = { version = "0.9.0", optional = true, features = ["g002"] }
6262
k210-hal = { version = "0.2.0", optional = true }
6363
riscv-rt = { version = ">= 0.6.0, < 0.9.0", optional = true }
64-
e310x = { version = "0.8.1", optional = true }
64+
e310x = { version = "0.9.0", optional = true }
6565
riscv = { version = ">= 0.5.0, < 0.7.0", optional = true }
6666
log = { version = "0.4.8", optional = true }
67-
nb = { version = "0.1.3", optional = true }
67+
nb = { version = "1.0.0", optional = true }
6868

6969
[dependencies.r3_test_suite]
7070
path = "../r3_test_suite"

src/r3_support_rza1/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ r3 = { version = "0.1.0", path = "../r3" }
2525

2626
embedded-hal = { version = "0.2.4", optional = true }
2727
rza1 = { version = "0.2.0", features = ["ostm"] }
28-
nb = { version = "0.1.2", optional = true }
28+
nb = { version = "1.0.0", optional = true }
2929

3030
[package.metadata.docs.rs]
3131
targets = []

src/r3_test_suite/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ r3 = { version = "0.1.0", path = "../r3" }
2828

2929
assert_matches = { version = "1.4.0" }
3030
staticvec = { version = "0.10.5", default-features = false }
31-
wyhash = { version = "0.3.0" }
31+
wyhash = { version = "0.5.0" }
3232
log = { version = "0.4.8" }
3333

3434
[dev-dependencies]

0 commit comments

Comments
 (0)