Skip to content

Commit c20ec99

Browse files
authored
Bump toolchain to remove workaround (#560)
1 parent 3e3bc5a commit c20ec99

File tree

28 files changed

+51
-38
lines changed

28 files changed

+51
-38
lines changed

crates/board/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 0.7.1-git
4+
5+
### Patch
6+
7+
- Remove workaround lint false positive
8+
39
## 0.7.0
410

511
### Major

crates/board/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/board/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "wasefire-board-api"
3-
version = "0.7.0"
3+
version = "0.7.1-git"
44
authors = ["Julien Cretin <[email protected]>"]
55
license = "Apache-2.0"
66
publish = true

crates/board/src/usb/serial.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,6 @@ pub trait HasSerial: Send {
7373
}
7474

7575
/// Wrapper type for boards using the `usbd_serial` crate.
76-
// TODO(https://github.com/rust-lang/rust/issues/128053): Remove dead-code.
77-
#[allow(dead_code)]
7876
pub struct WithSerial<T: HasSerial> {
7977
_never: !,
8078
_has_serial: T,

crates/cli-tools/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@
66

77
- Change the behavior of `fs::copy_if_changed()` to keep an original source
88

9+
### Patch
10+
11+
- Update dependencies
12+
913
## 0.1.0
1014

1115
<!-- Increment to skip CHANGELOG.md test: 0 -->

crates/cli-tools/Cargo.lock

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

crates/cli-tools/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ toml = { version = "0.8.13", default-features = false, features = ["display", "p
2121
wasefire-protocol = { version = "0.1.0", path = "../protocol" }
2222

2323
[dependencies.wasefire-protocol-usb]
24-
version = "0.1.0"
24+
version = "0.1.1-git"
2525
path = "../protocol-usb"
2626
features = ["host", "log"]
2727

crates/cli/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030

3131
## 0.1.0
3232

33-
<!-- Increment to skip CHANGELOG.md test: 0 -->
33+
<!-- Increment to skip CHANGELOG.md test: 1 -->

crates/cli/Cargo.lock

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

crates/cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ humantime = { version = "2.1.0", default-features = false }
2424
rusb = { version = "0.9.4", default-features = false }
2525
wasefire-cli-tools = { version = "0.1.1-git", path = "../cli-tools" }
2626
wasefire-protocol = { version = "0.1.0", path = "../protocol", features = ["host"] }
27-
wasefire-protocol-usb = { version = "0.1.0", path = "../protocol-usb", features = ["host"] }
27+
wasefire-protocol-usb = { version = "0.1.1-git", path = "../protocol-usb", features = ["host"] }
2828

2929
[lints]
3030
clippy.unit-arg = "allow"

crates/protocol-usb/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Changelog
22

3+
## 0.1.1-git
4+
5+
### Patch
6+
7+
- Remove workaround lint false positive
8+
39
## 0.1.0
410

511
<!-- Increment to skip CHANGELOG.md test: 0 -->

crates/protocol-usb/Cargo.lock

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

crates/protocol-usb/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "wasefire-protocol-usb"
3-
version = "0.1.0"
3+
version = "0.1.1-git"
44
authors = ["Julien Cretin <[email protected]>"]
55
license = "Apache-2.0"
66
publish = true
@@ -21,7 +21,7 @@ wasefire-logger = { version = "0.1.5", path = "../logger" }
2121
wasefire-wire = { version = "0.1.0", path = "../wire", optional = true }
2222

2323
[dependencies.wasefire-board-api]
24-
version = "0.7.0"
24+
version = "0.7.1-git"
2525
path = "../board"
2626
features = ["api-platform-protocol"]
2727
optional = true

crates/protocol-usb/src/device.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
use alloc::boxed::Box;
1616
use alloc::collections::VecDeque;
1717
use alloc::vec::Vec;
18-
use core::convert::Infallible;
1918
use core::marker::PhantomData;
2019

2120
use usb_device::class_prelude::{
@@ -31,10 +30,8 @@ use wasefire_logger as log;
3130

3231
use crate::common::{Decoder, Encoder};
3332

34-
// TODO(https://github.com/rust-lang/rust/issues/128053): Remove dead-code.
35-
#[allow(dead_code)]
3633
pub struct Impl<'a, B: UsbBus, T: HasRpc<'a, B>> {
37-
_never: Infallible,
34+
_never: !,
3835
_phantom: PhantomData<(&'a (), B, T)>,
3936
}
4037

crates/protocol-usb/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
//! This crate implements a USB RPC protocol that supports the Wasefire platform protocol.
1818
1919
#![no_std]
20+
#![feature(never_type)]
2021

2122
extern crate alloc;
2223
#[cfg(feature = "std")]

crates/protocol/crates/schema/Cargo.lock

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

crates/runner-host/Cargo.lock

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

crates/runner-nordic/Cargo.lock

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

crates/runner-nordic/crates/header/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ impl Side {
6868
extern "C" {
6969
static mut __header_origin: u32;
7070
}
71-
Self::new(unsafe { addr_of!(__header_origin) } as u32)
71+
Self::new(addr_of!(__header_origin) as u32)
7272
}
7373

7474
fn new(addr: u32) -> Option<Self> {

crates/runner-nordic/src/allocator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ pub fn init() {
2424
static mut __sheap: u32;
2525
static mut __eheap: u32;
2626
}
27-
let sheap = unsafe { addr_of_mut!(__sheap) as usize };
28-
let eheap = unsafe { addr_of_mut!(__eheap) as usize };
27+
let sheap = addr_of_mut!(__sheap) as usize;
28+
let eheap = addr_of_mut!(__eheap) as usize;
2929
assert!(sheap < eheap);
3030
// Unsafe: Called only once before any allocation.
3131
unsafe { ALLOCATOR.init(sheap, eheap - sheap) }

crates/runner-nordic/src/storage.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ macro_rules! take_storage {
4242
static mut $start: u32;
4343
static mut $end: u32;
4444
}
45-
let start = unsafe { addr_of_mut!($start) as *mut u8 };
46-
let end = unsafe { addr_of_mut!($end) as usize };
45+
let start = addr_of_mut!($start) as *mut u8;
46+
let end = addr_of_mut!($end) as usize;
4747
let length = end.checked_sub(start as usize).unwrap();
4848
assert_eq!(length % PAGE_SIZE, 0);
4949
unsafe { slice::from_raw_parts_mut(start, length) }

crates/scheduler/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
### Patch
66

7+
- Update dependencies
78
- Fix missing `build.rs` in cargo package
89

910
## 0.3.1

crates/scheduler/Cargo.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/scheduler/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ digest = { version = "0.10.7", default-features = false, features = ["mac"], opt
2323
generic-array = { version = "=0.14.7", default-features = false, optional = true }
2424
typenum = { version = "1.17.0", default-features = false, optional = true }
2525
wasefire-applet-api = { version = "0.6.1", path = "../api", features = ["host"] }
26-
wasefire-board-api = { version = "0.7.0", path = "../board" }
26+
wasefire-board-api = { version = "0.7.1-git", path = "../board" }
2727
wasefire-error = { version = "0.1.1", path = "../error" }
2828
wasefire-logger = { version = "0.1.5", path = "../logger" }
2929
wasefire-store = { version = "0.2.4", path = "../store", optional = true }

crates/wasm-bench/src/allocator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ macro_rules! addr_of_sym {
2424
extern "C" {
2525
static mut $sym: u32;
2626
}
27-
unsafe { addr_of_mut!($sym) as usize }
27+
addr_of_mut!($sym) as usize
2828
}};
2929
}
3030

crates/xtask/Cargo.lock

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

examples/rust/protocol/host/Cargo.lock

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

rust-toolchain.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[toolchain]
2-
channel = "nightly-2024-07-22"
2+
channel = "nightly-2024-08-01"
33
components = ["clippy", "llvm-tools", "miri", "rust-src", "rustfmt"]
44
targets = [
55
"i686-unknown-linux-gnu",

0 commit comments

Comments
 (0)