Start moving to 2018-style macros

alex · alex · commit fdee153963ef · 2019-06-09T15:37:45.000-04:00
diff --git a/hello-world/src/lib.rs b/hello-world/src/lib.rs
@@ -5,8 +5,7 @@ extern crate alloc;
 use alloc::borrow::ToOwned;
 use alloc::string::String;
 
-#[macro_use]
-extern crate linux_kernel_module;
+use linux_kernel_module;
 
 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",
diff --git a/src/lib.rs b/src/lib.rs
@@ -3,7 +3,6 @@
 
 #[macro_use]
 extern crate alloc;
-#[macro_use]
 extern crate bitflags;
 
 use core::panic::PanicInfo;
@@ -14,7 +13,6 @@ mod c_types;
 pub mod chrdev;
 mod error;
 pub mod filesystem;
-#[macro_use]
 pub mod printk;
 pub mod sysctl;
 mod types;
diff --git a/tests/chrdev/src/lib.rs b/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",
diff --git a/tests/printk/src/lib.rs b/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;
 
 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!()",
diff --git a/tests/sysctl/src/lib.rs b/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",

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,7 @@`
`1`	`1`	`#![no_std]`
`2`	`2`	`#![feature(const_str_as_bytes)]`
`3`	`3`
`4`		`-#[macro_use]`
`5`		`-extern crate linux_kernel_module;`
	`4`	`+use linux_kernel_module;`
`6`	`5`
`7`	`6`	`struct PrintkTestModule;`
`8`	`7`
`@@ -16,7 +15,7 @@ impl linux_kernel_module::KernelModule for PrintkTestModule {`
`16`	`15`	`}`
`17`	`16`	`}`
`18`	`17`
`19`		`-kernel_module!(`
	`18`	`+linux_kernel_module::kernel_module!(`
`20`	`19`	`PrintkTestModule,`
`21`	`20`	`author: "Alex Gaynor and Geoffrey Thomas",`
`22`	`21`	`description: "A module for testing println!()",`
Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,7 @@`
`3`	`3`
`4`	`4`	`use core::sync::atomic::AtomicBool;`
`5`	`5`
`6`		`-#[macro_use]`
`7`		`-extern crate linux_kernel_module;`
	`6`	`+use linux_kernel_module;`
`8`	`7`
`9`	`8`	`use linux_kernel_module::sysctl::Sysctl;`
`10`	`9`	`use linux_kernel_module::Mode;`
`@@ -33,7 +32,7 @@ impl linux_kernel_module::KernelModule for SysctlTestModule {`
`33`	`32`	`}`
`34`	`33`	`}`
`35`	`34`
`36`		`-kernel_module!(`
	`35`	`+linux_kernel_module::kernel_module!(`
`37`	`36`	`SysctlTestModule,`
`38`	`37`	`author: "Alex Gaynor and Geoffrey Thomas",`
`39`	`38`	`description: "A module for testing sysctls",`