Upgrade to the 2018 edition

I didn't think it'd be this useful first, but thank god for `cargo fix --edition`!

Cargo.toml

@@ -2,6 +2,7 @@
 name = "relibc"
 version = "0.1.0"
 authors = ["Jeremy Soller <jackpot51@gmail.com>"]
+edition = "2018"
 
 [lib]
 name = "relibc"

src/c_str.rs

@@ -23,11 +23,11 @@ use core::ptr;
 use core::slice;
 use core::str::{self, Utf8Error};
 
-use header::string::strlen;
-use platform::types::*;
+use crate::header::string::strlen;
+use crate::platform::types::*;
 
 pub fn memchr(needle: u8, haystack: &[u8]) -> Option<usize> {
-    use header::string;
+    use crate::header::string;
 
     let p = unsafe {
         string::memchr(

src/cxa.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 // TODO: Implement cxa_finalize and uncomment this
 

src/db.rs

@@ -1,10 +1,10 @@
 use alloc::string::String;
 use alloc::vec::Vec;
 
-use c_str::CStr;
-use fs::File;
-use header::fcntl;
-use io::{self, BufRead, BufReader};
+use crate::c_str::CStr;
+use crate::fs::File;
+use crate::header::fcntl;
+use crate::io::{self, BufRead, BufReader};
 
 pub enum Separator {
     Character(char),

src/fs.rs

@@ -1,10 +1,10 @@
-use c_str::CStr;
+use crate::c_str::CStr;
 use core::ops::Deref;
-use header::fcntl::O_CREAT;
-use header::unistd::{SEEK_CUR, SEEK_END, SEEK_SET};
-use io;
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::header::fcntl::O_CREAT;
+use crate::header::unistd::{SEEK_CUR, SEEK_END, SEEK_SET};
+use crate::io;
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 pub struct File {
     pub fd: c_int,

src/header/_aio/mod.rs

@@ -1,5 +1,5 @@
-use header::time::{sigevent, timespec};
-use platform::types::*;
+use crate::header::time::{sigevent, timespec};
+use crate::platform::types::*;
 
 pub struct aiocb {
     pub aio_fildes: c_int,

src/header/_fenv/mod.rs

@@ -1,7 +1,7 @@
 //! fenv.h implementation for Redox, following
 //! http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/fenv.h.html
 
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const FE_ALL_EXCEPT: c_int = 0;
 pub const FE_TONEAREST: c_int = 0;

src/header/_wctype/mod.rs

@@ -1,6 +1,6 @@
 //! wctype implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/wctype.h.html
 
-use platform::types::*;
+use crate::platform::types::*;
 
 // #[no_mangle]
 pub extern "C" fn iswalnum(wc: wint_t) -> c_int {

src/header/arpa_inet/mod.rs

@@ -3,13 +3,13 @@
 use core::str::FromStr;
 use core::{ptr, slice, str};
 
-use c_str::CStr;
-use header::errno::*;
-use header::netinet_in::{in_addr, in_addr_t, INADDR_NONE};
-use header::sys_socket::constants::*;
-use header::sys_socket::socklen_t;
-use platform;
-use platform::types::*;
+use crate::c_str::CStr;
+use crate::header::errno::*;
+use crate::header::netinet_in::{in_addr, in_addr_t, INADDR_NONE};
+use crate::header::sys_socket::constants::*;
+use crate::header::sys_socket::socklen_t;
+use crate::platform;
+use crate::platform::types::*;
 
 #[no_mangle]
 pub extern "C" fn htonl(hostlong: u32) -> u32 {

src/header/assert/mod.rs

@@ -1,9 +1,9 @@
 //! assert implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/assert.h.html
 
-use c_str::CStr;
+use crate::c_str::CStr;
 use core::fmt::Write;
-use header::{stdio, stdlib};
-use platform::types::*;
+use crate::header::{stdio, stdlib};
+use crate::platform::types::*;
 
 #[no_mangle]
 pub unsafe extern "C" fn __assert_fail(

src/header/ctype/mod.rs

@@ -1,6 +1,6 @@
 //! ctype implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/ctype.h.html
 
-use platform::types::*;
+use crate::platform::types::*;
 
 #[no_mangle]
 pub extern "C" fn isalnum(c: c_int) -> c_int {

src/header/dirent/mod.rs

@@ -3,14 +3,14 @@
 use alloc::boxed::Box;
 use core::{mem, ptr};
 
-use c_str::CStr;
-use c_vec::CVec;
-use fs::File;
-use header::{errno, fcntl, stdlib, string};
-use io::{Seek, SeekFrom};
-use platform::types::*;
-use platform::{Pal, Sys};
-use platform;
+use crate::c_str::CStr;
+use crate::c_vec::CVec;
+use crate::fs::File;
+use crate::header::{errno, fcntl, stdlib, string};
+use crate::io::{Seek, SeekFrom};
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
+use crate::platform;
 
 const DIR_BUF_SIZE: usize = mem::size_of::<dirent>() * 3;
 

src/header/dl-tls/mod.rs

@@ -1,7 +1,7 @@
 //! dl-tls implementation for Redox
 
-use ld_so::tcb::Tcb;
-use platform::types::*;
+use crate::ld_so::tcb::Tcb;
+use crate::platform::types::*;
 
 #[repr(C)]
 pub struct dl_tls_index {

src/header/dlfcn/mod.rs

@@ -3,8 +3,8 @@
 use core::sync::atomic::{AtomicUsize, Ordering};
 use core::{ptr, str};
 
-use c_str::CStr;
-use platform::types::*;
+use crate::c_str::CStr;
+use crate::platform::types::*;
 
 pub const RTLD_LAZY: c_int = 0x0001;
 pub const RTLD_NOW: c_int = 0x0002;

src/header/errno/mod.rs

@@ -1,7 +1,7 @@
 //! errno implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/errno.h.html
 
-use platform;
-use platform::types::*;
+use crate::platform;
+use crate::platform::types::*;
 
 //TODO: Consider removing, provided for compatibility with newlib
 #[no_mangle]

src/header/fcntl/linux.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const O_RDONLY: c_int = 0x0000;
 pub const O_WRONLY: c_int = 0x0001;

src/header/fcntl/mod.rs

@@ -1,8 +1,8 @@
 //! fcntl implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/fcntl.h.html
 
-use c_str::CStr;
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::c_str::CStr;
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 pub use self::sys::*;
 

src/header/fcntl/redox.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const O_RDONLY: c_int = 0x0001_0000;
 pub const O_WRONLY: c_int = 0x0002_0000;

src/header/float/mod.rs

@@ -1,8 +1,8 @@
 //! float.h implementation for Redox, following
 //! http://pubs.opengroup.org/onlinepubs/7908799/xsh/float.h.html
 
-use header::_fenv::{fegetround, FE_TONEAREST};
-use platform::types::*;
+use crate::header::_fenv::{fegetround, FE_TONEAREST};
+use crate::platform::types::*;
 
 pub const FLT_RADIX: c_int = 2;
 

src/header/fnmatch/mod.rs

@@ -4,7 +4,7 @@ use alloc::borrow::Cow;
 use alloc::vec::Vec;
 use core::slice;
 
-use platform::types::*;
+use crate::platform::types::*;
 use posix_regex::compile::{Collation, Range, Token};
 use posix_regex::PosixRegex;
 

src/header/getopt/mod.rs

@@ -1,9 +1,9 @@
 //! getopt implementation for relibc
 
 use core::ptr;
-use header::unistd::{optarg, opterr, optind, optopt};
-use header::{stdio, string};
-use platform::types::*;
+use crate::header::unistd::{optarg, opterr, optind, optopt};
+use crate::header::{stdio, string};
+use crate::platform::types::*;
 
 static mut CURRENT_OPT: *mut c_char = ptr::null_mut();
 

src/header/grp/mod.rs

@@ -1,6 +1,6 @@
 //! grp implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/grp.h.html
 
-use platform::types::*;
+use crate::platform::types::*;
 
 #[repr(C)]
 pub struct group {

src/header/inttypes/mod.rs

@@ -1,8 +1,8 @@
-use header::ctype;
-use header::errno::*;
-use header::stdlib::*;
-use platform;
-use platform::types::*;
+use crate::header::ctype;
+use crate::header::errno::*;
+use crate::header::stdlib::*;
+use crate::platform;
+use crate::platform::types::*;
 
 #[no_mangle]
 pub extern "C" fn imaxabs(i: intmax_t) -> intmax_t {

src/header/libgen/mod.rs

@@ -1,8 +1,8 @@
 //! libgen implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/libgen.h.html
 
-use platform::types::c_char;
+use crate::platform::types::c_char;
 
-use header::string::strlen;
+use crate::header::string::strlen;
 
 #[no_mangle]
 pub unsafe extern "C" fn basename(str: *mut c_char) -> *mut c_char {

src/header/locale/mod.rs

@@ -2,7 +2,7 @@
 
 use core::ptr;
 
-use platform::types::*;
+use crate::platform::types::*;
 
 const EMPTY_PTR: *const c_char = "\0" as *const _ as *const c_char;
 // Can't use &str because of the mutability

src/header/netdb/host.rs

@@ -3,15 +3,15 @@ use alloc::str::SplitWhitespace;
 use alloc::vec::Vec;
 use core::{mem, ptr};
 
-use c_str::CString;
-use header::arpa_inet::inet_aton;
-use header::fcntl::O_RDONLY;
-use header::netinet_in::in_addr;
-use header::sys_socket::constants::AF_INET;
-use header::unistd::SEEK_SET;
-use platform::rlb::{Line, RawLineBuffer};
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::c_str::CString;
+use crate::header::arpa_inet::inet_aton;
+use crate::header::fcntl::O_RDONLY;
+use crate::header::netinet_in::in_addr;
+use crate::header::sys_socket::constants::AF_INET;
+use crate::header::unistd::SEEK_SET;
+use crate::platform::rlb::{Line, RawLineBuffer};
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 use super::{bytes_to_box_str, hostent};
 

src/header/netdb/linux.rs

@@ -1,8 +1,8 @@
 use alloc::string::String;
-use c_str::CString;
-use fs::File;
-use header::fcntl;
-use io::{BufRead, BufReader};
+use crate::c_str::CString;
+use crate::fs::File;
+use crate::header::fcntl;
+use crate::io::{BufRead, BufReader};
 
 pub fn get_dns_server() -> String {
     let file = match File::open(&CString::new("/etc/resolv.conf").unwrap(), fcntl::O_RDONLY) {

src/header/netdb/lookup.rs

@@ -3,17 +3,17 @@ use alloc::string::{String, ToString};
 use alloc::vec::{IntoIter, Vec};
 use core::mem;
 
-use platform::types::*;
-use platform::{Pal, Sys};
-
-use header::arpa_inet::htons;
-use header::errno::*;
-use header::netinet_in::{in_addr, sockaddr_in, IPPROTO_UDP};
-use header::sys_socket;
-use header::sys_socket::constants::{AF_INET, SOCK_DGRAM};
-use header::sys_socket::{sockaddr, socklen_t};
-use header::time;
-use header::time::timespec;
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
+
+use crate::header::arpa_inet::htons;
+use crate::header::errno::*;
+use crate::header::netinet_in::{in_addr, sockaddr_in, IPPROTO_UDP};
+use crate::header::sys_socket;
+use crate::header::sys_socket::constants::{AF_INET, SOCK_DGRAM};
+use crate::header::sys_socket::{sockaddr, socklen_t};
+use crate::header::time;
+use crate::header::time::timespec;
 
 use super::dns::{Dns, DnsQuery};
 use super::sys::get_dns_server;

src/header/netdb/mod.rs

@@ -10,20 +10,20 @@ use alloc::boxed::Box;
 use alloc::str::SplitWhitespace;
 use alloc::vec::Vec;
 
-use c_str::{CStr, CString};
-use header::arpa_inet::htons;
-use header::errno::*;
-use header::fcntl::O_RDONLY;
-use header::netinet_in::{in_addr, sockaddr_in, sockaddr_in6};
-use header::stdlib::atoi;
-use header::strings::strcasecmp;
-use header::sys_socket::constants::AF_INET;
-use header::sys_socket::{sa_family_t, sockaddr, socklen_t};
-use header::unistd::SEEK_SET;
-use platform;
-use platform::rlb::{Line, RawLineBuffer};
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::c_str::{CStr, CString};
+use crate::header::arpa_inet::htons;
+use crate::header::errno::*;
+use crate::header::fcntl::O_RDONLY;
+use crate::header::netinet_in::{in_addr, sockaddr_in, sockaddr_in6};
+use crate::header::stdlib::atoi;
+use crate::header::strings::strcasecmp;
+use crate::header::sys_socket::constants::AF_INET;
+use crate::header::sys_socket::{sa_family_t, sockaddr, socklen_t};
+use crate::header::unistd::SEEK_SET;
+use crate::platform;
+use crate::platform::rlb::{Line, RawLineBuffer};
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 #[cfg(target_os = "linux")]
 #[path = "linux.rs"]

src/header/netdb/redox.rs

@@ -1,8 +1,8 @@
 use alloc::string::String;
-use c_str::CString;
-use fs::File;
-use header::fcntl;
-use io::Read;
+use crate::c_str::CString;
+use crate::fs::File;
+use crate::header::fcntl;
+use crate::io::Read;
 
 pub fn get_dns_server() -> String {
     let mut string = String::new();

src/header/netinet_in/mod.rs

@@ -1,7 +1,7 @@
 #![allow(non_camel_case_types)]
 
-use header::sys_socket::sa_family_t;
-use platform::types::*;
+use crate::header::sys_socket::sa_family_t;
+use crate::platform::types::*;
 
 pub type in_addr_t = u32;
 pub type in_port_t = u16;

src/header/netinet_tcp/mod.rs

@@ -1,3 +1,3 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const TCP_NODELAY: c_int = 1;

src/header/poll/mod.rs

@@ -2,11 +2,11 @@
 
 use core::{mem, slice};
 
-use fs::File;
-use header::sys_epoll::{epoll_create1, epoll_ctl, epoll_data, epoll_event, epoll_wait, EPOLLERR,
+use crate::fs::File;
+use crate::header::sys_epoll::{epoll_create1, epoll_ctl, epoll_data, epoll_event, epoll_wait, EPOLLERR,
                         EPOLLHUP, EPOLLIN, EPOLLNVAL, EPOLLOUT, EPOLLPRI, EPOLL_CLOEXEC,
                         EPOLL_CTL_ADD};
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const POLLIN: c_short = 0x001;
 pub const POLLPRI: c_short = 0x002;

src/header/pwd/mod.rs

@@ -2,11 +2,11 @@
 
 use core::ptr;
 
-use fs::File;
-use header::{errno, fcntl};
-use io::{BufRead, BufReader};
-use platform;
-use platform::types::*;
+use crate::fs::File;
+use crate::header::{errno, fcntl};
+use crate::io::{BufRead, BufReader};
+use crate::platform;
+use crate::platform::types::*;
 
 #[cfg(target_os = "linux")]
 mod linux;

src/header/regex/mod.rs

@@ -3,8 +3,8 @@
 use alloc::borrow::Cow;
 use alloc::vec::Vec;
 use core::{mem, ptr, slice};
-use header::string::strlen;
-use platform::types::*;
+use crate::header::string::strlen;
+use crate::platform::types::*;
 use posix_regex::compile::{Error as CompileError, Range, Token};
 use posix_regex::{PosixRegex, PosixRegexBuilder};
 

src/header/semaphore/mod.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 #[repr(C)]
 #[derive(Copy)]

src/header/sgtty/mod.rs

@@ -1,7 +1,7 @@
 //! sgtty implementation that won't work on redox because no ioctl
 
-use header::sys_ioctl::*;
-use platform::types::*;
+use crate::header::sys_ioctl::*;
+use crate::platform::types::*;
 
 #[no_mangle]
 pub extern "C" fn gtty(fd: c_int, out: *mut sgttyb) -> c_int {

src/header/signal/mod.rs

@@ -4,10 +4,10 @@ use core::{mem, ptr};
 
 use cbitset::BitSet;
 
-use header::errno;
-use platform;
-use platform::types::*;
-use platform::{PalSignal, Sys};
+use crate::header::errno;
+use crate::platform;
+use crate::platform::types::*;
+use crate::platform::{PalSignal, Sys};
 
 pub use self::sys::*;
 

src/header/stdio/constants.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const EOF: c_int = -1;
 pub const BUFSIZ: c_int = 1024;

src/header/stdio/default.rs

@@ -2,10 +2,10 @@ use super::{constants, Buffer, BUFSIZ, FILE};
 use core::cell::UnsafeCell;
 use core::ptr;
 
-use fs::File;
-use io::LineWriter;
-use platform::types::*;
-use sync::Mutex;
+use crate::fs::File;
+use crate::io::LineWriter;
+use crate::platform::types::*;
+use crate::sync::Mutex;
 
 pub struct GlobalFile(UnsafeCell<FILE>);
 impl GlobalFile {

src/header/stdio/ext.rs

@@ -1,5 +1,5 @@
-use header::stdio::{FILE, F_NORD, F_NOWR};
-use platform::types::*;
+use crate::header::stdio::{FILE, F_NORD, F_NOWR};
+use crate::platform::types::*;
 
 #[no_mangle]
 pub extern "C" fn __fpending(stream: *mut FILE) -> size_t {

src/header/stdio/getdelim.rs

@@ -1,10 +1,10 @@
 use alloc::vec::Vec;
 use core::ptr;
 
-use header::stdio::FILE;
-use header::stdlib;
-use io::BufRead;
-use platform::types::*;
+use crate::header::stdio::FILE;
+use crate::header::stdlib;
+use crate::io::BufRead;
+use crate::platform::types::*;
 
 #[no_mangle]
 pub unsafe extern "C" fn __getline(

src/header/stdio/helpers.rs

@@ -1,13 +1,13 @@
 use alloc::boxed::Box;
 
-use fs::File;
-use header::errno;
-use header::fcntl::*;
-use header::string::strchr;
-use io::LineWriter;
-use platform;
-use platform::types::*;
-use sync::Mutex;
+use crate::fs::File;
+use crate::header::errno;
+use crate::header::fcntl::*;
+use crate::header::string::strchr;
+use crate::io::LineWriter;
+use crate::platform;
+use crate::platform::types::*;
+use crate::sync::Mutex;
 
 use super::constants::*;
 use super::{Buffer, FILE};

src/header/stdio/mod.rs

@@ -8,17 +8,17 @@ use core::fmt::Write as WriteFmt;
 use core::ops::{Deref, DerefMut};
 use core::{fmt, mem, ptr, slice, str};
 
-use c_str::CStr;
-use fs::File;
-use header::errno::{self, STR_ERROR};
-use header::string::{self, strlen};
-use header::{fcntl, stdlib, unistd};
-use io::{self, BufRead, LineWriter, Read, Write};
-use platform;
-use platform::types::*;
-use platform::{errno, WriteByte};
-use platform::{Pal, Sys};
-use sync::Mutex;
+use crate::c_str::CStr;
+use crate::fs::File;
+use crate::header::errno::{self, STR_ERROR};
+use crate::header::string::{self, strlen};
+use crate::header::{fcntl, stdlib, unistd};
+use crate::io::{self, BufRead, LineWriter, Read, Write};
+use crate::platform;
+use crate::platform::types::*;
+use crate::platform::{errno, WriteByte};
+use crate::platform::{Pal, Sys};
+use crate::sync::Mutex;
 
 pub use self::constants::*;
 mod constants;

src/header/stdio/printf.rs

@@ -5,7 +5,7 @@ use alloc::vec::Vec;
 use core::ffi::VaList;
 use core::ops::Range;
 use core::{char, cmp, f64, fmt, slice};
-use io::{self, Write};
+use crate::io::{self, Write};
 
 use crate::header::errno::EILSEQ;
 use crate::platform::types::*;

src/header/stdio/scanf.rs

@@ -1,8 +1,8 @@
 use alloc::string::String;
 use alloc::vec::Vec;
 use core::ffi::VaList as va_list;
-use io::Read;
-use platform::types::*;
+use crate::io::Read;
+use crate::platform::types::*;
 
 #[derive(PartialEq, Eq)]
 enum IntKind {

src/header/stdlib/lcg48.rs

@@ -1,6 +1,6 @@
 //! Helper functions for pseudorandom number generation using LCG, see https://pubs.opengroup.org/onlinepubs/9699919799.2018edition/functions/drand48.html
 
-use platform::types::*;
+use crate::platform::types::*;
 
 /* The default element buffer for the linear congruential generator's
  * sequence. Implemented using a c_ushort array for consistency between

src/header/stdlib/mod.rs

@@ -7,20 +7,20 @@ use rand::prng::XorShiftRng;
 use rand::rngs::JitterRng;
 use rand::{Rng, SeedableRng};
 
-use c_str::CStr;
-use fs::File;
-use header::errno::*;
-use header::fcntl::*;
-use header::limits;
-use header::string::*;
-use header::time::constants::CLOCK_MONOTONIC;
-use header::time::timespec;
-use header::unistd::{sysconf, _SC_PAGESIZE};
-use header::wchar::*;
-use header::{ctype, errno, unistd};
-use platform;
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::c_str::CStr;
+use crate::fs::File;
+use crate::header::errno::*;
+use crate::header::fcntl::*;
+use crate::header::limits;
+use crate::header::string::*;
+use crate::header::time::constants::CLOCK_MONOTONIC;
+use crate::header::time::timespec;
+use crate::header::unistd::{sysconf, _SC_PAGESIZE};
+use crate::header::wchar::*;
+use crate::header::{ctype, errno, unistd};
+use crate::platform;
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 mod lcg48;
 mod sort;

src/header/stdlib/sort.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub fn introsort(
     base: *mut c_char,

src/header/string/mod.rs

@@ -4,10 +4,10 @@ use core::{mem, ptr, slice, usize};
 
 use cbitset::BitSet256;
 
-use header::errno::*;
-use header::signal;
-use platform;
-use platform::types::*;
+use crate::header::errno::*;
+use crate::header::signal;
+use crate::platform;
+use crate::platform::types::*;
 
 #[no_mangle]
 pub unsafe extern "C" fn memccpy(

src/header/strings/mod.rs

@@ -2,8 +2,8 @@
 
 use core::ptr;
 
-use header::{ctype, string};
-use platform::types::*;
+use crate::header::{ctype, string};
+use crate::platform::types::*;
 
 #[no_mangle]
 pub unsafe extern "C" fn bcmp(first: *const c_void, second: *const c_void, n: size_t) -> c_int {

src/header/sys_auxv/mod.rs

@@ -1,6 +1,6 @@
 //! sys/auxv.h implementation
 
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const AT_HWCAP: usize = 16;
 

src/header/sys_epoll/linux.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const EPOLL_CLOEXEC: c_int = 0x8_0000;
 

src/header/sys_epoll/mod.rs

@@ -2,9 +2,9 @@
 
 use core::ptr;
 
-use header::signal::sigset_t;
-use platform::types::*;
-use platform::{PalEpoll, Sys};
+use crate::header::signal::sigset_t;
+use crate::platform::types::*;
+use crate::platform::{PalEpoll, Sys};
 
 pub use self::sys::*;
 

src/header/sys_epoll/redox.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const EPOLL_CLOEXEC: c_int = 0x0100_0000;
 

src/header/sys_file/mod.rs

@@ -1,7 +1,7 @@
 //! sys/file.h implementation
 
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 pub const LOCK_SH: usize = 1;
 pub const LOCK_EX: usize = 2;

src/header/sys_ioctl/linux.rs

@@ -1,5 +1,5 @@
-use platform::types::*;
-use platform::Sys;
+use crate::platform::types::*;
+use crate::platform::Sys;
 
 #[no_mangle]
 pub unsafe extern "C" fn ioctl(fd: c_int, request: c_ulong, out: *mut c_void) -> c_int {

src/header/sys_ioctl/mod.rs

@@ -1,6 +1,6 @@
 //! ioctl implementation for linux
 
-use platform::types::*;
+use crate::platform::types::*;
 
 // This is used from sgtty
 #[repr(C)]

src/header/sys_ioctl/redox.rs

@@ -1,11 +1,11 @@
 use core::{mem, slice};
 use syscall;
 
-use header::errno;
-use header::termios;
-use platform;
-use platform::e;
-use platform::types::*;
+use crate::header::errno;
+use crate::header::termios;
+use crate::platform;
+use crate::platform::e;
+use crate::platform::types::*;
 
 use super::winsize;
 

src/header/sys_mman/linux.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const PROT_READ: c_int = 0x0001;
 pub const PROT_WRITE: c_int = 0x0002;

src/header/sys_mman/mod.rs

@@ -1,7 +1,7 @@
-use c_str::{CStr, CString};
-use header::{fcntl, unistd};
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::c_str::{CStr, CString};
+use crate::header::{fcntl, unistd};
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 pub use self::sys::*;
 

src/header/sys_mman/redox.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const PROT_NONE: c_int = 0x0000;
 pub const PROT_EXEC: c_int = 0x0001;

src/header/sys_ptrace/mod.rs

@@ -1,8 +1,8 @@
 //! ptrace compatibility layer for Redox OS
 
 use core::ffi::VaList;
-use platform::types::*;
-use platform::{PalPtrace, Sys};
+use crate::platform::types::*;
+use crate::platform::{PalPtrace, Sys};
 
 pub const PTRACE_TRACEME: c_int = 0;
 pub const PTRACE_PEEKTEXT: c_int = 1;

src/header/sys_select/mod.rs

@@ -4,13 +4,13 @@ use core::mem;
 
 use cbitset::BitSet;
 
-use fs::File;
-use header::errno;
-use header::sys_epoll::{epoll_create1, epoll_ctl, epoll_data, epoll_event, epoll_wait, EPOLLERR,
+use crate::fs::File;
+use crate::header::errno;
+use crate::header::sys_epoll::{epoll_create1, epoll_ctl, epoll_data, epoll_event, epoll_wait, EPOLLERR,
                         EPOLLIN, EPOLLOUT, EPOLL_CLOEXEC, EPOLL_CTL_ADD};
-use header::sys_time::timeval;
-use platform;
-use platform::types::*;
+use crate::header::sys_time::timeval;
+use crate::platform;
+use crate::platform::types::*;
 
 // fd_set is also defined in C because cbindgen is incompatible with mem::size_of booo
 

src/header/sys_socket/constants.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const SOCK_STREAM: c_int = 1;
 pub const SOCK_DGRAM: c_int = 2;

src/header/sys_socket/mod.rs

@@ -2,8 +2,8 @@
 
 use core::ptr;
 
-use platform::types::*;
-use platform::{PalSocket, Sys};
+use crate::platform::types::*;
+use crate::platform::{PalSocket, Sys};
 
 pub mod constants;
 

src/header/sys_stat/mod.rs

@@ -1,10 +1,10 @@
 //! stat implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/sysstat.h.html
 
-use c_str::CStr;
-use header::fcntl::{O_NOFOLLOW, O_PATH};
-use header::time::timespec;
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::c_str::CStr;
+use crate::header::fcntl::{O_NOFOLLOW, O_PATH};
+use crate::header::time::timespec;
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 pub const S_IFMT: c_int = 0o0_170_000;
 

src/header/sys_statvfs/mod.rs

@@ -1,9 +1,9 @@
 //! statvfs implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/sysstatvfs.h.html
 
-use c_str::CStr;
-use header::fcntl::O_PATH;
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::c_str::CStr;
+use crate::header::fcntl::O_PATH;
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 //pub const ST_RDONLY
 //pub const ST_NOSUID

src/header/sys_time/mod.rs

@@ -1,9 +1,9 @@
 //! sys/time implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/systime.h.html
 
-use c_str::CStr;
-use header::time::timespec;
-use platform::types::*;
-use platform::{Pal, PalSignal, Sys};
+use crate::c_str::CStr;
+use crate::header::time::timespec;
+use crate::platform::types::*;
+use crate::platform::{Pal, PalSignal, Sys};
 
 pub const ITIMER_REAL: c_int = 0;
 pub const ITIMER_VIRTUAL: c_int = 1;

src/header/sys_timeb/mod.rs

@@ -1,7 +1,7 @@
 //! sys/time implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/systime.h.html
 
-use header::sys_time::{gettimeofday, timeval, timezone};
-use platform::types::*;
+use crate::header::sys_time::{gettimeofday, timeval, timezone};
+use crate::platform::types::*;
 
 #[repr(C)]
 #[derive(Default)]

src/header/sys_uio/mod.rs

@@ -3,9 +3,9 @@
 use alloc::vec::Vec;
 use core::slice;
 
-use header::{errno, unistd};
-use platform;
-use platform::types::*;
+use crate::header::{errno, unistd};
+use crate::platform;
+use crate::platform::types::*;
 
 pub const IOV_MAX: c_int = 1024;
 

src/header/sys_un/mod.rs

@@ -1,5 +1,5 @@
-use header::sys_socket::sa_family_t;
-use platform::types::*;
+use crate::header::sys_socket::sa_family_t;
+use crate::platform::types::*;
 
 #[repr(C)]
 pub struct sockaddr_un {

src/header/sys_user/mod.rs

@@ -1,6 +1,6 @@
 //! A part of the ptrace compatibility for Redox OS
 
-use platform::types::*;
+use crate::platform::types::*;
 
 #[repr(C)]
 pub struct user_fpregs_struct {

src/header/sys_utsname/mod.rs

@@ -1,7 +1,7 @@
 //! sys/utsname implementation, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/sysutsname.h.html
 
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 pub const UTSLENGTH: usize = 65;
 

src/header/sys_wait/mod.rs

@@ -2,8 +2,8 @@
 //! http://pubs.opengroup.org/onlinepubs/7908799/xsh/syswait.h.html
 
 //use header::sys_resource::rusage;
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 pub const WNOHANG: c_int = 1;
 pub const WUNTRACED: c_int = 2;

src/header/termios/mod.rs

@@ -1,9 +1,9 @@
 //! termios implementation, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/termios.h.html
 
-use header::errno;
-use header::sys_ioctl;
-use platform;
-use platform::types::*;
+use crate::header::errno;
+use crate::header::sys_ioctl;
+use crate::platform;
+use crate::platform::types::*;
 
 pub type cc_t = u8;
 pub type speed_t = u32;

src/header/time/constants.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub use self::sys::*;
 

src/header/time/linux.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const CLOCK_REALTIME: c_int = 0;
 pub const CLOCK_MONOTONIC: c_int = 1;

src/header/time/mod.rs

@@ -1,9 +1,9 @@
 //! time implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/time.h.html
 
-use header::errno::EIO;
-use platform;
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::header::errno::EIO;
+use crate::platform;
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 use self::constants::*;
 

src/header/time/redox.rs

@@ -1,4 +1,4 @@
-use platform::types::*;
+use crate::platform::types::*;
 
 pub const CLOCK_REALTIME: c_int = 1;
 pub const CLOCK_MONOTONIC: c_int = 4;

src/header/time/strftime.rs

@@ -1,7 +1,7 @@
 use alloc::string::String;
 
-use platform::types::*;
-use platform::{self, WriteByte};
+use crate::platform::types::*;
+use crate::platform::{self, WriteByte};
 
 use super::tm;
 

src/header/unistd/brk.rs

@@ -1,9 +1,9 @@
 use core::ptr;
 
-use header::errno::ENOMEM;
-use platform;
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::header::errno::ENOMEM;
+use crate::platform;
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 static mut BRK: *mut c_void = ptr::null_mut();
 

src/header/unistd/getopt.rs

@@ -2,8 +2,8 @@
 
 use core::ptr;
 
-use header::getopt;
-use platform::types::*;
+use crate::header::getopt;
+use crate::platform::types::*;
 
 #[allow(non_upper_case_globals)]
 #[no_mangle]

src/header/unistd/mod.rs

@@ -4,17 +4,17 @@ use core::convert::TryFrom;
 use core::{mem, ptr, slice};
 
 use alloc::collections::LinkedList;
-use c_str::CStr;
-use header::errno;
-use header::limits;
-use header::stdlib::getenv;
-use header::sys_ioctl;
-use header::sys_time;
-use header::termios;
-use header::time::timespec;
-use platform;
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::c_str::CStr;
+use crate::header::errno;
+use crate::header::limits;
+use crate::header::stdlib::getenv;
+use crate::header::sys_ioctl;
+use crate::header::sys_time;
+use crate::header::termios;
+use crate::header::time::timespec;
+use crate::platform;
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 pub use self::brk::*;
 pub use self::getopt::*;

src/header/unistd/pathconf.rs

@@ -1,6 +1,6 @@
-use header::errno;
-use platform;
-use platform::types::*;
+use crate::header::errno;
+use crate::platform;
+use crate::platform::types::*;
 
 pub const _PC_LINK_MAX: c_int = 0;
 pub const _PC_MAX_CANON: c_int = 1;

src/header/unistd/sysconf.rs

@@ -1,6 +1,6 @@
-use header::errno;
-use platform;
-use platform::types::*;
+use crate::header::errno;
+use crate::platform;
+use crate::platform::types::*;
 
 // POSIX.1 {
 pub const _SC_ARG_MAX: c_int = 0;

src/header/utime/mod.rs

@@ -1,9 +1,9 @@
 //! utime implementation for Redox, following http://pubs.opengroup.org/onlinepubs/7908799/xsh/utime.h.html
 
-use c_str::CStr;
-use header::time::timespec;
-use platform::types::*;
-use platform::{Pal, Sys};
+use crate::c_str::CStr;
+use crate::header::time::timespec;
+use crate::platform::types::*;
+use crate::platform::{Pal, Sys};
 
 #[repr(C)]
 #[derive(Clone)]

src/header/wchar/mod.rs

@@ -3,14 +3,14 @@
 use core::ffi::VaList as va_list;
 use core::{char, mem, ptr, usize};
 
-use header::ctype::isspace;
-use header::errno::ERANGE;
-use header::stdio::*;
-use header::stdlib::MB_CUR_MAX;
-use header::string;
-use header::time::*;
-use platform;
-use platform::types::*;
+use crate::header::ctype::isspace;
+use crate::header::errno::ERANGE;
+use crate::header::stdio::*;
+use crate::header::stdlib::MB_CUR_MAX;
+use crate::header::string;
+use crate::header::time::*;
+use crate::platform;
+use crate::platform::types::*;
 
 mod utf8;
 

src/header/wchar/utf8.rs

@@ -3,9 +3,9 @@
 
 use core::{char, slice, str, usize};
 
-use header::errno;
-use platform;
-use platform::types::*;
+use crate::header::errno;
+use crate::platform;
+use crate::platform::types::*;
 
 use super::mbstate_t;
 

src/ld_so/linker.rs

@@ -6,11 +6,11 @@ use core::{mem, ptr, slice};
 use goblin::elf::{program_header, reloc, sym, Elf};
 use goblin::error::{Error, Result};
 
-use c_str::CString;
-use fs::File;
-use header::{fcntl, sys_mman, unistd};
-use io::Read;
-use platform::types::c_void;
+use crate::c_str::CString;
+use crate::fs::File;
+use crate::header::{fcntl, sys_mman, unistd};
+use crate::io::Read;
+use crate::platform::types::c_void;
 
 use super::tcb::{Master, Tcb};
 use super::PAGE_SIZE;

src/ld_so/start.rs

@@ -1,8 +1,8 @@
 // Start code adapted from https://gitlab.redox-os.org/redox-os/relibc/blob/master/src/start.rs
 
-use c_str::CStr;
-use header::unistd;
-use platform::types::c_char;
+use crate::c_str::CStr;
+use crate::header::unistd;
+use crate::platform::types::c_char;
 
 use super::linker::Linker;
 use crate::start::Stack;

src/ld_so/tcb.rs

@@ -3,7 +3,7 @@ use core::ops::Range;
 use core::{mem, ptr, slice};
 use goblin::error::{Error, Result};
 
-use header::sys_mman;
+use crate::header::sys_mman;
 
 use super::PAGE_SIZE;
 
@@ -170,7 +170,7 @@ impl Tcb {
     /// OS specific code to create a new TLS and TCB - Redox
     #[cfg(target_os = "redox")]
     unsafe fn os_new(size: usize) -> Result<(&'static mut [u8], &'static mut [u8])> {
-        use header::unistd;
+        use crate::header::unistd;
         //TODO: better method of finding fs offset
         let pid = unistd::getpid();
         let tcb_addr = 0xB000_0000 + pid as usize * PAGE_SIZE;

src/lib.rs

@@ -64,7 +64,7 @@ pub mod platform;
 pub mod start;
 pub mod sync;
 
-use platform::{Allocator, Pal, Sys};
+use crate::platform::{Allocator, Pal, Sys};
 
 #[global_allocator]
 static ALLOCATOR: Allocator = Allocator;

src/platform/linux/epoll.rs

@@ -1,8 +1,8 @@
 use super::super::types::*;
 use super::super::PalEpoll;
 use super::{e, Sys};
-use header::signal::sigset_t;
-use header::sys_epoll::epoll_event;
+use crate::header::signal::sigset_t;
+use crate::header::sys_epoll::epoll_event;
 
 impl PalEpoll for Sys {
     fn epoll_create1(flags: c_int) -> c_int {

src/platform/linux/mod.rs

@@ -3,16 +3,16 @@ use core_io::Write;
 
 use super::types::*;
 use super::{errno, Pal};
-use c_str::CStr;
-use header::dirent::dirent;
-use header::signal::SIGCHLD;
+use crate::c_str::CStr;
+use crate::header::dirent::dirent;
+use crate::header::signal::SIGCHLD;
 // use header::sys_resource::rusage;
-use header::sys_stat::stat;
-use header::sys_statvfs::statvfs;
-use header::sys_time::{timeval, timezone};
+use crate::header::sys_stat::stat;
+use crate::header::sys_statvfs::statvfs;
+use crate::header::sys_time::{timeval, timezone};
 // use header::sys_times::tms;
-use header::sys_utsname::utsname;
-use header::time::timespec;
+use crate::header::sys_utsname::utsname;
+use crate::header::time::timespec;
 
 mod epoll;
 mod ptrace;

src/platform/linux/signal.rs

@@ -3,8 +3,8 @@ use core::mem;
 use super::super::types::*;
 use super::super::PalSignal;
 use super::{e, Sys};
-use header::signal::{sigaction, sigset_t, stack_t};
-use header::sys_time::itimerval;
+use crate::header::signal::{sigaction, sigset_t, stack_t};
+use crate::header::sys_time::itimerval;
 
 impl PalSignal for Sys {
     fn getitimer(which: c_int, out: *mut itimerval) -> c_int {

src/platform/linux/socket.rs

@@ -1,7 +1,7 @@
 use super::super::types::*;
 use super::super::PalSocket;
 use super::{e, Sys};
-use header::sys_socket::{sockaddr, socklen_t};
+use crate::header::sys_socket::{sockaddr, socklen_t};
 
 impl PalSocket for Sys {
     unsafe fn accept(socket: c_int, address: *mut sockaddr, address_len: *mut socklen_t) -> c_int {

src/platform/mod.rs

@@ -1,6 +1,6 @@
 use alloc::vec::Vec;
 use core::{fmt, ptr};
-use io::{self, Read, Write};
+use crate::io::{self, Read, Write};
 
 pub use self::allocator::*;
 

src/platform/pal/epoll.rs

@@ -1,7 +1,7 @@
 use super::super::types::*;
 use super::super::Pal;
-use header::signal::sigset_t;
-use header::sys_epoll::epoll_event;
+use crate::header::signal::sigset_t;
+use crate::header::sys_epoll::epoll_event;
 
 pub trait PalEpoll: Pal {
     fn epoll_create1(flags: c_int) -> c_int;

src/platform/pal/mod.rs

@@ -1,11 +1,11 @@
 use super::types::*;
-use c_str::CStr;
-use header::dirent::dirent;
-use header::sys_stat::stat;
-use header::sys_statvfs::statvfs;
-use header::sys_time::{timeval, timezone};
-use header::sys_utsname::utsname;
-use header::time::timespec;
+use crate::c_str::CStr;
+use crate::header::dirent::dirent;
+use crate::header::sys_stat::stat;
+use crate::header::sys_statvfs::statvfs;
+use crate::header::sys_time::{timeval, timezone};
+use crate::header::sys_utsname::utsname;
+use crate::header::time::timespec;
 
 pub use self::epoll::PalEpoll;
 mod epoll;