Skip to content

Commit 6e4ea14

Browse files
committed
fix src/test fallout
1 parent bebdb44 commit 6e4ea14

File tree

7 files changed

+18
-13
lines changed

7 files changed

+18
-13
lines changed

src/test/run-make-fulldeps/hotplug_codegen_backend/the_backend.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
#![feature(rustc_private)]
22

3-
extern crate syntax;
43
extern crate rustc;
54
extern crate rustc_codegen_utils;
65
#[macro_use]
76
extern crate rustc_data_structures;
87
extern crate rustc_target;
98
extern crate rustc_driver;
9+
extern crate rustc_span;
1010

1111
use std::any::Any;
1212
use std::sync::Arc;
1313
use std::path::Path;
14-
use syntax::symbol::Symbol;
14+
use rustc_span::symbol::Symbol;
1515
use rustc::session::Session;
1616
use rustc::session::config::OutputFilenames;
1717
use rustc::ty::TyCtxt;

src/test/run-make-fulldeps/issue-19371/foo.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
extern crate rustc;
44
extern crate rustc_interface;
55
extern crate rustc_driver;
6-
extern crate syntax;
6+
extern crate rustc_span;
77

88
use rustc::session::DiagnosticOutput;
99
use rustc::session::config::{Input, Options,
1010
OutputType, OutputTypes};
1111
use rustc_interface::interface;
12-
use syntax::source_map::FileName;
12+
use rustc_span::source_map::FileName;
1313

1414
use std::path::PathBuf;
1515

src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@
44
#[macro_use] extern crate rustc;
55
#[macro_use] extern crate rustc_session;
66
extern crate rustc_driver;
7+
extern crate rustc_span;
78
extern crate syntax;
89

9-
use rustc_driver::plugin::Registry;
1010
use rustc::hir::{self, intravisit, Node};
1111
use rustc::lint::{LateContext, LintPass, LintArray, LateLintPass, LintContext};
12+
use rustc_driver::plugin::Registry;
13+
use rustc_span::source_map;
1214
use syntax::print::pprust;
13-
use syntax::source_map;
1415

1516
#[plugin_registrar]
1617
pub fn plugin_registrar(reg: &mut Registry) {

src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
#[macro_use] extern crate rustc;
66
#[macro_use] extern crate rustc_session;
77
extern crate rustc_driver;
8+
extern crate rustc_span;
89
extern crate syntax;
910

11+
use rustc::hir;
1012
use rustc::lint::{LateContext, LintContext, LintPass, LateLintPass};
1113
use rustc_driver::plugin::Registry;
12-
use rustc::hir;
14+
use rustc_span::symbol::Symbol;
1315
use syntax::attr;
14-
use syntax::symbol::Symbol;
1516

1617
macro_rules! fake_lint_pass {
1718
($struct:ident, $($attr:expr),*) => {

src/test/ui-fulldeps/auxiliary/lint-for-crate.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
#[macro_use] extern crate rustc;
77
#[macro_use] extern crate rustc_session;
88
extern crate rustc_driver;
9+
extern crate rustc_span;
910
extern crate syntax;
1011

12+
use rustc::hir;
1113
use rustc::lint::{LateContext, LintContext, LintPass, LateLintPass, LintArray};
1214
use rustc_driver::plugin::Registry;
13-
use rustc::hir;
15+
use rustc_span::symbol::Symbol;
1416
use syntax::attr;
15-
use syntax::symbol::Symbol;
1617

1718
declare_lint! {
1819
CRATE_NOT_OKAY,

src/test/ui-fulldeps/mod_dir_path_canonicalized.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66

77
extern crate syntax;
88
extern crate rustc_parse;
9+
extern crate rustc_span;
910

1011
use rustc_parse::new_parser_from_file;
12+
use rustc_span::source_map::FilePathMapping;
1113
use std::path::Path;
1214
use syntax::sess::ParseSess;
13-
use syntax::source_map::FilePathMapping;
1415

1516
#[path = "mod_dir_simple/test.rs"]
1617
mod gravy;

src/test/ui-fulldeps/pprust-expr-roundtrip.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
extern crate rustc_data_structures;
2323
extern crate syntax;
2424
extern crate rustc_parse;
25+
extern crate rustc_span;
2526

2627
use rustc_data_structures::thin_vec::ThinVec;
2728
use rustc_parse::new_parser_from_source_str;
29+
use rustc_span::source_map::{Spanned, DUMMY_SP, FileName};
30+
use rustc_span::source_map::FilePathMapping;
2831
use syntax::ast::*;
2932
use syntax::sess::ParseSess;
30-
use syntax::source_map::{Spanned, DUMMY_SP, FileName};
31-
use syntax::source_map::FilePathMapping;
3233
use syntax::mut_visit::{self, MutVisitor, visit_clobber};
3334
use syntax::print::pprust;
3435
use syntax::ptr::P;

0 commit comments

Comments
 (0)