Change to Rust 2021 edition

MSRV of 1.63.0 covers that.

Cargo.toml

@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
     "common",
     "datafile",

common/Cargo.toml

@@ -3,6 +3,7 @@ name = "common"
 version = "0.0.1"
 authors = ["heinrich5991 <[email protected]>"]
 license = "MIT/Apache-2.0"
+edition = "2021"
 
 [dependencies]
 arrayvec = "0.5.2"

common/benches/cast.rs

@@ -1,7 +1,5 @@
-#[macro_use]
-extern crate bencher;
-extern crate common;
-
+use bencher::benchmark_group;
+use bencher::benchmark_main;
 use bencher::black_box;
 use bencher::Bencher;
 use common::num::Cast;

common/src/io.rs

@@ -47,7 +47,7 @@ pub trait FileExt {
 #[cfg(feature = "file_offset")]
 impl FileExt for std::fs::File {
     fn read_offset_retry(&self, buffer: &mut [u8], offset: u64) -> io::Result<usize> {
-        use num::Cast;
+        use crate::num::Cast;
 
         // Make sure the additions in this function don't overflow
         let _end_offset = offset

common/src/lib.rs

@@ -1,18 +1,7 @@
-#[cfg(test)]
-#[macro_use]
-extern crate quickcheck;
-
-extern crate arrayvec;
-#[cfg(feature = "file_offset")]
-extern crate file_offset;
-#[cfg(feature = "serde")]
-extern crate serde;
-extern crate zerocopy;
-
-pub use map_iter::MapIterator;
-pub use slice::relative_size_of;
-pub use slice::relative_size_of_mult;
-pub use takeable::Takeable;
+pub use self::map_iter::MapIterator;
+pub use self::slice::relative_size_of;
+pub use self::slice::relative_size_of_mult;
+pub use self::takeable::Takeable;
 
 #[macro_use]
 mod macros;

common/src/str.rs

@@ -18,6 +18,7 @@ pub fn truncated_arraystring<A: Array<Item = u8> + Copy>(mut s: &str) -> ArraySt
 #[cfg(test)]
 mod test {
     use super::truncated_arraystring;
+    use quickcheck::quickcheck;
     quickcheck! {
         fn truncated_arraystring0(v: String) -> bool {
             truncated_arraystring::<[u8; 0]>(&v);

common/src/vec.rs

@@ -1,8 +1,7 @@
+use crate::relative_size_of_mult;
+use crate::slice;
 use std::mem;
 
-use relative_size_of_mult;
-use slice;
-
 pub unsafe fn transmute<T, U>(vec: Vec<T>) -> Vec<U> {
     slice::transmute::<T, U>(&vec); // Error checking done there.
 

datafile/Cargo.toml

@@ -3,11 +3,12 @@ name = "datafile"
 version = "0.0.1"
 authors = ["heinrich5991 <[email protected]>"]
 license = "MIT/Apache-2.0"
+edition = "2021"
 
 [dependencies]
 common = { path = "../common/", features = ["file_offset"] }
 hexdump = "0.1.1"
 itertools = ">=0.3.0,<0.5.0"
 log = "0.3.0"
 logger = { path = "../logger/" }
-zlib_minimal = { path = "../zlib_minimal/" }
+zlib = { package = "zlib_minimal", path = "../zlib_minimal/" }

datafile/src/bitmagic.rs

@@ -1,11 +1,10 @@
+use crate::format::OnlyI32;
+use crate::raw::CallbackError;
+use crate::raw::CallbackNew;
+use crate::raw::CallbackReadData;
+use crate::raw::CallbackReadError;
 use std::mem;
 
-use format::OnlyI32;
-use raw::CallbackError;
-use raw::CallbackNew;
-use raw::CallbackReadData;
-use raw::CallbackReadError;
-
 pub use common::relative_size_of;
 pub use common::relative_size_of_mult;
 pub use common::slice::transmute as transmute_slice;

datafile/src/buffer.rs

@@ -1,5 +1,5 @@
+use crate::format::ItemView;
 use common::MapIterator;
-use format::ItemView;
 use std::ops;
 
 #[derive(Clone, Copy, Debug)]

datafile/src/file.rs

@@ -1,3 +1,9 @@
+use crate::format;
+use crate::format::ItemView;
+use crate::raw;
+use crate::raw::CallbackError;
+use crate::raw::CallbackNew;
+use crate::raw::CallbackReadData;
 use common::io::seek_overflow;
 use common::io::FileExt;
 use common::io::ReadExt;
@@ -11,13 +17,6 @@ use std::io::SeekFrom;
 use std::ops;
 use std::path::Path;
 
-use format;
-use format::ItemView;
-use raw;
-use raw::CallbackError;
-use raw::CallbackNew;
-use raw::CallbackReadData;
-
 #[derive(Debug)]
 pub enum Error {
     Df(format::Error),

datafile/src/format.rs

@@ -1,13 +1,11 @@
-use std::mem;
-
-use bitmagic::as_mut_i32_slice;
-use bitmagic::to_little_endian;
-use bitmagic::CallbackNewExt;
+use crate::bitmagic::as_mut_i32_slice;
+use crate::bitmagic::to_little_endian;
+use crate::bitmagic::CallbackNewExt;
+use crate::raw;
+use crate::raw::CallbackNew;
 use common::num::Cast;
-use raw;
-use raw::CallbackNew;
+use std::mem;
 use std::slice;
-use zlib;
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
 pub enum Error {

datafile/src/lib.rs

@@ -1,20 +1,15 @@
 #[macro_use]
 extern crate log;
 
-extern crate common;
-extern crate hexdump;
-extern crate itertools;
-extern crate zlib_minimal as zlib;
-
-pub use file::DataIter;
-pub use file::Error;
-pub use file::Reader;
-pub use format::ItemView;
-pub use format::OnlyI32;
-pub use raw::ItemTypeItems;
-pub use raw::ItemTypes;
-pub use raw::Items;
-pub use raw::Version;
+pub use self::file::DataIter;
+pub use self::file::Error;
+pub use self::file::Reader;
+pub use self::format::ItemView;
+pub use self::format::OnlyI32;
+pub use self::raw::ItemTypeItems;
+pub use self::raw::ItemTypes;
+pub use self::raw::Items;
+pub use self::raw::Version;
 
 mod bitmagic;
 pub mod buffer;

datafile/src/raw.rs

@@ -1,21 +1,18 @@
+use crate::bitmagic::relative_size_of;
+use crate::bitmagic::relative_size_of_mult;
+use crate::bitmagic::transmute_slice;
+use crate::bitmagic::CallbackNewExt;
+use crate::bitmagic::CallbackReadDataExt;
+use crate::format;
+use crate::format::ItemView;
+use crate::format::OnlyI32;
 use common::num::Cast;
 use common::MapIterator;
 use hexdump::hexdump_iter;
 use hexdump::sanitize_byte;
 use itertools::Itertools;
-use log;
 use std::mem;
 use std::ops;
-use zlib;
-
-use bitmagic::relative_size_of;
-use bitmagic::relative_size_of_mult;
-use bitmagic::transmute_slice;
-use bitmagic::CallbackNewExt;
-use bitmagic::CallbackReadDataExt;
-use format;
-use format::ItemView;
-use format::OnlyI32;
 
 #[derive(Clone, Copy, Eq, Hash, PartialEq, Debug)]
 pub enum Version {

demo/Cargo.toml

@@ -3,7 +3,7 @@ name = "demo"
 version = "0.0.1"
 authors = ["heinrich5991 <[email protected]>"]
 license = "MIT/Apache-2.0"
-edition = "2018"
+edition = "2021"
 
 [dependencies]
 arrayvec = "0.5.2"

demo/src/ddnet.rs

@@ -1,9 +1,9 @@
 mod reader;
 mod writer;
 
-pub use reader::Chunk;
-pub use reader::DemoReader;
-pub use reader::ReadError;
-pub use reader::Warning;
-pub use writer::DemoWriter;
-pub use writer::WriteError;
+pub use self::reader::Chunk;
+pub use self::reader::DemoReader;
+pub use self::reader::ReadError;
+pub use self::reader::Warning;
+pub use self::writer::DemoWriter;
+pub use self::writer::WriteError;

demo/src/format.rs

@@ -5,7 +5,6 @@ use common::digest::Sha256;
 use common::num::Cast;
 use std::convert::TryFrom;
 use std::io;
-use warn;
 use warn::Warn;
 
 pub const MAX_SNAPSHOT_SIZE: usize = 65536;

demo/src/lib.rs

@@ -1,27 +1,13 @@
-extern crate arrayvec;
-extern crate binrw;
-extern crate buffer;
-extern crate common;
-extern crate gamenet_common;
-extern crate gamenet_ddnet;
-extern crate huffman;
-#[macro_use]
-extern crate matches;
-extern crate packer;
-extern crate snapshot;
-extern crate thiserror;
-extern crate warn;
-
 pub mod ddnet;
 mod format;
 mod reader;
 mod writer;
 
-pub use format::DemoKind;
-pub use format::RawChunk;
-pub use format::Version;
-pub use format::Warning;
-pub use reader::ReadError;
-pub use reader::Reader;
-pub use writer::WriteError;
-pub use writer::Writer;
+pub use self::format::DemoKind;
+pub use self::format::RawChunk;
+pub use self::format::Version;
+pub use self::format::Warning;
+pub use self::reader::ReadError;
+pub use self::reader::Reader;
+pub use self::writer::WriteError;
+pub use self::writer::Writer;

demo/src/reader.rs

@@ -2,9 +2,7 @@ use arrayvec::ArrayVec;
 use binrw::BinRead;
 use common::digest::Sha256;
 use common::num::Cast;
-use huffman;
 use huffman::instances::TEEWORLDS as HUFFMAN;
-use packer;
 use std::io;
 use thiserror::Error;
 use warn::wrap;

demo/src/writer.rs

@@ -1,6 +1,5 @@
 use arrayvec::ArrayVec;
 use binrw::BinWrite;
-use buffer;
 use common::digest::Sha256;
 use common::num::Cast;
 use huffman::instances::TEEWORLDS as HUFFMAN;

downloader/Cargo.toml

@@ -3,13 +3,14 @@ name = "downloader"
 version = "0.0.1"
 authors = ["heinrich5991 <[email protected]>"]
 license = "MIT/Apache-2.0"
+edition = "2021"
 
 [dependencies]
 arrayvec = "0.5.2"
 clap = "2.31.2"
 common = { path = "../common/" }
 event_loop = { path = "../event_loop/" }
-gamenet_teeworlds_0_6 = { path = "../gamenet/teeworlds-0.6/" }
+gamenet = { package = "gamenet_teeworlds_0_6", path = "../gamenet/teeworlds-0.6/" }
 hexdump = "0.1.1"
 itertools = ">=0.3.0,<0.5.0"
 log = "0.3.1"

downloader/src/main.rs

@@ -1,21 +1,8 @@
-extern crate arrayvec;
-#[macro_use]
-extern crate clap;
-extern crate common;
-extern crate event_loop;
-extern crate gamenet_teeworlds_0_6 as gamenet;
-extern crate hexdump;
-extern crate itertools;
 #[macro_use]
 extern crate log;
-extern crate logger;
-extern crate packer;
-extern crate rand;
-extern crate snapshot;
-extern crate tempfile;
-extern crate warn;
 
 use arrayvec::ArrayVec;
+use clap::values_t;
 use clap::App;
 use clap::Arg;
 use clap::Error;

event_loop/Cargo.toml

@@ -3,6 +3,7 @@ name = "event_loop"
 version = "0.0.1"
 authors = ["heinrich5991 <[email protected]>"]
 license = "MIT/Apache-2.0"
+edition = "2021"
 
 [dependencies]
 arrayvec = "0.5.2"

event_loop/src/lib.rs

@@ -1,13 +1,5 @@
-extern crate arrayvec;
-extern crate common;
-extern crate hexdump;
-extern crate itertools;
 #[macro_use]
 extern crate log;
-extern crate logger;
-extern crate net;
-extern crate socket;
-extern crate warn;
 
 use arrayvec::ArrayVec;
 use common::Takeable;

gamenet/common/Cargo.toml

@@ -3,6 +3,7 @@ name = "gamenet_common"
 version = "0.0.1"
 authors = ["heinrich5991 <[email protected]>"]
 license = "MIT/Apache-2.0"
+edition = "2021"
 
 [dependencies]
 arrayvec = "0.5.2"

gamenet/common/src/error.rs

@@ -1,5 +1,3 @@
-use packer;
-
 #[derive(Clone, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
 pub enum Error {
     ControlCharacters,

gamenet/common/src/lib.rs

@@ -1,14 +1,3 @@
-extern crate arrayvec;
-extern crate buffer;
-extern crate common;
-extern crate packer;
-extern crate serde;
-#[macro_use]
-extern crate serde_derive;
-extern crate uuid;
-extern crate warn;
-extern crate zerocopy;
-
 pub mod debug;
 pub mod error;
 pub mod msg;