summaryrefslogtreecommitdiffstats
path: root/rust/kernel
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2020-10-05 18:05:11 -0400
committerGitHub <noreply@github.com>2020-10-05 18:05:11 -0400
commitf60edb207431c61184b6c4a562159f98c83046d1 (patch)
tree7041411063372a949d9e5bd13beb109da4f36ae2 /rust/kernel
parentc17d29003c09d52d5ab4d61b08d59ad26f07208b (diff)
parent0d05ea2259bd821445f1b3091199082217255184 (diff)
Merge pull request #19 from Kloenk/coding-style
apply coding style
Diffstat (limited to 'rust/kernel')
-rw-r--r--rust/kernel/build.rs5
-rw-r--r--rust/kernel/src/prelude.rs12
-rw-r--r--rust/kernel/src/user_ptr.rs3
3 files changed, 6 insertions, 14 deletions
diff --git a/rust/kernel/build.rs b/rust/kernel/build.rs
index 5a3794fdc995..0897186b3f92 100644
--- a/rust/kernel/build.rs
+++ b/rust/kernel/build.rs
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0
-use std::path::PathBuf;
use std::env;
+use std::path::PathBuf;
const INCLUDED_TYPES: &[&str] = &["file_system_type", "mode_t", "umode_t", "ctl_table"];
const INCLUDED_FUNCTIONS: &[&str] = &[
@@ -92,8 +92,7 @@ fn main() {
println!("cargo:rerun-if-env-changed=RUST_BINDGEN_CFLAGS");
let kernel_dir = "../../";
- let cflags = env::var("RUST_BINDGEN_CFLAGS")
- .expect("Must be invoked from kernel makefile");
+ let cflags = env::var("RUST_BINDGEN_CFLAGS").expect("Must be invoked from kernel makefile");
let kernel_args = prepare_cflags(&cflags, &kernel_dir);
diff --git a/rust/kernel/src/prelude.rs b/rust/kernel/src/prelude.rs
index 75a5017488a4..36d9e2104f68 100644
--- a/rust/kernel/src/prelude.rs
+++ b/rust/kernel/src/prelude.rs
@@ -2,16 +2,8 @@
//! The `kernel` prelude
-pub use alloc::{
- string::String,
- borrow::ToOwned,
-};
+pub use alloc::{borrow::ToOwned, string::String};
pub use module::module;
-pub use super::{
- println,
- KernelResult,
- KernelModule,
-};
-
+pub use super::{println, KernelModule, KernelResult};
diff --git a/rust/kernel/src/user_ptr.rs b/rust/kernel/src/user_ptr.rs
index 19ecb711e24a..986043c4596f 100644
--- a/rust/kernel/src/user_ptr.rs
+++ b/rust/kernel/src/user_ptr.rs
@@ -9,7 +9,8 @@ use crate::c_types;
use crate::error;
extern "C" {
- fn rust_helper_access_ok(addr: *const c_types::c_void, len: c_types::c_ulong) -> c_types::c_int;
+ fn rust_helper_access_ok(addr: *const c_types::c_void, len: c_types::c_ulong)
+ -> c_types::c_int;
}
/// A reference to an area in userspace memory, which can be either