Update to 2018 edition

pcsc-sys/Cargo.toml

@@ -12,6 +12,7 @@ authors = ["Ran Benita <ran@unusedvar.com>"]
 build = "build.rs"
 links = "pcsc"
 rust-version = "1.38"
+edition = "2018"
 
 [build-dependencies]
 pkg-config = "0.3.9"

pcsc-sys/build.rs

@@ -1,5 +1,3 @@
-extern crate pkg_config;
-
 use std::env;
 
 fn main() {

pcsc/Cargo.toml

@@ -11,6 +11,7 @@ homepage = "https://github.com/bluetech/pcsc-rust"
 readme = "../README.md"
 authors = ["Ran Benita <ran@unusedvar.com>"]
 rust-version = "1.38"
+edition = "2018"
 
 [dependencies]
 bitflags = "1.2.1"

pcsc/examples/cancel.rs

@@ -1,8 +1,5 @@
 // Example of how to cancel a blocking Context operation from another
 // thread.
-
-extern crate pcsc;
-
 use std::time::Duration;
 
 use pcsc::*;

pcsc/examples/connect-owned.rs

@@ -1,7 +1,4 @@
 // Example of communication with a smart card.
-
-extern crate pcsc;
-
 use pcsc::*;
 
 fn main() {

pcsc/examples/connect.rs

@@ -1,7 +1,3 @@
-// Example of communication with a smart card.
-
-extern crate pcsc;
-
 use pcsc::*;
 
 fn main() {

pcsc/examples/list-readers-owned.rs

@@ -1,7 +1,4 @@
 // Example of how to enumerate connected card readers.
-
-extern crate pcsc;
-
 use pcsc::*;
 
 fn main() {

pcsc/examples/list-readers.rs

@@ -1,7 +1,4 @@
 // Example of how to enumerate connected card readers.
-
-extern crate pcsc;
-
 use pcsc::*;
 
 fn main() {

pcsc/examples/monitor.rs

@@ -1,7 +1,4 @@
 // Example of how to monitor card & card reader state changes.
-
-extern crate pcsc;
-
 use pcsc::*;
 
 fn main() {

pcsc/examples/readme.rs

@@ -1,5 +1,3 @@
-extern crate pcsc;
-
 use pcsc::*;
 
 fn main() {

pcsc/src/lib.rs

@@ -100,17 +100,16 @@
 //! [8]: https://msdn.microsoft.com/en-us/library/ms953432.aspx#smartcardcspcook_topic2
 #![allow(deprecated)]
 
-#[macro_use]
-extern crate bitflags;
-pub extern crate pcsc_sys as ffi;
-
 use std::ffi::{CStr, CString};
 use std::mem::{forget, transmute};
 use std::ops::Deref;
 use std::os::raw::c_char;
 use std::ptr::{null, null_mut};
 use std::sync::Arc;
 
+use bitflags::bitflags;
+use pcsc_sys as ffi;
+
 use ffi::{DWORD, LONG};
 
 // We use these instead of std::mem::uninitialized -- variables which are
@@ -347,6 +346,7 @@ pub enum Error {
 }
 
 impl Error {
+    #[allow(clippy::manual_range_contains)]
     fn from_raw(raw: LONG) -> Error {
         unsafe {
             // The ranges here are the "blocks" above.