upgrade to Rust 2018

Cargo.toml

@@ -2,6 +2,7 @@
 name = "maraiah"
 version = "0.1.0"
 authors = ["marrub"]
+edition = "2018"
 
 [dependencies]
 memmap = "0.6"

src/durandal/machead.rs

@@ -1,6 +1,6 @@
 //! Macintosh archived format header utilities.
 
-use durandal::bin::*;
+use crate::durandal::bin::*;
 
 /// Checks for an AppleSingle header. Returns offset to the resource fork.
 pub fn check_apple_single(b: &[u8]) -> Option<usize>

src/durandal/pict.rs

@@ -2,8 +2,8 @@
 
 use generic_array::*;
 
-use durandal::image::*;
+use crate::durandal::image::*;
-use durandal::bin::*;
+use crate::durandal::bin::*;
 
 const PACK_DEFAULT: u16 = 0;
 const PACK_NONE   : u16 = 1;

src/main.rs

@@ -7,14 +7,14 @@ pub mod marathon;
 use std::{io, fs, env};
 use std::io::Write;
 
-use durandal::pict::load_pict;
+use crate::durandal::pict::load_pict;
-use durandal::image::Image;
+use crate::durandal::image::Image;
 
-use marathon::{wad, term};
+use crate::marathon::{wad, term};
 
 use memmap::Mmap;
 
-use durandal::bin::ResultS;
+use crate::durandal::bin::ResultS;
 
 #[derive(Debug)]
 struct Minf
@@ -33,8 +33,8 @@ impl Minf
 {
    fn chunk(b: &[u8]) -> ResultS<Minf>
    {
-      use durandal::text::mac_roman_conv;
+      use crate::durandal::text::mac_roman_conv;
-      use durandal::bin::*;
+      use crate::durandal::bin::*;
 
       if b.len() < 88 {return Err("not enough data for Minf")}
 

src/marathon/term.rs

@@ -1,7 +1,7 @@
 use std::fmt;
 
-use durandal::text::*;
+use crate::durandal::text::*;
-use durandal::bin::*;
+use crate::durandal::bin::*;
 
 impl Terminal
 {

src/marathon/wad.rs

@@ -3,9 +3,9 @@
 use std::collections::BTreeMap;
 use std::fmt;
 
-use durandal::bin::*;
+use crate::durandal::bin::*;
-use durandal::machead::try_mac_header;
+use crate::durandal::machead::try_mac_header;
-use durandal::text::mac_roman_conv;
+use crate::durandal::text::mac_roman_conv;
 
 type Chunk   <'a> = &'a[u8];
 type ChunkMap<'a> = BTreeMap<Ident, Chunk<'a>>;