Switch to the 2018 edition

Author: SimonSapin

Cargo.toml

@@ -6,6 +6,7 @@ description = "A string interning library for Rust, developed as part of the Ser
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/string-cache"
 documentation = "https://docs.rs/string_cache/"
+edition = "2018"
 
 # Do not `exclude` ./string-cache-codegen because we want to include
 # ./string-cache-codegen/shared.rs, and `include` is a pain to use

examples/simple.rs

@@ -1,4 +1,4 @@
-extern crate string_cache;
+
 
 use string_cache::DefaultAtom;
 

integration-tests/Cargo.toml

@@ -4,6 +4,7 @@ version = "0.0.1"
 authors = [ "The Servo Project Developers" ]
 build = "build.rs"
 publish = false
+edition = "2018"
 
 [lib]
 doctest = false

integration-tests/build.rs

@@ -1,4 +1,4 @@
-extern crate string_cache_codegen;
+use string_cache_codegen;
 
 use std::env;
 use std::path::Path;

integration-tests/src/lib.rs

@@ -12,10 +12,6 @@
 #![allow(non_upper_case_globals)]
 #![cfg_attr(feature = "unstable", feature(test))]
 
-extern crate string_cache;
-
-#[cfg(feature = "unstable")]
-extern crate rand;
 #[cfg(feature = "unstable")]
 extern crate test;
 

src/atom.rs

@@ -9,6 +9,8 @@
 
 #![allow(non_upper_case_globals)]
 
+use debug_unreachable::debug_unreachable;
+use lazy_static::lazy_static;
 use phf_shared;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 

src/lib.rs

@@ -105,14 +105,6 @@
 #![crate_type = "rlib"]
 #![cfg_attr(test, deny(warnings))]
 
-#[macro_use]
-extern crate lazy_static;
-#[macro_use]
-extern crate debug_unreachable;
-extern crate phf_shared;
-extern crate precomputed_hash;
-extern crate serde;
-
-pub use atom::{Atom, DefaultAtom, EmptyStaticAtomSet, PhfStrSet, StaticAtomSet};
+pub use crate::atom::{Atom, DefaultAtom, EmptyStaticAtomSet, PhfStrSet, StaticAtomSet};
 
 pub mod atom;

string-cache-codegen/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
-
 name = "string_cache_codegen"
 version = "0.5.0"  # Also update ../README.md when making a semver-breaking change
 authors = [ "The Servo Project Developers" ]
 description = "A codegen library for string-cache, developed as part of the Servo project."
 license = "MIT / Apache-2.0"
 repository = "https://github.com/servo/string-cache"
 documentation = "https://docs.rs/string_cache_codegen/"
+edition = "2018"
 
 [lib]
 name = "string_cache_codegen"

string-cache-codegen/lib.rs

@@ -68,12 +68,7 @@
 
 #![recursion_limit = "128"]
 
-extern crate phf_generator;
-extern crate phf_shared;
-#[macro_use]
-extern crate quote;
-extern crate proc_macro2;
-
+use quote::quote;
 use std::collections::HashSet;
 use std::fs::File;
 use std::io::{self, BufWriter, Write};