From 5685e4dd90ad2f4978c63b9097f0b568e4ce6e5c Mon Sep 17 00:00:00 2001 From: Aaron Hill Date: Fri, 22 May 2020 15:11:49 -0400 Subject: [PATCH] Fix rebase fallout --- Cargo.lock | 1 + src/librustc_ast/tokenstream.rs | 2 -- src/librustc_parse/Cargo.toml | 1 + src/librustc_parse/lib.rs | 4 +++- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d81fd6e8d3afd..2394565dfb0dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4173,6 +4173,7 @@ dependencies = [ "rustc_lexer", "rustc_session", "rustc_span", + "smallvec 1.4.0", "unicode-normalization", ] diff --git a/src/librustc_ast/tokenstream.rs b/src/librustc_ast/tokenstream.rs index ff3469930c6d3..9d0199078fa6a 100644 --- a/src/librustc_ast/tokenstream.rs +++ b/src/librustc_ast/tokenstream.rs @@ -21,8 +21,6 @@ use rustc_macros::HashStable_Generic; use rustc_span::{Span, DUMMY_SP}; use smallvec::{smallvec, SmallVec}; -use log::debug; - use std::{iter, mem}; /// When the main rust parser encounters a syntax-extension invocation, it diff --git a/src/librustc_parse/Cargo.toml b/src/librustc_parse/Cargo.toml index 7164c67880863..0d31a8c7bc1fb 100644 --- a/src/librustc_parse/Cargo.toml +++ b/src/librustc_parse/Cargo.toml @@ -12,6 +12,7 @@ doctest = false [dependencies] bitflags = "1.0" log = "0.4" +smallvec = { version = "1.0", features = ["union", "may_dangle"] } rustc_ast_pretty = { path = "../librustc_ast_pretty" } rustc_data_structures = { path = "../librustc_data_structures" } rustc_feature = { path = "../librustc_feature" } diff --git a/src/librustc_parse/lib.rs b/src/librustc_parse/lib.rs index 352278d252616..0c817a712819f 100644 --- a/src/librustc_parse/lib.rs +++ b/src/librustc_parse/lib.rs @@ -14,7 +14,9 @@ use rustc_data_structures::sync::Lrc; use rustc_errors::{Diagnostic, FatalError, Level, PResult}; use rustc_session::parse::ParseSess; use rustc_span::symbol::kw; -use rustc_span::{FileName, SourceFile, Span}; +use rustc_span::{FileName, SourceFile, Span, DUMMY_SP}; + +use smallvec::SmallVec; use std::mem; use std::path::Path;