Skip to content

Commit 6af9ba5

Browse files
committed
rust: kernel: move already upstreamed mods up
This is part of the effort to minimize the differences of the `rust` branch with respect to mainline in order to eventually drop it. Signed-off-by: Miguel Ojeda <[email protected]>
1 parent a796b3f commit 6af9ba5

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

rust/kernel/lib.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,19 @@ compile_error!("Missing kernel configuration for conditional compilation");
3434
#[cfg(not(test))]
3535
#[cfg(not(testlib))]
3636
mod allocator;
37+
mod build_assert;
38+
pub mod error;
39+
pub mod prelude;
40+
pub mod print;
41+
mod static_assert;
42+
#[doc(hidden)]
43+
pub mod std_vendor;
44+
pub mod str;
45+
pub mod sync;
46+
pub mod types;
3747

3848
#[doc(hidden)]
3949
pub use bindings;
40-
4150
pub use macros;
4251

4352
#[cfg(CONFIG_ARM_AMBA)]
@@ -49,7 +58,6 @@ pub mod cred;
4958
pub mod delay;
5059
pub mod device;
5160
pub mod driver;
52-
pub mod error;
5361
pub mod file;
5462
pub mod fs;
5563
pub mod gpio;
@@ -64,7 +72,6 @@ pub mod pages;
6472
pub mod power;
6573
pub mod revocable;
6674
pub mod security;
67-
pub mod str;
6875
pub mod task;
6976
pub mod workqueue;
7077

@@ -76,14 +83,7 @@ pub mod unsafe_list;
7683
#[doc(hidden)]
7784
pub mod module_param;
7885

79-
mod build_assert;
80-
pub mod prelude;
81-
pub mod print;
8286
pub mod random;
83-
mod static_assert;
84-
#[doc(hidden)]
85-
pub mod std_vendor;
86-
pub mod sync;
8787

8888
#[cfg(any(CONFIG_SYSCTL, doc))]
8989
#[doc(cfg(CONFIG_SYSCTL))]
@@ -95,7 +95,6 @@ pub mod io_mem;
9595
pub mod iov_iter;
9696
pub mod of;
9797
pub mod platform;
98-
mod types;
9998
pub mod user_ptr;
10099

101100
#[cfg(CONFIG_KUNIT)]

0 commit comments

Comments
 (0)