Start moving to 2018-style macros (#94)

* Start moving to 2018-style macros

* Ooops, fix this too

* More updates

* Fix println import

* Get rid of extern crates

* Add this back

* Fixes?

* Better

* Again?

* Unused

* magic

* Try this?

* Revert "Try this?"

This reverts commit f89ec1b.

* hygeinize

* Mark the edition

* FIxed hello-world

* Better style

* fmt

* fmt; broken for the moment

Author: alex

build.rs

@@ -1,6 +1,6 @@
-extern crate bindgen;
-extern crate cc;
-extern crate shlex;
+use bindgen;
+use cc;
+use shlex;
 
 use std::env;
 use std::path::PathBuf;

hello-world/src/lib.rs

@@ -1,12 +1,11 @@
 #![no_std]
 #![feature(alloc, const_str_as_bytes)]
 
-extern crate alloc;
 use alloc::borrow::ToOwned;
 use alloc::string::String;
 
-#[macro_use]
-extern crate linux_kernel_module;
+use linux_kernel_module;
+use linux_kernel_module::println;
 
 struct HelloWorldModule {
     message: String,
@@ -28,7 +27,7 @@ impl Drop for HelloWorldModule {
     }
 }
 
-kernel_module!(
+linux_kernel_module::kernel_module!(
     HelloWorldModule,
     author: "Alex Gaynor and Geoffrey Thomas",
     description: "An extremely simple kernel module",

src/filesystem.rs

@@ -3,6 +3,8 @@ use core::default::Default;
 use core::marker;
 use core::mem;
 
+use bitflags;
+
 use crate::bindings;
 use crate::c_types;
 use crate::error;
@@ -24,7 +26,7 @@ pub trait FileSystem {
     const FLAGS: FileSystemFlags;
 }
 
-bitflags! {
+bitflags::bitflags! {
     pub struct FileSystemFlags: c_types::c_int {
         const FS_REQUIRES_DEV = bindings::FS_REQUIRES_DEV as c_types::c_int;
         const FS_BINARY_MOUNTDATA = bindings::FS_BINARY_MOUNTDATA as c_types::c_int;
@@ -34,12 +36,6 @@ bitflags! {
     }
 }
 
-impl FileSystemFlags {
-    pub const fn const_empty() -> FileSystemFlags {
-        FileSystemFlags { bits: 0 }
-    }
-}
-
 extern "C" fn fill_super_callback<T: FileSystem>(
     _sb: *mut bindings::super_block,
     _data: *mut c_types::c_void,

src/lib.rs

@@ -1,10 +1,7 @@
 #![no_std]
-#![feature(allocator_api, const_fn, alloc_error_handler)]
+#![feature(allocator_api, alloc_error_handler)]
 
-#[macro_use]
 extern crate alloc;
-#[macro_use]
-extern crate bitflags;
 
 use core::panic::PanicInfo;
 
@@ -14,7 +11,6 @@ mod c_types;
 pub mod chrdev;
 mod error;
 pub mod filesystem;
-#[macro_use]
 pub mod printk;
 pub mod sysctl;
 mod types;
@@ -53,7 +49,7 @@ macro_rules! kernel_module {
         }
 
         $(
-            kernel_module!(@attribute $name, $value);
+            $crate::kernel_module!(@attribute $name, $value);
         )*
     };
 

src/sysctl.rs

@@ -1,4 +1,5 @@
 use alloc::boxed::Box;
+use alloc::vec;
 use core::mem;
 use core::ptr;
 use core::sync::atomic;

src/user_ptr.rs

@@ -1,3 +1,4 @@
+use alloc::vec;
 use alloc::vec::Vec;
 use core::u32;
 

tests/chrdev/src/lib.rs

@@ -1,8 +1,7 @@
 #![no_std]
 #![feature(const_str_as_bytes)]
 
-#[macro_use]
-extern crate linux_kernel_module;
+use linux_kernel_module;
 
 struct ChrdevTestModule {
     _dev: linux_kernel_module::chrdev::DeviceNumberRegion,
@@ -19,7 +18,7 @@ impl linux_kernel_module::KernelModule for ChrdevTestModule {
     }
 }
 
-kernel_module!(
+linux_kernel_module::kernel_module!(
     ChrdevTestModule,
     author: "Alex Gaynor and Geoffrey Thomas",
     description: "A module for testing character devices",

tests/chrdev/tests.rs

@@ -1,5 +1,3 @@
-extern crate kernel_module_tests;
-
 use kernel_module_tests::with_kernel_module;
 use std::fs;
 

tests/printk/src/lib.rs

@@ -1,8 +1,7 @@
 #![no_std]
 #![feature(const_str_as_bytes)]
 
-#[macro_use]
-extern crate linux_kernel_module;
+use linux_kernel_module::{self, println};
 
 struct PrintkTestModule;
 
@@ -16,7 +15,7 @@ impl linux_kernel_module::KernelModule for PrintkTestModule {
     }
 }
 
-kernel_module!(
+linux_kernel_module::kernel_module!(
     PrintkTestModule,
     author: "Alex Gaynor and Geoffrey Thomas",
     description: "A module for testing println!()",

tests/printk/tests.rs

@@ -1,5 +1,3 @@
-extern crate kernel_module_tests;
-
 use std::process::Command;
 
 use kernel_module_tests::with_kernel_module;

tests/run_tests.py

@@ -59,6 +59,7 @@ def main():
             "rustc",
             "--test",
             "-Dwarnings",
+            "--edition", "2018",
             "--out-dir", os.path.join(BASE_DIR, path),
             os.path.join(BASE_DIR, path, "tests.rs"),
             "--extern", "kernel_module_tests=libtestlib.rlib",
@@ -76,4 +77,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-

tests/sysctl/src/lib.rs

@@ -3,8 +3,7 @@
 
 use core::sync::atomic::AtomicBool;
 
-#[macro_use]
-extern crate linux_kernel_module;
+use linux_kernel_module;
 
 use linux_kernel_module::sysctl::Sysctl;
 use linux_kernel_module::Mode;
@@ -33,7 +32,7 @@ impl linux_kernel_module::KernelModule for SysctlTestModule {
     }
 }
 
-kernel_module!(
+linux_kernel_module::kernel_module!(
     SysctlTestModule,
     author: "Alex Gaynor and Geoffrey Thomas",
     description: "A module for testing sysctls",

tests/sysctl/tests.rs

@@ -1,5 +1,3 @@
-extern crate kernel_module_tests;
-
 use std::fs;
 use std::path::Path;