Skip to content
This repository was archived by the owner on Jul 17, 2025. It is now read-only.

Commit 2851f07

Browse files
committed
Bump rust-toolchain, fix compilation.
1 parent 10d528b commit 2851f07

File tree

5 files changed

+7
-7
lines changed

5 files changed

+7
-7
lines changed

kernel/src/fs/file.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ impl File {
6464
len
6565
}
6666
// If file is filled till last buffer
67-
last_buffer_len => ((buffer_num - 1) * BASE_PAGE_SIZE + last_buffer_len),
67+
last_buffer_len => (buffer_num - 1) * BASE_PAGE_SIZE + last_buffer_len,
6868
}
6969
}
7070
}

kernel/src/main.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
linkage,
2323
c_variadic,
2424
drain_filter,
25+
let_chains,
2526
new_uninit,
2627
get_mut_unchecked,
27-
const_ptr_offset_from,
2828
const_refs_to_cell,
2929
nonnull_slice_from_raw_parts,
3030
cell_update,
3131
thread_local,
32-
generic_associated_types,
33-
maybe_uninit_write_slice
32+
maybe_uninit_write_slice,
33+
alloc_error_handler
3434
)]
3535

3636
extern crate alloc;

kernel/src/panic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ pub(crate) fn rust_eh_personality(
279279

280280
#[cfg(target_os = "none")]
281281
#[no_mangle]
282-
#[cfg_attr(target_os = "none", lang = "oom")]
282+
#[alloc_error_handler]
283283
pub(crate) fn oom(layout: Layout) -> ! {
284284
sprintln!(
285285
"OOM: Unable to satisfy allocation request for size {} with alignment {}.",

lib/vibrio/src/rumprt/crt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const AT_STACKBASE: Elf64Word = 13;
8989
/// Store initial information about the process.
9090
///
9191
/// (auxiliary table, command line arguments and environment arguments)
92-
#[repr(C, packed)]
92+
#[repr(C)]
9393
#[derive(Debug, Copy, Clone)]
9494
pub struct InitInfo {
9595
pub argv_dummy: *mut c_char,

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
[toolchain]
2-
channel = "nightly-2022-07-21"
2+
channel = "nightly-2022-11-21"
33
components = [ "rustfmt", "rustc-dev", "rust-src", "cargo", "clippy" ]
44
profile = "default"

0 commit comments

Comments
 (0)