Deprecate using rustc_plugin without the rustc_driver dylib.

CC https://github.com/rust-lang/rust/pull/59800
https://github.com/rust-lang/rust/commit/7198687bb2df13a3298ef1e8f594753073d6b9e8

Fix https://github.com/rust-lang/rust/issues/62717

diff --git a/Cargo.lock b/Cargo.lock
index 910d6ba22c16f2a89e2708d7d49f079a9ae3f435..9e7dd54e13532fe96db18df57c494c7d5d71236e 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3189,6 +3189,7 @@ dependencies = [
  "rustc_interface",
  "rustc_metadata",
  "rustc_mir",
+ "rustc_plugin_impl",
  "rustc_save_analysis",
  "rustc_target",
  "serialize",
@@ -3246,7 +3247,7 @@ dependencies = [
  "rustc_metadata",
  "rustc_mir",
  "rustc_passes",
- "rustc_plugin",
+ "rustc_plugin_impl",
  "rustc_privacy",
  "rustc_resolve",
  "rustc_traits",
@@ -3372,7 +3373,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustc_plugin"
+name = "rustc_plugin_impl"
 version = "0.0.0"
 dependencies = [
  "rustc",

diff --git a/src/doc/rustc-ux-guidelines.md b/src/doc/rustc-ux-guidelines.md
index e3684fc9f320a7c400f0d09f69873c283ff2b4eb..dfd8e9db3c5c9cacb236c7d1cacc84791649920f 100644 (file)
--- a/src/doc/rustc-ux-guidelines.md
+++ b/src/doc/rustc-ux-guidelines.md
@@ -70,7 +70,7 @@ for details on how to format and write long error codes.
   [librustc_privacy](https://github.com/rust-lang/rust/blob/master/src/librustc_privacy/error_codes.rs),
   [librustc_resolve](https://github.com/rust-lang/rust/blob/master/src/librustc_resolve/error_codes.rs),
   [librustc_codegen_llvm](https://github.com/rust-lang/rust/blob/master/src/librustc_codegen_llvm/error_codes.rs),
-  [librustc_plugin](https://github.com/rust-lang/rust/blob/master/src/librustc_plugin/error_codes.rs),
+  [librustc_plugin_impl](https://github.com/rust-lang/rust/blob/master/src/librustc_plugin/error_codes.rs),
   [librustc_typeck](https://github.com/rust-lang/rust/blob/master/src/librustc_typeck/error_codes.rs).
 * Explanations have full markdown support. Use it, especially to highlight
 code with backticks.

diff --git a/src/doc/unstable-book/src/language-features/plugin.md b/src/doc/unstable-book/src/language-features/plugin.md
index 8be4d16998276f91e4cc63e065304780fd3ef071..53e8393ec52e462a8a7d1bbcae839dbd91b4d3c1 100644 (file)
--- a/src/doc/unstable-book/src/language-features/plugin.md
+++ b/src/doc/unstable-book/src/language-features/plugin.md
@@ -18,7 +18,7 @@ extend the compiler's behavior with new syntax extensions, lint checks, etc.
 A plugin is a dynamic library crate with a designated *registrar* function that
 registers extensions with `rustc`. Other crates can load these extensions using
 the crate attribute `#![plugin(...)]`.  See the
-`rustc_plugin` documentation for more about the
+`rustc_driver::plugin` documentation for more about the
 mechanics of defining and loading a plugin.
 
 If present, arguments passed as `#![plugin(foo(... args ...))]` are not
@@ -54,13 +54,13 @@ that implements Roman numeral integer literals.
 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;
 use syntax::ext::base::{ExtCtxt, MacResult, DummyResult, MacEager};
 use syntax_pos::Span;
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 
 fn expand_rn(cx: &mut ExtCtxt, sp: Span, args: &[TokenTree])
         -> Box<dyn MacResult + 'static> {
@@ -180,11 +180,11 @@ extern crate syntax;
 // Load rustc as a plugin to get macros
 #[macro_use]
 extern crate rustc;
-extern crate rustc_plugin;
+extern crate rustc_driver;
 
 use rustc::lint::{EarlyContext, LintContext, LintPass, EarlyLintPass,
                   EarlyLintPassObject, LintArray};
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 use syntax::ast;
 
 declare_lint!(TEST_LINT, Warn, "Warn about items named 'lintme'");

diff --git a/src/librustc_driver/Cargo.toml b/src/librustc_driver/Cargo.toml
index 42aa8203cba0eb21882745ff5287fed5bdc557a6..f7a423092acbd52f602aa2dd42bfeb609b2022f0 100644 (file)
--- a/src/librustc_driver/Cargo.toml
+++ b/src/librustc_driver/Cargo.toml
@@ -20,6 +20,7 @@ rustc_data_structures = { path = "../librustc_data_structures" }
 errors = { path = "../librustc_errors", package = "rustc_errors" }
 rustc_metadata = { path = "../librustc_metadata" }
 rustc_mir = { path = "../librustc_mir" }
+rustc_plugin_impl = { path = "../librustc_plugin" }
 rustc_save_analysis = { path = "../librustc_save_analysis" }
 rustc_codegen_utils = { path = "../librustc_codegen_utils" }
 rustc_interface = { path = "../librustc_interface" }

diff --git a/src/librustc_driver/lib.rs b/src/librustc_driver/lib.rs
index fdd0773b73ae2066dc0232b47cb2a2a529cd9625..b19ea513b7575d0ceb369030894e49ce81c8b044 100644 (file)
--- a/src/librustc_driver/lib.rs
+++ b/src/librustc_driver/lib.rs
@@ -22,6 +22,8 @@
 #[macro_use]
 extern crate log;
 
+pub extern crate rustc_plugin_impl as plugin;
+
 use pretty::{PpMode, UserIdentifiedItem};
 
 //use rustc_resolve as resolve;

diff --git a/src/librustc_interface/Cargo.toml b/src/librustc_interface/Cargo.toml
index 4937801d311ff82eb72ba5eb87f24be15551e5c7..16b377d5bccea240fcc991c63f182d00add2758e 100644 (file)
--- a/src/librustc_interface/Cargo.toml
+++ b/src/librustc_interface/Cargo.toml
@@ -30,7 +30,7 @@ rustc_passes = { path = "../librustc_passes" }
 rustc_typeck = { path = "../librustc_typeck" }
 rustc_lint = { path = "../librustc_lint" }
 rustc_errors = { path = "../librustc_errors" }
-rustc_plugin = { path = "../librustc_plugin" }
+rustc_plugin = { path = "../librustc_plugin", package = "rustc_plugin_impl" }
 rustc_privacy = { path = "../librustc_privacy" }
 rustc_resolve = { path = "../librustc_resolve" }
 tempfile = "3.0.5"

diff --git a/src/librustc_lint/lib.rs b/src/librustc_lint/lib.rs
index fc416be8eeb504a6a7a582e15f9fe1d0c28d46e6..27833161ef23d7b6cf4020828ac08f41042b94e8 100644 (file)
--- a/src/librustc_lint/lib.rs
+++ b/src/librustc_lint/lib.rs
@@ -3,7 +3,7 @@
 //! This currently only contains the definitions and implementations
 //! of most of the lints that `rustc` supports directly, it does not
 //! contain the infrastructure for defining/registering lints. That is
-//! available in `rustc::lint` and `rustc_plugin` respectively.
+//! available in `rustc::lint` and `rustc_driver::plugin` respectively.
 //!
 //! ## Note
 //!

diff --git a/src/librustc_plugin/Cargo.toml b/src/librustc_plugin/Cargo.toml
index 7486281c1eac187196cb9b85c101bbcb9d48dd1c..84a743ed1ad7d0d11752f3237463a4106a401dcf 100644 (file)
--- a/src/librustc_plugin/Cargo.toml
+++ b/src/librustc_plugin/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 authors = ["The Rust Project Developers"]
-name = "rustc_plugin"
+name = "rustc_plugin_impl"
 version = "0.0.0"
 build = false
 edition = "2018"
 
 [lib]
-name = "rustc_plugin"
+name = "rustc_plugin_impl"
 path = "lib.rs"
 doctest = false
 

diff --git a/src/librustc_plugin/deprecated/Cargo.toml b/src/librustc_plugin/deprecated/Cargo.toml
new file mode 100644 (file)
index 0000000..cc75f7b
--- /dev/null
+++ b/src/librustc_plugin/deprecated/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+authors = ["The Rust Project Developers"]
+name = "rustc_plugin"
+version = "0.0.0"
+build = false
+edition = "2018"
+
+[lib]
+name = "rustc_plugin"
+path = "lib.rs"
+doctest = false
+
+[dependencies]
+rustc_plugin_impl = { path = ".." }

diff --git a/src/librustc_plugin/deprecated/lib.rs b/src/librustc_plugin/deprecated/lib.rs
new file mode 100644 (file)
index 0000000..5fb1806
--- /dev/null
+++ b/src/librustc_plugin/deprecated/lib.rs
@@ -0,0 +1,8 @@
+#![doc(html_root_url = "https://doc.rust-lang.org/nightly/")]
+#![feature(staged_api)]
+#![unstable(feature = "rustc_plugin", issue = "29597")]
+#![rustc_deprecated(since = "1.38.0", reason = "\
+    import this through `rustc_driver::plugin` instead to make TLS work correctly. \
+    See https://github.com/rust-lang/rust/issues/62717")]
+
+pub use rustc_plugin_impl::*;

diff --git a/src/librustc_plugin/lib.rs b/src/librustc_plugin/lib.rs
index 25a7a8cdeb6d67c717a480dff1ca1d35deb05ea1..952bc9fff6a712dd436918856740606270066a18 100644 (file)
--- a/src/librustc_plugin/lib.rs
+++ b/src/librustc_plugin/lib.rs
@@ -16,12 +16,11 @@
 //! #![feature(plugin_registrar)]
 //! #![feature(rustc_private)]
 //!
-//! extern crate rustc_plugin;
 //! extern crate rustc_driver;
 //! extern crate syntax;
 //! extern crate syntax_pos;
 //!
-//! use rustc_plugin::Registry;
+//! use rustc_driver::plugin::Registry;
 //! use syntax::ext::base::{ExtCtxt, MacResult};
 //! use syntax_pos::Span;
 //! 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 c2685c7f74c30a0f69d486768c77baecb5985a57..c053c715248769649c14dffdf83342b47ae3d22e 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/attr-plugin-test.rs
+++ b/src/test/ui-fulldeps/auxiliary/attr-plugin-test.rs
@@ -4,10 +4,9 @@
 #![feature(rustc_private)]
 
 extern crate rustc_driver;
-extern crate rustc_plugin;
 extern crate syntax;
 
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 use syntax::ext::base::SyntaxExtension;
 use syntax::feature_gate::AttributeType;
 use syntax::symbol::Symbol;

diff --git a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
index ad42ee1d1ec1eb760fbd1fda4fc26d53e2d6de51..6fb99b2c98361dec7155763b48e04fefb5cda351 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
+++ b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs
@@ -3,11 +3,10 @@
 
 #[macro_use]
 extern crate rustc;
-extern crate rustc_plugin;
 extern crate rustc_driver;
 extern crate syntax;
 
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 use syntax::attr;
 use syntax::ext::base::*;
 use syntax::feature_gate::AttributeType::Whitelisted;

diff --git a/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs b/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
index 2826ae75bee2aca14cb4f5e46a420938a0f77394..17386d7e1aa5fe46e7cbd559c8cc8eba6412e5b7 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-for-crate-rpass.rs
@@ -4,12 +4,11 @@
 #![feature(box_syntax)]
 
 #[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};
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 use rustc::hir;
 use syntax::attr;
 use syntax::symbol::Symbol;

diff --git a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
index a811edd37c67dfb4ee5cfa400f44c21bfb64f81f..000e10392e827118438a665fa41e69b91c47cd65 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-for-crate.rs
@@ -4,12 +4,11 @@
 #![feature(box_syntax)]
 
 #[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};
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 use rustc::hir;
 use syntax::attr;
 use syntax::symbol::Symbol;

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 3206ddee6247574ced57268926d38ebf4df9bf26..a377b07bd3dd21562cd4ad475d14829568608aac 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-group-plugin-test.rs
@@ -6,12 +6,11 @@
 // Load rustc as a plugin to get macros.
 #[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};
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 
 declare_lint!(TEST_LINT, Warn, "Warn about items named 'lintme'");
 

diff --git a/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs b/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs
index 4d57be49ca061c21e2a479036d062bd96b09117b..02675191f785ea7366d24e8b476722b4375ea8f3 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-plugin-test.rs
@@ -8,12 +8,11 @@
 // Load rustc as a plugin to get macros
 #[macro_use]
 extern crate rustc;
-extern crate rustc_plugin;
 extern crate rustc_driver;
 
 use rustc::lint::{EarlyContext, LintContext, LintPass, EarlyLintPass,
                   EarlyLintPassObject, LintArray};
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 use syntax::ast;
 declare_lint!(TEST_LINT, Warn, "Warn about items named 'lintme'");
 

diff --git a/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs b/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs
index ea7c75fbbe5d587ad486ee845e8f7b33f3c27d59..40f8d490ac87cec58f98939ebd5bda79789b1537 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs
+++ b/src/test/ui-fulldeps/auxiliary/lint-tool-test.rs
@@ -6,11 +6,10 @@
 // Load rustc as a plugin to get macros
 #[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;
+use rustc_driver::plugin::Registry;
 use syntax::ast;
 declare_tool_lint!(pub clippy::TEST_LINT, Warn, "Warn about stuff");
 declare_tool_lint!(

diff --git a/src/test/ui-fulldeps/auxiliary/llvm-pass-plugin.rs b/src/test/ui-fulldeps/auxiliary/llvm-pass-plugin.rs
index 1832fee4347172ab2d0c30f2efaf44f6efaa435c..2ff1c2e363d50c86ddeb3c3cdf4f529dea716c82 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/llvm-pass-plugin.rs
+++ b/src/test/ui-fulldeps/auxiliary/llvm-pass-plugin.rs
@@ -4,10 +4,9 @@
 #![feature(rustc_private)]
 
 extern crate rustc;
-extern crate rustc_plugin;
 extern crate rustc_driver;
 
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 
 #[plugin_registrar]
 pub fn plugin_registrar(reg: &mut Registry) {

diff --git a/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-plugin.rs b/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
index 6e446241d55791203527b71a0d83bf4e0a44857d..89bc9a2b9dbf490ad5b1f3cb117a95ace50051ac 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
+++ b/src/test/ui-fulldeps/auxiliary/lto-syntax-extension-plugin.rs
@@ -4,10 +4,9 @@
 #![feature(rustc_private)]
 
 extern crate rustc;
-extern crate rustc_plugin;
 extern crate rustc_driver;
 
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 
 #[plugin_registrar]
 pub fn plugin_registrar(_reg: &mut Registry) {}

diff --git a/src/test/ui-fulldeps/auxiliary/macro-crate-test.rs b/src/test/ui-fulldeps/auxiliary/macro-crate-test.rs
index d9b2740e4763840f0d496d7f2309039e48831d67..ee82c0adc86042a9ca72a8be0d601e7d2deab4b3 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/macro-crate-test.rs
+++ b/src/test/ui-fulldeps/auxiliary/macro-crate-test.rs
@@ -6,7 +6,6 @@
 
 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/ui-fulldeps/auxiliary/outlive-expansion-phase.rs b/src/test/ui-fulldeps/auxiliary/outlive-expansion-phase.rs
index c22605afd0c8d270d9bf47a4ab93bc86a2a6f768..e5c4f5b8f7a664a57926a67e55f837ef9aa62bde 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/outlive-expansion-phase.rs
+++ b/src/test/ui-fulldeps/auxiliary/outlive-expansion-phase.rs
@@ -4,12 +4,11 @@
 #![feature(box_syntax, rustc_private)]
 
 extern crate rustc;
-extern crate rustc_plugin;
 extern crate rustc_driver;
 
 use std::any::Any;
 use std::cell::RefCell;
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 
 struct Foo {
     foo: isize

diff --git a/src/test/ui-fulldeps/auxiliary/plugin-args.rs b/src/test/ui-fulldeps/auxiliary/plugin-args.rs
index f3cd2397b28fe3ddd769129dc809fae931df6308..5ff24cff23c558aae7bee040c8c298b32e9dcd93 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/plugin-args.rs
+++ b/src/test/ui-fulldeps/auxiliary/plugin-args.rs
@@ -6,7 +6,6 @@
 extern crate syntax;
 extern crate syntax_pos;
 extern crate rustc;
-extern crate rustc_plugin;
 extern crate rustc_driver;
 
 use std::borrow::ToOwned;
@@ -17,7 +16,7 @@
 use syntax::symbol::Symbol;
 use syntax_pos::Span;
 use syntax::tokenstream::TokenStream;
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 
 struct Expander {
     args: Vec<ast::NestedMetaItem>,

diff --git a/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs b/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs
index 7a91b54bf6d81161dab81ed441ff40ac5a27df8c..1c0de98da56f21faa30af030d0a7bcc05bd9430a 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs
+++ b/src/test/ui-fulldeps/auxiliary/rlib-crate-test.rs
@@ -4,10 +4,9 @@
 #![feature(plugin_registrar, rustc_private)]
 
 extern crate rustc;
-extern crate rustc_plugin;
 extern crate rustc_driver;
 
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 
 #[plugin_registrar]
 pub fn plugin_registrar(_: &mut Registry) {}

diff --git a/src/test/ui-fulldeps/auxiliary/roman-numerals.rs b/src/test/ui-fulldeps/auxiliary/roman-numerals.rs
index 77fa5c2cd78981de6881d9550e6838ebc26dba64..027025b72b31bff52fd0bb71d444fc7ce6b47c64 100644 (file)
--- a/src/test/ui-fulldeps/auxiliary/roman-numerals.rs
+++ b/src/test/ui-fulldeps/auxiliary/roman-numerals.rs
@@ -12,14 +12,13 @@
 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;
 use syntax::ext::base::{ExtCtxt, MacResult, DummyResult, MacEager};
 use syntax_pos::Span;
-use rustc_plugin::Registry;
+use rustc_driver::plugin::Registry;
 
 fn expand_rn(cx: &mut ExtCtxt, sp: Span, args: &[TokenTree])
         -> Box<dyn MacResult + 'static> {