FOR COMPILER TEAM: update to 2018 Edition for real (another/still ICE)

src/git.rs

@@ -5,9 +5,9 @@ use std::env::current_dir;
 use std::path::Path;
 use std::path::PathBuf;
 use tempfile::Builder;
-use upstream::core::GitReference;
-use upstream::sources::git::GitRemote;
-use upstream::util::config::Config;
+use crate::upstream::core::GitReference;
+use crate::upstream::sources::git::GitRemote;
+use crate::upstream::util::config::Config;
 use url::{ParseError, Url};
 pub struct GitConfig {
     remote: Url,

src/interactive.rs

@@ -1,6 +1,6 @@
 use console::style;
 use dialoguer::Input;
-use emoji;
+use crate::emoji;
 use quicli::prelude::Error;
 use regex;
 

src/main.rs

@@ -24,9 +24,11 @@ mod projectname;
 mod template;
 
 use console::style;
-use git::GitConfig;
-use projectname::ProjectName;
+use crate::git::GitConfig;
+use crate::projectname::ProjectName;
 use quicli::prelude::*;
+use structopt::{structopt, StructOpt};
+
 use std::env;
 
 /// Generate a new Cargo project from a given template

src/template.rs

@@ -1,9 +1,9 @@
-use cargo;
+use crate::cargo;
 use console::style;
-use emoji;
+use crate::emoji;
 use indicatif::ProgressBar;
 use liquid;
-use projectname::ProjectName;
+use crate::projectname::ProjectName;
 use quicli::prelude::*;
 use std::fs;
 use std::path::PathBuf;

tests/integration/basics.rs

@@ -1,6 +1,6 @@
 extern crate predicates;
 
-use helpers::project_builder::dir;
+use crate::helpers::project_builder::dir;
 
 use assert_cmd::prelude::*;
 use predicates::prelude::*;

tests/integration/helpers/project_builder.rs

@@ -5,7 +5,7 @@ use std::path::PathBuf;
 use std::str;
 use std::sync::atomic::*;
 
-use helpers::project::Project;
+use crate::helpers::project::Project;
 use remove_dir_all::remove_dir_all;
 
 static CNT: AtomicUsize = ATOMIC_USIZE_INIT;