Skip to content

Commit a11c8d5

Browse files
jrvanwhyjrvanwhy
authored
Merge pull request #562 from jrvanwhy/nightly-update
Update the nightly toolchain.
2 parents f9bcc47 + b377d7a commit a11c8d5

File tree

14 files changed

+48
-36
lines changed

14 files changed

+48
-36
lines changed

‎.cargo/config‎ renamed to ‎.cargo/config.toml‎

File renamed without changes.

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ jobs:
3434
# optimal for the Azure Standard_DS2_v2 VM, which is the VM type used by
3535
# GitHub Actions at the time of this writing.
3636
#
37-
# We have to append the "-D warnings" flag to .cargo/config rather than
38-
# using the RUSTFLAGS environment variable because if we set RUSTFLAGS
39-
# cargo will ignore the rustflags config in .cargo/config, breaking
40-
# relocation.
37+
# We have to append the "-D warnings" flag to .cargo/config.toml rather
38+
# than using the RUSTFLAGS environment variable because if we set
39+
# RUSTFLAGS cargo will ignore the rustflags config in .cargo/config,
40+
# breaking relocation.
4141
- name: Build and Test
4242
run: |
4343
sudo apt-get install ninja-build
4444
cd "${GITHUB_WORKSPACE}"
45-
echo "[target.'cfg(all())']" >> .cargo/config
46-
echo 'rustflags = ["-D", "warnings"]' >> .cargo/config
45+
echo "[target.'cfg(all())']" >> .cargo/config.toml
46+
echo 'rustflags = ["-D", "warnings"]' >> .cargo/config.toml
4747
make -j2 setup
4848
make -j2 test

