From 7198687bb2df13a3298ef1e8f594753073d6b9e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20K=C3=A5re=20Alsaker?= Date: Sat, 6 Jul 2019 19:56:20 +0200 Subject: [PATCH] Link compiler plugins to rustc_driver --- src/librustc_plugin/lib.rs | 1 + src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs | 1 + src/test/run-pass-fulldeps/auxiliary/lint-for-crate.rs | 1 + src/test/run-pass-fulldeps/auxiliary/llvm-pass-plugin.rs | 1 + .../run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs | 1 + src/test/run-pass-fulldeps/auxiliary/macro-crate-test.rs | 1 + src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs | 1 + src/test/run-pass-fulldeps/auxiliary/plugin-args.rs | 1 + src/test/run-pass-fulldeps/auxiliary/roman-numerals.rs | 1 + src/test/ui-fulldeps/auxiliary/attr-plugin-test.rs | 1 + src/test/ui-fulldeps/auxiliary/lint-for-crate.rs | 1 + src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs | 1 + src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs | 1 + src/test/ui-fulldeps/auxiliary/lint-tool-test.rs | 1 + src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs | 1 + 15 files changed, 15 insertions(+) diff --git a/src/librustc_plugin/lib.rs b/src/librustc_plugin/lib.rs index cb6f8ebd82e4e..6520cdc306203 100644 --- a/src/librustc_plugin/lib.rs +++ b/src/librustc_plugin/lib.rs @@ -17,6 +17,7 @@ //! #![feature(rustc_private)] //! //! extern crate rustc_plugin; +//! extern crate rustc_driver; //! extern crate syntax; //! extern crate syntax_pos; //! diff --git a/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs b/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs index 64b795af9267f..ad42ee1d1ec1e 100644 --- a/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs +++ b/src/test/run-pass-fulldeps/auxiliary/issue-40001-plugin.rs @@ -4,6 +4,7 @@ #[macro_use] extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; extern crate syntax; use rustc_plugin::Registry; diff --git a/src/test/run-pass-fulldeps/auxiliary/lint-for-crate.rs b/src/test/run-pass-fulldeps/auxiliary/lint-for-crate.rs index 8c7bd7222e73c..2826ae75bee2a 100644 --- a/src/test/run-pass-fulldeps/auxiliary/lint-for-crate.rs +++ b/src/test/run-pass-fulldeps/auxiliary/lint-for-crate.rs @@ -5,6 +5,7 @@ #[macro_use] extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; extern crate syntax; use rustc::lint::{LateContext, LintContext, LintPass, LateLintPass, LateLintPassObject, LintArray}; diff --git a/src/test/run-pass-fulldeps/auxiliary/llvm-pass-plugin.rs b/src/test/run-pass-fulldeps/auxiliary/llvm-pass-plugin.rs index b5307446bca05..1832fee434717 100644 --- a/src/test/run-pass-fulldeps/auxiliary/llvm-pass-plugin.rs +++ b/src/test/run-pass-fulldeps/auxiliary/llvm-pass-plugin.rs @@ -5,6 +5,7 @@ extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; use rustc_plugin::Registry; diff --git a/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs index bd50442541990..6e446241d5579 100644 --- a/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs +++ b/src/test/run-pass-fulldeps/auxiliary/lto-syntax-extension-plugin.rs @@ -5,6 +5,7 @@ extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; use rustc_plugin::Registry; diff --git a/src/test/run-pass-fulldeps/auxiliary/macro-crate-test.rs b/src/test/run-pass-fulldeps/auxiliary/macro-crate-test.rs index a2b1d6976d0eb..d9b2740e47638 100644 --- a/src/test/run-pass-fulldeps/auxiliary/macro-crate-test.rs +++ b/src/test/run-pass-fulldeps/auxiliary/macro-crate-test.rs @@ -7,6 +7,7 @@ extern crate syntax; extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; extern crate syntax_pos; extern crate proc_macro; diff --git a/src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs b/src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs index 25ad8caa37fac..c22605afd0c8d 100644 --- a/src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs +++ b/src/test/run-pass-fulldeps/auxiliary/outlive-expansion-phase.rs @@ -5,6 +5,7 @@ extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; use std::any::Any; use std::cell::RefCell; diff --git a/src/test/run-pass-fulldeps/auxiliary/plugin-args.rs b/src/test/run-pass-fulldeps/auxiliary/plugin-args.rs index 4cf8a4e33c526..7cbfef52b4aad 100644 --- a/src/test/run-pass-fulldeps/auxiliary/plugin-args.rs +++ b/src/test/run-pass-fulldeps/auxiliary/plugin-args.rs @@ -7,6 +7,7 @@ extern crate syntax; extern crate syntax_pos; extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; use std::borrow::ToOwned; use syntax::ast; diff --git a/src/test/run-pass-fulldeps/auxiliary/roman-numerals.rs b/src/test/run-pass-fulldeps/auxiliary/roman-numerals.rs index 4d9e0129e54db..07302b6e68b31 100644 --- a/src/test/run-pass-fulldeps/auxiliary/roman-numerals.rs +++ b/src/test/run-pass-fulldeps/auxiliary/roman-numerals.rs @@ -13,6 +13,7 @@ extern crate syntax; extern crate syntax_pos; extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; use syntax::parse::token::{self, Token}; use syntax::tokenstream::TokenTree; diff --git a/src/test/ui-fulldeps/auxiliary/attr-plugin-test.rs b/src/test/ui-fulldeps/auxiliary/attr-plugin-test.rs index 039124f31ff42..86441b4f73548 100644 --- a/src/test/ui-fulldeps/auxiliary/attr-plugin-test.rs +++ b/src/test/ui-fulldeps/auxiliary/attr-plugin-test.rs @@ -7,6 +7,7 @@ extern crate syntax; extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; use syntax::symbol::Symbol; use syntax::feature_gate::AttributeType; diff --git a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs index 7656b15721ada..a811edd37c67d 100644 --- a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs +++ b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs @@ -5,6 +5,7 @@ #[macro_use] extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; extern crate syntax; use rustc::lint::{LateContext, LintContext, LintPass, LateLintPass, LateLintPassObject, LintArray}; diff --git a/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs b/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs index 941fe25b14c70..3206ddee62475 100644 --- a/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs +++ b/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs @@ -7,6 +7,7 @@ #[macro_use] extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; use rustc::hir; use rustc::lint::{LateContext, LintContext, LintPass, LateLintPass, LateLintPassObject, LintArray}; diff --git a/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs b/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs index 0deb1bf091508..4d57be49ca061 100644 --- a/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs +++ b/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs @@ -9,6 +9,7 @@ extern crate syntax; #[macro_use] extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; use rustc::lint::{EarlyContext, LintContext, LintPass, EarlyLintPass, EarlyLintPassObject, LintArray}; diff --git a/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs b/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs index 2a57876f464c0..ea7c75fbbe5d5 100644 --- a/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs +++ b/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs @@ -7,6 +7,7 @@ extern crate syntax; #[macro_use] extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; use rustc::lint::{EarlyContext, EarlyLintPass, LintArray, LintContext, LintPass}; use rustc_plugin::Registry; diff --git a/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs b/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs index 3df40df7b3317..7a91b54bf6d81 100644 --- a/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs +++ b/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs @@ -5,6 +5,7 @@ extern crate rustc; extern crate rustc_plugin; +extern crate rustc_driver; use rustc_plugin::Registry;