Upgrade syntax to Rust 2018.

Author: m-ou-se

Cargo.toml

@@ -6,6 +6,7 @@ keywords = ["argdata", "cloudabi"]
 authors = ["Mara Bos <[email protected]>"]
 license = "BSD-2-Clause"
 repository = "https://github.com/NuxiNL/argdata-rust"
+edition = "2018"
 
 [dependencies]
 byteorder = { version = "1.2.3", features = ["i128"] }

src/debug.rs

@@ -1,9 +1,6 @@
+use crate::{Argdata, ArgdataRef, ReadError, Value};
 use std::fmt;
 use std::ops::Deref;
-use Argdata;
-use ArgdataRef;
-use ReadError;
-use Value;
 
 struct FmtError<T>(Result<T, ReadError>);
 
@@ -56,7 +53,7 @@ impl<'a, 'd> fmt::Debug for Value<'a, 'd> {
 
 #[test]
 fn debug_fmt() {
-	let argdata = ::encoded(
+	let argdata = crate::encoded(
 		&b"\x06\x87\x08Hello\x00\x87\x08World\x00\x81\x02\x82\x02\x01\x86\x09\
 		\x70\xF1\x80\x29\x15\x84\x05\x58\xe5\xd9\x80\x83\x06\x80\x80"[..],
 	);
@@ -66,7 +63,7 @@ fn debug_fmt() {
 		"{\"Hello\": \"World\", false: true, timestamp(485, 88045333): 5826009, null: {null: null}}"
 	);
 
-	let argdata = ::encoded(&b"\x07\x81\x02\x82\x02\x01\x80\x87\x08Hello\x00\x81\x06\x81\x07"[..]);
+	let argdata = crate::encoded(&b"\x07\x81\x02\x82\x02\x01\x80\x87\x08Hello\x00\x81\x06\x81\x07"[..]);
 
 	assert_eq!(
 		format!("{:?}", &argdata as &Argdata),

src/env.rs

@@ -1,7 +1,4 @@
-use fd;
-
-use encoded_with_fds;
-use values::EncodedArgdata;
+use crate::{encoded_with_fds, fd, values::EncodedArgdata};
 
 /// Returns the argdata which this program was started with.
 ///

src/errors.rs

@@ -1,4 +1,3 @@
-use std;
 use std::error::Error;
 use std::fmt::Display;
 use std::str::Utf8Error;

src/intvalue.rs

@@ -3,7 +3,7 @@ use std::cmp::Ordering;
 use std::fmt;
 use std::io;
 
-use super::TryFrom;
+use crate::TryFrom;
 
 /// Represents a signed integer value of any size.
 ///

src/lib.rs

@@ -5,8 +5,6 @@
 //! Deserialization is mostly stable and tested, but the serialization
 //! interface is probably going to change, and might have bugs.
 
-extern crate byteorder;
-
 use std::io;
 
 /// Access to the program environment.
@@ -25,7 +23,7 @@ use std::convert::TryFrom;
 mod try_from;
 
 #[cfg(not(nightly))]
-use try_from::TryFrom;
+use crate::try_from::TryFrom;
 
 mod debug;
 mod errors;
@@ -38,27 +36,27 @@ mod subfield;
 mod timespec;
 mod value;
 
-pub use errors::{NoFit, NotRead, ReadError};
-pub use intvalue::IntValue;
-pub use mapiterator::{MapIterable, MapIterator};
-pub use reference::ArgdataRef;
-pub use seqiterator::{SeqIterable, SeqIterator};
-pub use strvalue::StrValue;
-pub use timespec::Timespec;
-pub use value::{Type, Value};
+pub use crate::errors::{NoFit, NotRead, ReadError};
+pub use crate::intvalue::IntValue;
+pub use crate::mapiterator::{MapIterable, MapIterator};
+pub use crate::reference::ArgdataRef;
+pub use crate::seqiterator::{SeqIterable, SeqIterator};
+pub use crate::strvalue::StrValue;
+pub use crate::timespec::Timespec;
+pub use crate::value::{Type, Value};
 
 #[path = "values/mod.rs"]
 mod values_;
 
-pub use values_::{
+pub use crate::values_::{
 	bigint, binary, bool, encoded, encoded_fd, encoded_with_fds, float, int, invalid_fd, map, null,
 	process_fd, seq, str, timestamp,
 };
 
 /// Implementations of specific `Argdata` types.
 /// Use the functions in the root of this crate to create them.
 pub mod values {
-	pub use values_::{
+	pub use crate::values_::{
 		BigInt, Binary, Bool, EncodedArgdata, Float, Int, Map, Null, Seq, Str, Timestamp,
 	};
 }

src/mapiterator.rs

@@ -1,5 +1,4 @@
-use ArgdataRef;
-use ReadError;
+use crate::{ArgdataRef, ReadError};
 
 /// An iterator, iterating over an argdata map.
 #[derive(Copy, Clone)]
@@ -12,9 +11,9 @@ pub struct MapIterator<'a, 'd: 'a> {
 pub trait MapIterable<'d>: Sync {
 	/// Iterate to the next key-value pair, returning None if the end is reached.
 	///
-	/// **Don't use this method directly.**
-	/// Instead, get a [`MapIterator`] (using [`::Argdata::read_map`]), and
-	/// use it as any other [`Iterator`].
+	/// **Don't use this method directly.** Instead, get a [`MapIterator`]
+	/// (using [`Argdata::read_map`](crate::Argdata::read_map)), and use it as
+	/// any other [`Iterator`].
 	///
 	/// # For implementors
 	///
@@ -23,8 +22,8 @@ pub trait MapIterable<'d>: Sync {
 	/// the `cookie` is implementation-specific. It might for example be the
 	/// index into a vector, or the byte-offset into an encoded argdata value.
 	/// The initial value is also implementation specific, so provide a method
-	/// (such as [`::Argdata::read_map`]) which provides users with a properly
-	/// initialized [`MapIterator`].
+	/// (such as [`Argdata::read_map`](crate::Argdata::read_map)) which
+	/// provides users with a properly initialized [`MapIterator`].
 	///
 	/// # Panics
 	///
@@ -42,7 +41,8 @@ impl<'a, 'd: 'a> MapIterator<'a, 'd> {
 	///
 	/// This should only be used in implementations of [`MapIterable`].
 	///
-	/// To get a map iterator over Argdata use [`::Argdata::read_map`].
+	/// To get a map iterator over Argdata use
+	/// [`Argdata::read_map`](crate::Argdata::read_map).
 	pub fn new(map: &'a (MapIterable<'d> + 'a), cookie: usize) -> Self {
 		MapIterator { map, cookie }
 	}

src/reference.rs

@@ -1,7 +1,5 @@
-use fd;
+use crate::{fd, values, Argdata};
 use std::ops::Deref;
-use values;
-use Argdata;
 
 /// A reference to an argdata value.
 /// Either a substring of an encoded argdata value, or just a `&Argdata`.
@@ -13,7 +11,7 @@ impl<'a, 'd: 'a> ArgdataRef<'a, 'd> {
 	/// Create an ArgdataRef that refers to a substring of an encoded argdata value.
 	pub fn encoded(bytes: &'d [u8], convert_fd: &'a (fd::ConvertFd + 'a)) -> ArgdataRef<'a, 'd> {
 		ArgdataRef {
-			inner: Inner::Encoded(::encoded_with_fds(bytes, convert_fd)),
+			inner: Inner::Encoded(crate::encoded_with_fds(bytes, convert_fd)),
 		}
 	}
 

src/seqiterator.rs

@@ -1,5 +1,4 @@
-use ArgdataRef;
-use ReadError;
+use crate::{ArgdataRef, ReadError};
 
 /// An iterator, iterating over an argdata sequence.
 #[derive(Copy, Clone)]
@@ -12,9 +11,9 @@ pub struct SeqIterator<'a, 'd: 'a> {
 pub trait SeqIterable<'d>: Sync {
 	/// Iterate to the next element, returning None if the end is reached.
 	///
-	/// **Don't use this method directly.**
-	/// Instead, get a [`SeqIterator`] (using [`::Argdata::read_seq`]), and
-	/// use it as any other [`Iterator`].
+	/// **Don't use this method directly.** Instead, get a [`SeqIterator`]
+	/// (using [`Argdata::read_seq`](crate::Argdata::read_seq)), and use it as
+	/// any other [`Iterator`].
 	///
 	/// # For implementors
 	///
@@ -23,8 +22,8 @@ pub trait SeqIterable<'d>: Sync {
 	/// the `cookie` is implementation-specific. It might for example be the
 	/// index into a vector, or the byte-offset into an encoded argdata value.
 	/// The initial value is also implementation specific, so provide a method
-	/// (such as [`::Argdata::read_seq`]) which provides users with a properly
-	/// initialized [`SeqIterator`].
+	/// (such as [`Argdata::read_seq`](crate::Argdata::read_seq)) which
+	/// provides users with a properly initialized [`SeqIterator`].
 	///
 	/// # Panics
 	///
@@ -42,7 +41,8 @@ impl<'a, 'd: 'a> SeqIterator<'a, 'd> {
 	///
 	/// This should only be used in implementations of [`SeqIterable`].
 	///
-	/// To get a seq iterator over Argdata use [`::Argdata::read_seq`].
+	/// To get a seq iterator over Argdata use
+	/// [`Argdata::read_seq`](crate::Argdata::read_seq).
 	pub fn new(seq: &'a (SeqIterable<'d> + 'a), cookie: usize) -> Self {
 		SeqIterator { seq, cookie }
 	}

src/strvalue.rs

@@ -1,4 +1,3 @@
-use std;
 use std::ffi::{CStr, FromBytesWithNulError};
 use std::str::Utf8Error;
 

src/subfield.rs

@@ -1,7 +1,6 @@
+use crate::ReadError;
 use std::io;
 
-use ReadError;
-
 pub fn read_subfield(data: &[u8]) -> (Option<Result<&[u8], ReadError>>, usize) {
 	if data.is_empty() {
 		return (None, 0);

src/value.rs

@@ -1,9 +1,4 @@
-use fd;
-use IntValue;
-use MapIterator;
-use SeqIterator;
-use StrValue;
-use Timespec;
+use crate::{fd, IntValue, MapIterator, SeqIterator, StrValue, Timespec};
 
 /// The type of an argdata value.
 #[derive(Debug, PartialEq, Eq, Hash)]

src/values/bigint.rs

@@ -1,9 +1,5 @@
-use fd;
+use crate::{fd, Argdata, IntValue, ReadError, Value};
 use std::io;
-use Argdata;
-use IntValue;
-use ReadError;
-use Value;
 
 /// A big-endian 2's-complement signed arbitrary length integer.
 #[derive(Clone, Copy, Debug)]

src/values/binary.rs

@@ -1,8 +1,5 @@
-use fd;
+use crate::{fd, Argdata, ReadError, Value};
 use std::io;
-use Argdata;
-use ReadError;
-use Value;
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
 pub struct Binary<'d> {

src/values/bool.rs

@@ -1,8 +1,5 @@
-use fd;
+use crate::{fd, Argdata, ReadError, Value};
 use std::io;
-use Argdata;
-use ReadError;
-use Value;
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
 pub struct Bool {

src/values/encoded.rs

@@ -1,21 +1,9 @@
+use crate::{
+	fd, fd::EncodedFd, subfield::read_subfield, Argdata, ArgdataRef, IntValue, MapIterable,
+	MapIterator, NoFit, NotRead, ReadError, SeqIterable, SeqIterator, StrValue, Timespec, Type,
+};
 use byteorder::{BigEndian, ByteOrder};
-use fd;
-use fd::EncodedFd;
 use std::io;
-use subfield::read_subfield;
-use Argdata;
-use ArgdataRef;
-use IntValue;
-use MapIterable;
-use MapIterator;
-use NoFit;
-use NotRead;
-use ReadError;
-use SeqIterable;
-use SeqIterator;
-use StrValue;
-use Timespec;
-use Type;
 
 #[derive(Clone, Copy, Debug)]
 pub struct EncodedArgdata<'d, F> {
@@ -345,7 +333,7 @@ fn read_float_test() {
 
 #[test]
 fn read_int_test() {
-	use ArgdataExt;
+	use crate::ArgdataExt;
 	assert_eq!(encoded(b"\x05").read_int(), Ok(0));
 	assert_eq!(encoded(b"\x05\x01").read_int(), Ok(1));
 	assert_eq!(encoded(b"\x05\xFF").read_int(), Ok(-1));
@@ -358,7 +346,7 @@ fn read_int_test() {
 
 #[test]
 fn read_map_test() {
-	use ArgdataExt;
+	use crate::ArgdataExt;
 	assert_eq!(encoded(b"\x06").read_map().unwrap().count(), 0);
 	assert_eq!(encoded(b"\x07").read_map().unwrap_err(), NoFit::DifferentType.into());
 	assert_eq!(encoded(b"\x04").read_map().unwrap_err(), NoFit::DifferentType.into());
@@ -386,7 +374,7 @@ fn read_map_test() {
 
 #[test]
 fn read_seq_test() {
-	use ArgdataExt;
+	use crate::ArgdataExt;
 	assert_eq!(encoded(b"\x07").read_seq().unwrap().count(), 0);
 	assert_eq!(encoded(b"\x06").read_seq().unwrap_err(), NoFit::DifferentType.into());
 	assert_eq!(encoded(b"\x04").read_seq().unwrap_err(), NoFit::DifferentType.into());
@@ -415,7 +403,7 @@ fn read_seq_test() {
 
 #[test]
 fn read_str_test() {
-	use ArgdataExt;
+	use crate::ArgdataExt;
 	assert_eq!(encoded(b"\x08\x00").read_str(), Ok(""));
 	assert_eq!(encoded(b"\x08Hello World!\x00").read_str(), Ok("Hello World!"));
 	assert_eq!(encoded(b"\x08\xCE\xB1\xCE\xB2\xCE\xBE\xCE\xB4\x00").read_str(), Ok("αβξδ"));

src/values/fd.rs

@@ -1,10 +1,7 @@
+use crate::{fd, Argdata, ReadError, Value};
 use byteorder::{BigEndian, ByteOrder};
-use fd;
 use std::io;
 use std::os::raw::c_int;
-use Argdata;
-use ReadError;
-use Value;
 
 /// Create an argdata value representing a file descriptor of this process.
 pub fn process_fd(fd: c_int) -> fd::Fd {

src/values/float.rs

@@ -1,9 +1,6 @@
+use crate::{fd, Argdata, ReadError, Value};
 use byteorder::{BigEndian, ByteOrder};
-use fd;
 use std::io;
-use Argdata;
-use ReadError;
-use Value;
 
 #[derive(Clone, Copy, PartialEq, PartialOrd, Debug)]
 pub struct Float {

src/values/int.rs

@@ -1,9 +1,5 @@
-use fd;
+use crate::{fd, Argdata, IntValue, ReadError, Value};
 use std::io;
-use Argdata;
-use IntValue;
-use ReadError;
-use Value;
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
 pub struct Int<T> {

src/values/map.rs

@@ -1,13 +1,10 @@
-use container_traits::MapContainer;
-use fd;
+use crate::{
+	container_traits::MapContainer,
+	fd,
+	subfield::{subfield_length, write_subfield_length},
+	Argdata, ArgdataRef, MapIterable, MapIterator, ReadError, Value,
+};
 use std::io;
-use subfield::{subfield_length, write_subfield_length};
-use Argdata;
-use ArgdataRef;
-use MapIterable;
-use MapIterator;
-use ReadError;
-use Value;
 
 #[derive(Clone, Copy, Debug)]
 pub struct Map<'d, T: 'd> {

src/values/null.rs

@@ -1,8 +1,5 @@
-use fd;
+use crate::{fd, Argdata, ReadError, Value};
 use std::io;
-use Argdata;
-use ReadError;
-use Value;
 
 #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Debug)]
 pub struct Null;