‎apis/interface/console/src/lib.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ impl<S: Syscalls, C: Config> Console<S, C> {
5454

5555
S::subscribe::<_, _, C, DRIVER_NUM, { subscribe::WRITE }>(subscribe, &called)?;
5656

57-
S::command(DRIVER_NUM, command::WRITE, s.len() as u32, 0).to_result()?;
57+
S::command(DRIVER_NUM, command::WRITE, s.len() as u32, 0)
58+
.to_result::<(), ErrorCode>()?;
5859

5960
loop {
6061
S::yield_wait();
@@ -87,7 +88,7 @@ impl<S: Syscalls, C: Config> Console<S, C> {
8788

8889
// When this fails, `called` is guaranteed unmodified,
8990
// because upcalls are never processed until we call `yield`.
90-
S::command(DRIVER_NUM, command::READ, len as u32, 0).to_result()?;
91+
S::command(DRIVER_NUM, command::READ, len as u32, 0).to_result::<(), ErrorCode>()?;
9192

9293
loop {
9394
S::yield_wait();

‎apis/net/ieee802154/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ impl<S: Syscalls, C: Config> Ieee802154<S, C> {
187187
subscribe, &called,
188188
)?;
189189

190-
S::command(DRIVER_NUM, command::TRANSMIT, 0, 0).to_result()?;
190+
S::command(DRIVER_NUM, command::TRANSMIT, 0, 0).to_result::<(), ErrorCode>()?;
191191

192192
loop {
193193
S::yield_wait();

‎apis/peripherals/i2c_master/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ impl<S: Syscalls, C: Config> I2CMaster<S, C> {
6161
cmd_arg0,
6262
r_len.into(),
6363
)
64-
.to_result()?;
64+
.to_result::<(), ErrorCode>()?;
6565

6666
loop {
6767
S::yield_wait();
@@ -112,7 +112,7 @@ impl<S: Syscalls, C: Config> I2CMaster<S, C> {
112112
addr.into(),
113113
len.into(),
114114
)
115-
.to_result()?;
115+
.to_result::<(), ErrorCode>()?;
116116

117117
loop {
118118
S::yield_wait();
@@ -163,7 +163,7 @@ impl<S: Syscalls, C: Config> I2CMaster<S, C> {
163163
addr.into(),
164164
len.into(),
165165
)
166-
.to_result()?;
166+
.to_result::<(), ErrorCode>()?;
167167

168168
loop {
169169
S::yield_wait();

‎apis/peripherals/i2c_master_slave/src/lib.rs‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ impl<S: Syscalls, C: Config> I2CMasterSlave<S, C> {
5555

5656
S::subscribe::<_, _, C, DRIVER_NUM, { subscribe::MASTER_WRITE }>(subscribe, &called)?;
5757

58-
S::command(DRIVER_NUM, i2c_master_slave_cmd::MASTER_WRITE, cmd_arg0, 0).to_result()?;
58+
S::command(DRIVER_NUM, i2c_master_slave_cmd::MASTER_WRITE, cmd_arg0, 0)
59+
.to_result::<(), ErrorCode>()?;
5960

6061
loop {
6162
S::yield_wait();
@@ -113,7 +114,8 @@ impl<S: Syscalls, C: Config> I2CMasterSlave<S, C> {
113114
S::subscribe::<_, _, C, DRIVER_NUM, { subscribe::MASTER_READ }>(subscribe, &called)?;
114115
// When this fails, `called` is guaranteed unmodified,
115116
// because upcalls are never processed until we call `yield`.
116-
S::command(DRIVER_NUM, i2c_master_slave_cmd::MASTER_READ, cmd_arg0, 0).to_result()?;
117+
S::command(DRIVER_NUM, i2c_master_slave_cmd::MASTER_READ, cmd_arg0, 0)
118+
.to_result::<(), ErrorCode>()?;
117119

118120
loop {
119121
S::yield_wait();
@@ -208,7 +210,7 @@ impl<S: Syscalls, C: Config> I2CMasterSlave<S, C> {
208210
cmd_arg0,
209211
0,
210212
)
211-
.to_result()?;
213+
.to_result::<(), ErrorCode>()?;
212214

213215
loop {
214216
S::yield_wait();
@@ -293,7 +295,8 @@ impl<S: Syscalls, C: Config> I2CMasterSlave<S, C> {
293295
S::allow_rw::<C, DRIVER_NUM, { rw_allow::SLAVE_RX }>(allow_rw, buf)?;
294296
S::subscribe::<_, _, C, DRIVER_NUM, { subscribe::SLAVE_READ }>(subscribe, &called)?;
295297

296-
S::command(DRIVER_NUM, i2c_master_slave_cmd::SLAVE_START_LISTEN, 0, 0).to_result()?;
298+
S::command(DRIVER_NUM, i2c_master_slave_cmd::SLAVE_START_LISTEN, 0, 0)
299+
.to_result::<(), ErrorCode>()?;
297300

298301
loop {
299302
S::yield_wait();
@@ -356,7 +359,7 @@ impl<S: Syscalls, C: Config> I2CMasterSlave<S, C> {
356359
len as u32,
357360
0,
358361
)
359-
.to_result()?;
362+
.to_result::<(), ErrorCode>()?;
360363

361364
loop {
362365
S::yield_wait();

‎apis/peripherals/rng/src/lib.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ impl<S: Syscalls> Rng<S> {
5959
S::subscribe::<_, _, DefaultConfig, DRIVER_NUM, 0>(subscribe, &called)?;
6060

6161
// Send the command to the kernel driver to fill the allowed_readwrite buffer
62-
S::command(DRIVER_NUM, GET_BYTES, n, 0).to_result()?;
62+
S::command(DRIVER_NUM, GET_BYTES, n, 0).to_result::<(), ErrorCode>()?;
6363

6464
// Wait for a callback to happen
6565
while !called.get() {

‎apis/peripherals/spi_controller/src/lib.rs‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ impl<S: Syscalls, C: Config> SpiController<S, C> {
5555
S::allow_ro::<C, DRIVER_NUM, { ro_allow::WRITE }>(allow_ro, w_buf)?;
5656
S::subscribe::<_, _, C, DRIVER_NUM, { subscribe::COMPLETE }>(subscribe, &called)?;
5757

58-
S::command(DRIVER_NUM, spi_controller_cmd::READ_WRITE_BYTES, len, 0).to_result()?;
58+
S::command(DRIVER_NUM, spi_controller_cmd::READ_WRITE_BYTES, len, 0)
59+
.to_result::<(), ErrorCode>()?;
5960

6061
loop {
6162
S::yield_wait();
@@ -88,7 +89,8 @@ impl<S: Syscalls, C: Config> SpiController<S, C> {
8889
S::allow_ro::<C, DRIVER_NUM, { ro_allow::WRITE }>(allow_ro, w_buf)?;
8990
S::subscribe::<_, _, C, DRIVER_NUM, { subscribe::COMPLETE }>(subscribe, &called)?;
9091

91-
S::command(DRIVER_NUM, spi_controller_cmd::READ_WRITE_BYTES, len, 0).to_result()?;
92+
S::command(DRIVER_NUM, spi_controller_cmd::READ_WRITE_BYTES, len, 0)
93+
.to_result::<(), ErrorCode>()?;
9294

9395
loop {
9496
S::yield_wait();
@@ -121,7 +123,8 @@ impl<S: Syscalls, C: Config> SpiController<S, C> {
121123
S::allow_rw::<C, DRIVER_NUM, { rw_allow::READ }>(allow_rw, r_buf)?;
122124
S::subscribe::<_, _, C, DRIVER_NUM, { subscribe::COMPLETE }>(subscribe, &called)?;
123125

124-
S::command(DRIVER_NUM, spi_controller_cmd::READ_BYTES, len, 0).to_result()?;
126+
S::command(DRIVER_NUM, spi_controller_cmd::READ_BYTES, len, 0)
127+
.to_result::<(), ErrorCode>()?;
125128

126129
loop {
127130
S::yield_wait();
@@ -163,7 +166,7 @@ impl<S: Syscalls, C: Config> SpiController<S, C> {
163166
len,
164167
0,
165168
)
166-
.to_result()?;
169+
.to_result::<(), ErrorCode>()?;
167170

168171
loop {
169172
S::yield_wait();

‎apis/storage/key_value/src/lib.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ impl<S: Syscalls, C: Config> KeyValue<S, C> {
3939

4040
S::subscribe::<_, _, C, DRIVER_NUM, { subscribe::CALLBACK }>(subscribe, &called)?;
4141

42-
S::command(DRIVER_NUM, command::GET, 0, 0).to_result()?;
42+
S::command(DRIVER_NUM, command::GET, 0, 0).to_result::<(), ErrorCode>()?;
4343

4444
loop {
4545
S::yield_wait();
@@ -69,7 +69,7 @@ impl<S: Syscalls, C: Config> KeyValue<S, C> {
6969

7070
S::subscribe::<_, _, C, DRIVER_NUM, { subscribe::CALLBACK }>(subscribe, &called)?;
7171

72-
S::command(DRIVER_NUM, command_num, 0, 0).to_result()?;
72+
S::command(DRIVER_NUM, command_num, 0, 0).to_result::<(), ErrorCode>()?;
7373

7474
loop {
7575
S::yield_wait();
@@ -112,7 +112,7 @@ impl<S: Syscalls, C: Config> KeyValue<S, C> {
112112

113113
S::subscribe::<_, _, C, DRIVER_NUM, { subscribe::CALLBACK }>(subscribe, &called)?;
114114

115-
S::command(DRIVER_NUM, command::DELETE, 0, 0).to_result()?;
115+
S::command(DRIVER_NUM, command::DELETE, 0, 0).to_result::<(), ErrorCode>()?;
116116

117117
loop {
118118
S::yield_wait();

‎nightly/rust-toolchain.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# This is the nightly Rust toolchain used by `make test`.
22
[toolchain]
3-
channel = "nightly-2024-04-19"
3+
channel = "nightly-2024-11-11"
44
components = ["miri", "rust-src"]

0 commit comments

Comments
 (0)