Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade toolchain to nightly-2023-08-01 #822

Merged
merged 3 commits into from
Aug 7, 2023
Merged

Upgrade toolchain to nightly-2023-08-01 #822

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d1397aa
Remove -preview tag from the llvm-tools component dependency
mkroening Aug 7, 2023
ca27293
Fix clippy::needless_pass_by_ref_mut
mkroening Aug 7, 2023
24bc7cc
Upgrade toolchain to `nightly-2023-08-01`
mkroening Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ ENV RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH \
# Manually sync this with rust-toolchain.toml!
RUST_VERSION=nightly-2023-07-15 \
RUST_COMPONENTS="llvm-tools-preview rust-src" \
RUST_VERSION=nightly-2023-08-01 \
RUST_COMPONENTS="llvm-tools rust-src" \
RUST_TARGETS="x86_64-unknown-none"

RUN set -eux; \
Expand Down
4 changes: 2 additions & 2 deletions rust-toolchain.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[toolchain]
# Manually sync this with Dockerfile!
channel = "nightly-2023-07-15"
channel = "nightly-2023-08-01"
components = [
"llvm-tools-preview",
"llvm-tools",
"rust-src",
]
targets = [ "x86_64-unknown-none" ]
2 changes: 1 addition & 1 deletion src/drivers/virtio/virtqueue/packed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -698,7 +698,7 @@ impl<'a> ReadCtrl<'a> {

/// Updates the descriptor flags inside the actual ring if necessary and
/// increments the poll_index by one.
fn update_send(&mut self, send_buff: &mut Buffer) {
fn update_send(&mut self, send_buff: &Buffer) {
for _desc in send_buff.as_slice() {
// Increase poll_index and reset ring position beforehand in order to have a consistent and clean
// data structure.
Expand Down
2 changes: 1 addition & 1 deletion xtask/src/archive.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ fn binutil(name: &str) -> Result<PathBuf> {
llvm_tools::Error::NotFound => anyhow!(
"Could not find llvm-tools component\n\
\n\
Maybe the rustup component `llvm-tools-preview` is missing? Install it through: `rustup component add llvm-tools-preview`"
Maybe the rustup component `llvm-tools` is missing? Install it through: `rustup component add llvm-tools`"
),
err => anyhow!("{err:?}"),
})?
Expand Down