Skip to content

Commit f960f9e

Browse files
author
Jonathan Turner
committed
Fix up rpass tests missing imports
1 parent ea7ba12 commit f960f9e

9 files changed

+12
-5
lines changed

src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
extern crate syntax;
1818
extern crate syntax_ext;
19+
extern crate syntax_pos;
1920
extern crate rustc;
2021
extern crate rustc_plugin;
2122

src/test/run-pass-fulldeps/auxiliary/custom_derive_plugin_attr.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
extern crate syntax;
1818
extern crate syntax_ext;
19+
extern crate syntax_pos;
1920
extern crate rustc;
2021
extern crate rustc_plugin;
2122

src/test/run-pass-fulldeps/auxiliary/issue_16723_multiple_items_syntax_ext.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
extern crate syntax;
1717
extern crate rustc;
1818
extern crate rustc_plugin;
19+
extern crate syntax_pos;
1920

2021
use syntax::ast;
21-
use syntax::codemap;
2222
use syntax::ext::base::{ExtCtxt, MacResult, MacEager};
2323
use syntax::util::small_vector::SmallVector;
2424
use rustc_plugin::Registry;
@@ -28,7 +28,7 @@ pub fn plugin_registrar(reg: &mut Registry) {
2828
reg.register_macro("multiple_items", expand)
2929
}
3030

31-
fn expand(cx: &mut ExtCtxt, _: codemap::Span, _: &[ast::TokenTree]) -> Box<MacResult+'static> {
31+
fn expand(cx: &mut ExtCtxt, _: syntax_pos::Span, _: &[ast::TokenTree]) -> Box<MacResult+'static> {
3232
MacEager::items(SmallVector::many(vec![
3333
quote_item!(cx, struct Struct1;).unwrap(),
3434
quote_item!(cx, struct Struct2;).unwrap()

src/test/run-pass-fulldeps/auxiliary/plugin_args.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#![feature(box_syntax, rustc_private)]
1515

1616
extern crate syntax;
17+
extern crate syntax_pos;
1718
extern crate rustc;
1819
extern crate rustc_plugin;
1920

src/test/run-pass-fulldeps/auxiliary/procedural_mbe_matching.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#![feature(plugin_registrar, quote, rustc_private)]
1515

1616
extern crate syntax;
17+
extern crate syntax_pos;
1718
extern crate rustc;
1819
extern crate rustc_plugin;
1920

src/test/run-pass-fulldeps/auxiliary/roman_numerals.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#![feature(slice_patterns)]
1616

1717
extern crate syntax;
18+
extern crate syntax_pos;
1819
extern crate rustc;
1920
extern crate rustc_plugin;
2021

src/test/run-pass-fulldeps/auxiliary/syntax_extension_with_dll_deps_2.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515

1616
extern crate syntax_extension_with_dll_deps_1 as other;
1717
extern crate syntax;
18+
extern crate syntax_pos;
1819
extern crate rustc;
1920
extern crate rustc_plugin;
2021

src/test/run-pass-fulldeps/compiler-calls.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ extern crate getopts;
1919
extern crate rustc;
2020
extern crate rustc_driver;
2121
extern crate syntax;
22+
extern crate rustc_errors as errors;
2223

2324
use rustc::session::Session;
2425
use rustc::session::config::{self, Input};
2526
use rustc_driver::{driver, CompilerCalls, Compilation};
26-
use syntax::{diagnostics, errors};
2727

2828
use std::path::PathBuf;
2929

@@ -35,7 +35,7 @@ impl<'a> CompilerCalls<'a> for TestCalls {
3535
fn early_callback(&mut self,
3636
_: &getopts::Matches,
3737
_: &config::Options,
38-
_: &diagnostics::registry::Registry,
38+
_: &errors::registry::Registry,
3939
_: config::ErrorOutputType)
4040
-> Compilation {
4141
self.count *= 2;
@@ -64,7 +64,7 @@ impl<'a> CompilerCalls<'a> for TestCalls {
6464
_: &config::Options,
6565
_: &Option<PathBuf>,
6666
_: &Option<PathBuf>,
67-
_: &diagnostics::registry::Registry)
67+
_: &errors::registry::Registry)
6868
-> Option<(Input, Option<PathBuf>)> {
6969
panic!("This shouldn't happen");
7070
}

src/test/run-pass-fulldeps/qquote.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#![feature(quote, rustc_private)]
1414

1515
extern crate syntax;
16+
extern crate syntax_pos;
1617

1718
use syntax::print::pprust::*;
1819
use syntax::parse::token::intern;

0 commit comments

Comments
 (0)