From e03f536f32a8a2a31d07e43b19e05c7d4fd1cb82 Mon Sep 17 00:00:00 2001
From: Techcable <Techcable@techcable.net>
Date: Fri, 24 Aug 2018 11:45:50 -0700
Subject: [PATCH] Update to nightly-2018-08-23

Span was moved to the `syntax_pos` crate

(cherry picked from commit 889426b7f861a75d3b5f3257b9785c5a445ec08e)
---
 phf_macros/src/lib.rs  | 3 ++-
 phf_macros/src/util.rs | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/phf_macros/src/lib.rs b/phf_macros/src/lib.rs
index 7f22b044..5e9337a3 100644
--- a/phf_macros/src/lib.rs
+++ b/phf_macros/src/lib.rs
@@ -35,6 +35,7 @@
 
 #[macro_use]
 extern crate syntax;
+extern crate syntax_pos;
 extern crate phf_generator;
 extern crate phf_shared;
 extern crate rustc_plugin;
@@ -48,7 +49,7 @@ use std::collections::HashMap;
 use std::env;
 use std::time::Instant;
 use syntax::ast::{self, Expr, ExprKind, Mutability, TyKind};
-use syntax::codemap::Span;
+use syntax_pos::Span;
 use syntax::ext::base::{DummyResult, ExtCtxt, MacResult};
 use syntax::ext::build::AstBuilder;
 use syntax::fold::Folder;
diff --git a/phf_macros/src/util.rs b/phf_macros/src/util.rs
index 7e755223..99410bc4 100644
--- a/phf_macros/src/util.rs
+++ b/phf_macros/src/util.rs
@@ -2,8 +2,8 @@ use std::rc::Rc;
 use std::hash::{Hash, Hasher};
 
 use syntax::ast::Expr;
-use syntax::codemap::Span;
-use syntax::ext::base::{ExtCtxt, MacResult, MacEager};
+use syntax_pos::Span;
+use syntax::ext::base::{ExtCtxt, MacEager, MacResult};
 use syntax::ext::build::AstBuilder;
 use syntax::ptr::P;
 use syntax::symbol::LocalInternedString;