Convert the crate to edition 2018

Author: asomers

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name        = "nix"
 description = "Rust friendly bindings to *nix APIs"
+edition     = "2018"
 version     = "0.17.0"
 authors     = ["The nix-rust Project Developers"]
 repository  = "https://github.com/nix-rust/nix"

README.md

@@ -88,19 +88,13 @@ Tier 3:
 
 `nix` requires Rust 1.36.0 or newer.
 
-To use `nix`, first add this to your `Cargo.toml`:
+To use `nix`, add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
 nix = "0.17.0"
 ```
 
-Then, add this to your crate root:
-
-```rust,ignore
-extern crate nix;
-```
-
 ## Contributing
 
 Contributions are very welcome.  Please See [CONTRIBUTING](CONTRIBUTING.md) for

build.rs

@@ -1,6 +1,3 @@
-#[cfg(target_os = "dragonfly")]
-extern crate cc;
-
 #[cfg(target_os = "dragonfly")]
 fn main() {
     cc::Build::new()

src/dir.rs

@@ -1,11 +1,10 @@
-use {Error, NixPath, Result};
-use errno::Errno;
-use fcntl::{self, OFlag};
-use libc;
+use crate::{Error, NixPath, Result};
+use crate::errno::Errno;
+use crate::fcntl::{self, OFlag};
 use std::os::unix::io::{AsRawFd, IntoRawFd, RawFd};
 use std::ptr;
 use std::ffi;
-use sys;
+use crate::sys;
 
 #[cfg(target_os = "linux")]
 use libc::{dirent64 as dirent, readdir64_r as readdir_r};

src/env.rs

@@ -1,4 +1,5 @@
-use {Error, Result};
+use cfg_if::cfg_if;
+use crate::{Error, Result};
 
 /// Clear the environment of all name-value pairs.
 ///

src/errno.rs

@@ -1,8 +1,8 @@
+use cfg_if::cfg_if;
 #[cfg(not(target_os = "dragonfly"))]
-use libc;
 use libc::{c_int, c_void};
 use std::{fmt, io, error};
-use {Error, Result};
+use crate::{Error, Result};
 
 pub use self::consts::*;
 
@@ -584,8 +584,6 @@ fn desc(errno: Errno) -> &'static str {
 
 #[cfg(any(target_os = "linux", target_os = "android"))]
 mod consts {
-    use libc;
-
     #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     #[repr(i32)]
     pub enum Errno {
@@ -873,8 +871,6 @@ mod consts {
 
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 mod consts {
-    use libc;
-
     #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     #[repr(i32)]
     pub enum Errno {
@@ -1110,8 +1106,6 @@ mod consts {
 
 #[cfg(target_os = "freebsd")]
 mod consts {
-    use libc;
-
     #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     #[repr(i32)]
     pub enum Errno {
@@ -1328,8 +1322,6 @@ mod consts {
 
 #[cfg(target_os = "dragonfly")]
 mod consts {
-    use libc;
-
     #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     #[repr(i32)]
     pub enum Errno {
@@ -1543,8 +1535,6 @@ mod consts {
 
 #[cfg(target_os = "openbsd")]
 mod consts {
-    use libc;
-
     #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     #[repr(i32)]
     pub enum Errno {
@@ -1757,8 +1747,6 @@ mod consts {
 
 #[cfg(target_os = "netbsd")]
 mod consts {
-    use libc;
-
     #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     #[repr(i32)]
     pub enum Errno {
@@ -1973,8 +1961,6 @@ mod consts {
 
 #[cfg(target_os = "redox")]
 mod consts {
-    use libc;
-
     #[derive(Clone, Copy, Debug, Eq, PartialEq)]
     #[repr(i32)]
     pub enum Errno {

src/fcntl.rs

@@ -1,17 +1,17 @@
-use errno::Errno;
+use crate::errno::Errno;
 use libc::{self, c_char, c_int, c_uint, size_t, ssize_t};
 use std::ffi::OsString;
 #[cfg(not(target_os = "redox"))]
 use std::os::raw;
 use std::os::unix::ffi::OsStringExt;
 use std::os::unix::io::RawFd;
-use sys::stat::Mode;
-use {NixPath, Result};
+use crate::sys::stat::Mode;
+use crate::{NixPath, Result};
 
 #[cfg(any(target_os = "android", target_os = "linux"))]
 use std::ptr; // For splice and copy_file_range
 #[cfg(any(target_os = "android", target_os = "linux"))]
-use sys::uio::IoVec; // For vmsplice
+use crate::sys::uio::IoVec; // For vmsplice
 
 #[cfg(any(
     target_os = "linux",
@@ -586,10 +586,10 @@ pub fn fallocate(
     target_env = "freebsd"
 ))]
 mod posix_fadvise {
-    use errno::Errno;
+    use crate::errno::Errno;
     use libc;
     use std::os::unix::io::RawFd;
-    use Result;
+    use crate::Result;
 
     libc_enum! {
         #[repr(i32)]

src/features.rs

@@ -3,7 +3,7 @@ pub use self::os::*;
 
 #[cfg(any(target_os = "linux", target_os = "android"))]
 mod os {
-    use sys::utsname::uname;
+    use crate::sys::utsname::uname;
 
     // Features:
     // * atomic cloexec on socket: 2.6.27

src/ifaddrs.rs

@@ -3,16 +3,15 @@
 //! Uses the Linux and/or BSD specific function `getifaddrs` to query the list
 //! of interfaces and their associated addresses.
 
+use cfg_if::cfg_if;
 use std::ffi;
 use std::iter::Iterator;
 use std::mem;
 use std::option::Option;
 
-use libc;
-
-use {Result, Errno};
-use sys::socket::SockAddr;
-use net::if_::*;
+use crate::{Result, Errno};
+use crate::sys::socket::SockAddr;
+use crate::net::if_::*;
 
 /// Describes a single address for an interface as returned by `getifaddrs`.
 #[derive(Clone, Debug, Eq, Hash, PartialEq)]

src/kmod.rs

@@ -6,8 +6,8 @@ use libc;
 use std::ffi::CStr;
 use std::os::unix::io::AsRawFd;
 
-use errno::Errno;
-use Result;
+use crate::errno::Errno;
+use crate::Result;
 
 /// Loads a kernel module from a buffer.
 ///