bump nightly version used (#220)

* bump nightly version used

* Attempt to fix tests

* 2018 edition style fixes

Author: alex

.travis.yml

@@ -4,7 +4,7 @@ matrix:
 
 language: rust
 rust:
-    - nightly-2019-09-25
+    - nightly-2020-07-12
 
 branches:
     only:

build.rs

@@ -1,7 +1,3 @@
-use bindgen;
-use cc;
-use shlex;
-
 use std::io::{BufRead, BufReader};
 use std::path::PathBuf;
 use std::process::Command;
@@ -67,8 +63,8 @@ fn handle_kernel_version_cfg(bindings_path: &PathBuf) {
     for line in f.lines() {
         let line = line.unwrap();
         if let Some(type_and_value) = line.split("pub const LINUX_VERSION_CODE").nth(1) {
-            if let Some(value) = type_and_value.split("=").nth(1) {
-                let raw_version = value.split(";").next().unwrap();
+            if let Some(value) = type_and_value.split('=').nth(1) {
+                let raw_version = value.split(';').next().unwrap();
                 version = Some(raw_version.trim().parse::<u64>().unwrap());
                 break;
             }
@@ -174,7 +170,7 @@ fn main() {
     handle_kernel_symbols_cfg(&PathBuf::from(&kdir).join("Module.symvers"));
 
     let mut builder = cc::Build::new();
-    builder.compiler(env::var("CLANG").unwrap_or("clang".to_string()));
+    builder.compiler(env::var("CLANG").unwrap_or_else(|_| "clang".to_string()));
     builder.target(&target);
     builder.warnings(false);
     builder.file("src/helpers.c");

src/filesystem.rs

@@ -2,8 +2,6 @@ use alloc::boxed::Box;
 use core::default::Default;
 use core::marker;
 
-use bitflags;
-
 use crate::bindings;
 use crate::c_types;
 use crate::error;

src/types.rs

@@ -18,9 +18,11 @@ impl Mode {
 pub struct CStr(str);
 
 impl CStr {
-    /// Creates a new CStr from a str without performing any additional checks. `data` _must_ end
-    /// with a NUL byte, and should only have only a single NUL byte, or the string will be
-    /// truncated.
+    /// Creates a new CStr from a str without performing any additional checks.
+    /// # Safety
+    ///
+    /// `data` _must_ end with a NUL byte, and should only have only a single
+    /// NUL byte, or the string will be truncated.
     pub const unsafe fn new_unchecked(data: &str) -> &CStr {
         &*(data as *const str as *const CStr)
     }

tests/chrdev/src/lib.rs

@@ -1,5 +1,7 @@
 #![no_std]
 
+extern crate alloc;
+
 use alloc::string::ToString;
 use core::sync::atomic::{AtomicUsize, Ordering};
 

tests/random/src/lib.rs

@@ -1,6 +1,6 @@
 #![no_std]
 
-use alloc::vec;
+extern crate alloc;
 
 use linux_kernel_module::sysctl::{Sysctl, SysctlStorage};
 use linux_kernel_module::{self, cstr, random, Mode};
@@ -16,7 +16,7 @@ impl SysctlStorage for EntropySource {
         &self,
         data: &mut linux_kernel_module::user_ptr::UserSlicePtrWriter,
     ) -> (usize, linux_kernel_module::KernelResult<()>) {
-        let mut storage = vec![0; data.len()];
+        let mut storage = alloc::vec![0; data.len()];
         if let Err(e) = random::getrandom(&mut storage) {
             return (0, Err(e));
         }