Update to Rust 2018

Feriixu · Nov 26, 2019 · 13f72e0 · 13f72e0
1 parent ecf1385
commit 13f72e0
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 20 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -11,6 +11,7 @@ categories = [ "hardware-support" ]
 keywords = [ "camera", "raspberry", "pi", "rpi" ]
 exclude = [ "ci/*" ]
 build = "build.rs"
+edition = "2018"
 
 [dependencies]
 mmal-sys = "0.1.0-2"
@@ -24,3 +25,6 @@ default = []
 
 # Enable this feature to enable some print statements for debugging.
 debug = []
+
+[package.metadata.docs.rs]
+default-target = "armv7-unknown-linux-gnueabihf"
diff --git a/examples/serious.rs b/examples/serious.rs
@@ -1,5 +1,3 @@
-extern crate rascam;
-
 use std::fs::File;
 use std::io::Write;
 use std::{thread, time};

diff --git a/examples/simple.rs b/examples/simple.rs
@@ -1,5 +1,3 @@
-extern crate rascam;
-
 use std::fs::File;
 use std::io::Write;
 use std::{thread, time};

diff --git a/examples/stress.rs b/examples/stress.rs
@@ -1,5 +1,3 @@
-extern crate rascam;
-
 use std::{thread, time};
 use rascam::*;
 

diff --git a/src/error.rs b/src/error.rs
@@ -1,6 +1,6 @@
-extern crate mmal_sys as ffi;
-use std::error;
+use mmal_sys as ffi;
 use ffi::MMAL_STATUS_T;
+use std::error;
 use std::fmt;
 use std::sync::mpsc;
 use std::io;

diff --git a/src/info.rs b/src/info.rs
@@ -1,14 +1,13 @@
-extern crate mmal_sys as ffi;
-
+use mmal_sys as ffi;
 use ffi::MMAL_STATUS_T;
 use std::fmt;
 use std::os::raw::c_char;
 use std::ffi::CStr;
 use std::mem;
 use std::string::String;
 
-use init::init;
-use error::{CameraError, MmalError};
+use crate::init::init;
+use crate::error::{CameraError, MmalError};
 
 /// Contains information about attached cameras.
 pub struct Info {

diff --git a/src/init.rs b/src/init.rs
@@ -1,5 +1,4 @@
-extern crate mmal_sys as ffi;
-
+use mmal_sys as ffi;
 use std::sync::Once;
 
 /// This function must be called before any mmal work. Failure to do so will cause errors like:

diff --git a/src/lib.rs b/src/lib.rs
@@ -5,13 +5,9 @@
 //!
 //! [mmal-sys]: https://crates.io/crates/mmal-sys
 
-extern crate libc;
-extern crate mmal_sys as ffi;
-extern crate parking_lot;
-extern crate lock_api;
+use mmal_sys as ffi;
 #[macro_use(defer_on_unwind)]
 extern crate scopeguard;
-// extern crate futures;
 use ffi::MMAL_STATUS_T;
 use std::os::raw::c_char;
 use std::ffi::CStr;

diff --git a/src/settings.rs b/src/settings.rs
@@ -1,4 +1,4 @@
-extern crate mmal_sys as ffi;
+use mmal_sys as ffi;
 
 use std::os::raw::c_uint;