Auto merge of #7287 - SimonSapin:plugin, r=ehuss

Tests: Import rustc_plugin from its new location CC rust-lang/rust#62727
rust-lang · Aug 24, 2019 · 475a23e · 475a23e
2 parents 44d9e09 + 3f40330
commit 475a23e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/tests/testsuite/cross_compile.rs b/tests/testsuite/cross_compile.rs
@@ -201,10 +201,10 @@ fn plugin_deps() {
             r#"
             #![feature(plugin_registrar, rustc_private)]
 
-            extern crate rustc_plugin;
+            extern crate rustc_driver;
             extern crate syntax;
 
-            use rustc_plugin::Registry;
+            use rustc_driver::plugin::Registry;
             use syntax::tokenstream::TokenTree;
             use syntax::source_map::Span;
             use syntax::ast::*;
@@ -296,11 +296,11 @@ fn plugin_to_the_max() {
             r#"
             #![feature(plugin_registrar, rustc_private)]
 
-            extern crate rustc_plugin;
+            extern crate rustc_driver;
             extern crate syntax;
             extern crate baz;
 
-            use rustc_plugin::Registry;
+            use rustc_driver::plugin::Registry;
             use syntax::tokenstream::TokenTree;
             use syntax::source_map::Span;
             use syntax::ast::*;
@@ -446,10 +446,10 @@ fn plugin_with_extra_dylib_dep() {
             r#"
             #![feature(plugin_registrar, rustc_private)]
 
-            extern crate rustc_plugin;
             extern crate baz;
+            extern crate rustc_driver;
 
-            use rustc_plugin::Registry;
+            use rustc_driver::plugin::Registry;
 
             #[plugin_registrar]
             pub fn foo(reg: &mut Registry) {

diff --git a/tests/testsuite/plugins.rs b/tests/testsuite/plugins.rs
@@ -67,10 +67,10 @@ fn plugin_to_the_max() {
             r#"
             #![feature(plugin_registrar, rustc_private)]
 
-            extern crate rustc_plugin;
             extern crate baz;
+            extern crate rustc_driver;
 
-            use rustc_plugin::Registry;
+            use rustc_driver::plugin::Registry;
 
             #[plugin_registrar]
             pub fn foo(_reg: &mut Registry) {
@@ -190,9 +190,9 @@ fn plugin_with_dynamic_native_dependency() {
             "bar/src/lib.rs",
             r#"
             #![feature(plugin_registrar, rustc_private)]
-            extern crate rustc_plugin;
 
-            use rustc_plugin::Registry;
+            extern crate rustc_driver;
+            use rustc_driver::plugin::Registry;
 
             #[cfg_attr(not(target_env = "msvc"), link(name = "builder"))]
             #[cfg_attr(target_env = "msvc", link(name = "builder.dll"))]

diff --git a/tests/testsuite/proc_macro.rs b/tests/testsuite/proc_macro.rs
@@ -228,8 +228,8 @@ fn plugin_and_proc_macro() {
             #![feature(plugin_registrar, rustc_private)]
             #![feature(proc_macro, proc_macro_lib)]
 
-            extern crate rustc_plugin;
-            use rustc_plugin::Registry;
+            extern crate rustc_driver;
+            use rustc_driver::plugin::Registry;
 
             extern crate proc_macro;
             use proc_macro::TokenStream;