M-Labs/artiq-zynq
10
1
Fork 19
Code Issues 12 Pull Requests Releases Wiki Activity

bump rustc, llvm #348

Merged
sb10q merged 11 commits from srenblad/artiq-zynq:bump_to_llvm13 into master 2024-12-23 10:46:46 +08:00
Conversation 2 Commits 11 Files Changed 17 +7 -7
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0021a01bdf - Show all commits

2
src/libboard_artiq/Cargo.toml.tpl
View File

@ -20,7 +20,7 @@ build_zynq = { path = "../libbuild_zynq" }
log = "0.4"
log_buffer = { version = "1.2" }
crc = { version = "1.7", default-features = false }
core_io = { version = "0.1", features = ["collections"] }
core_io = { git = "https://git.m-labs.hk/M-Labs/rs-core_io.git", rev = "e9d3edf027", features = ["collections"] }
mwojcik commented 2024-12-23 07:09:31 +08:00
Review
Copy Link

What does that patch do?

What does that patch do?
srenblad commented 2024-12-23 09:35:54 +08:00
Review
Copy Link

core_io is unmaintained and locked to the rustc versions already supported due to how the repo is maintained using scripts and patches from std::io. It is probably the biggest blocker for bumping the rust version, due to also being a dependency of rust-fatfs in zynq-rs.

`core_io` is unmaintained and locked to the rustc versions already supported due to how the repo is maintained using scripts and patches from `std::io`. It is probably the biggest blocker for bumping the rust version, due to also being a dependency of `rust-fatfs` in `zynq-rs`.
👍 1
embedded-hal = "0.2"
nb = "1.0"
void = { version = "1", default-features = false }

2
src/libio/Cargo.toml.tpl
View File

@ -8,7 +8,7 @@ name = "io"
path = "lib.rs"
[dependencies]
core_io = { version = "0.1", features = ["collections"] }
core_io = { git = "https://git.m-labs.hk/M-Labs/rs-core_io.git", rev = "e9d3edf027", features = ["collections"] }
byteorder = { version = "1.0", default-features = false, optional = true }
libsupport_zynq = { path = "@@ZYNQ_RS@@/libsupport_zynq", default-features = false, features = ["alloc_core"] }

4
src/libksupport/Cargo.toml.tpl
View File

@ -12,7 +12,7 @@ build_zynq = { path = "../libbuild_zynq" }
cslice = "0.3"
log = "0.4"
nb = "0.1"
core_io = { version = "0.1", features = ["collections"] }
core_io = { git = "https://git.m-labs.hk/M-Labs/rs-core_io.git", rev = "e9d3edf027", features = ["collections"] }
byteorder = { version = "1.3", default-features = false }
void = { version = "1", default-features = false }
log_buffer = { version = "1.2" }
@ -35,6 +35,6 @@ libboard_artiq = { path = "../libboard_artiq" }
[dependencies.nalgebra]
git = "https://git.m-labs.hk/M-Labs/nalgebra.git"
rev = "dd00f9b"
rev = "ad42410ab0"
default-features = false
features = ["libm", "alloc"]

2
src/runtime/Cargo.toml.tpl
View File

@ -20,7 +20,7 @@ num-derive = "0.3"
cslice = "0.3"
log = "0.4"
embedded-hal = "0.2"
core_io = { version = "0.1", features = ["collections"] }
core_io = { git = "https://git.m-labs.hk/M-Labs/rs-core_io.git", rev = "e9d3edf027", features = ["collections"] }
crc = { version = "1.7", default-features = false }
byteorder = { version = "1.3", default-features = false }
void = { version = "1", default-features = false }

2
src/satman/Cargo.toml.tpl
View File

@ -16,7 +16,7 @@ build_zynq = { path = "../libbuild_zynq" }
[dependencies]
log = { version = "0.4", default-features = false }
byteorder = { version = "1.3", default-features = false }
core_io = { version = "0.1", features = ["collections"] }
core_io = { git = "https://git.m-labs.hk/M-Labs/rs-core_io.git", rev = "e9d3edf027", features = ["collections"] }
crc = { version = "1.7", default-features = false }
cslice = "0.3"
embedded-hal = "0.2"