Skip to content

Commit 653f1f7

Browse files
jannauhoshinolina
authored andcommitted
rust: kernel: Rust 1.77 avoid offset_of stable warnings
Signed-off-by: Janne Grunau <j@jannau.net>
1 parent 627e19b commit 653f1f7

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

rust/kernel/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
#![no_std]
1515
#![feature(allocator_api)]
1616
#![feature(associated_type_defaults)]
17+
#![feature(cfg_version)]
1718
#![feature(coerce_unsized)]
1819
#![feature(const_mut_refs)]
1920
#![feature(const_refs_to_cell)]
2021
#![feature(dispatch_from_dyn)]
2122
#![feature(duration_constants)]
2223
#![feature(new_uninit)]
23-
#![feature(offset_of)]
24+
#![cfg_attr(not(version("1.77")), feature(offset_of))]
2425
#![feature(receiver_trait)]
2526
#![feature(type_alias_impl_trait)]
2627
#![feature(unsize)]

scripts/Makefile.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ $(obj)/%.lst: $(src)/%.c FORCE
263263
# Compile Rust sources (.rs)
264264
# ---------------------------------------------------------------------------
265265

266-
rust_allowed_features := allocator_api,new_uninit,offset_of,type_alias_impl_trait,impl_trait_in_assoc_type
266+
rust_allowed_features := allocator_api,new_uninit,type_alias_impl_trait,impl_trait_in_assoc_type
267267

268268
# `--out-dir` is required to avoid temporaries being created by `rustc` in the
269269
# current working directory, which may be not accessible in the out-of-tree

0 commit comments

Comments
 (0)