From 4ff12ce4c14d348dfe53d1f74ab53c878f4fb4f8 Mon Sep 17 00:00:00 2001
From: Mazdak Farrokhzad <twingoow@gmail.com>
Date: Wed, 1 Jan 2020 19:30:57 +0100
Subject: Normalize `syntax::symbol` imports.

---
 src/libsyntax/util/lev_distance.rs | 4 +++-
 src/libsyntax/util/literal.rs      | 4 ++--
 src/libsyntax/util/parser.rs       | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/libsyntax/util')

diff --git a/src/libsyntax/util/lev_distance.rs b/src/libsyntax/util/lev_distance.rs
index f55b58d7d13..fc697026fe4 100644
--- a/src/libsyntax/util/lev_distance.rs
+++ b/src/libsyntax/util/lev_distance.rs
@@ -1,4 +1,6 @@
-use crate::symbol::Symbol;
+// FIXME(Centril): Move to rustc_span?
+
+use rustc_span::symbol::Symbol;
 use std::cmp;
 
 #[cfg(test)]
diff --git a/src/libsyntax/util/literal.rs b/src/libsyntax/util/literal.rs
index 3b156e03d3e..dd06c25b4de 100644
--- a/src/libsyntax/util/literal.rs
+++ b/src/libsyntax/util/literal.rs
@@ -1,17 +1,17 @@
 //! Code related to parsing literals.
 
 use crate::ast::{self, Lit, LitKind};
-use crate::symbol::{kw, sym, Symbol};
 use crate::token::{self, Token};
 use crate::tokenstream::TokenTree;
 
-use log::debug;
 use rustc_data_structures::sync::Lrc;
 use rustc_lexer::unescape::{unescape_byte, unescape_char};
 use rustc_lexer::unescape::{unescape_byte_str, unescape_str};
 use rustc_lexer::unescape::{unescape_raw_byte_str, unescape_raw_str};
+use rustc_span::symbol::{kw, sym, Symbol};
 use rustc_span::Span;
 
+use log::debug;
 use std::ascii;
 
 pub enum LitError {
diff --git a/src/libsyntax/util/parser.rs b/src/libsyntax/util/parser.rs
index 98af382efb0..a0ed89a9cae 100644
--- a/src/libsyntax/util/parser.rs
+++ b/src/libsyntax/util/parser.rs
@@ -1,6 +1,6 @@
 use crate::ast::{self, BinOpKind};
-use crate::symbol::kw;
 use crate::token::{self, BinOpToken, Token};
+use rustc_span::symbol::kw;
 
 /// Associative operator with precedence.
 ///
-- 
cgit 1.4.1-3-g733a5