From a29f4a9afee9c67c45aaf0011ce2c5eb7007ed35 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Fri, 6 Mar 2020 00:06:15 -0500
Subject: Revert "Auto merge of #25898 - jdm:rustup, r=asajeffrey"

This reverts commit ea8aed1ba927012d992a3d3c9880858e0282f5f9, reversing
changes made to 3749eb53971b688b855d6b1850f41b4c346cd2da.
---
 components/script_plugins/lib.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'components/script_plugins')

diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs
index 752a1343db0..035ce326480 100644
--- a/components/script_plugins/lib.rs
+++ b/components/script_plugins/lib.rs
@@ -20,15 +20,14 @@
 #![cfg(feature = "unrooted_must_root_lint")]
 
 extern crate rustc;
-extern crate rustc_ast;
 extern crate rustc_driver;
 extern crate rustc_hir;
 extern crate rustc_lint;
 extern crate rustc_session;
 extern crate rustc_span;
+extern crate syntax;
 
 use rustc::ty;
-use rustc_ast::ast::{AttrKind, Attribute};
 use rustc_driver::plugin::Registry;
 use rustc_hir::def_id::DefId;
 use rustc_hir::intravisit as visit;
@@ -39,6 +38,7 @@ use rustc_span::source_map;
 use rustc_span::source_map::{ExpnKind, MacroKind, Span};
 use rustc_span::symbol::sym;
 use rustc_span::symbol::Symbol;
+use syntax::ast::{AttrKind, Attribute};
 
 #[allow(deprecated)]
 #[plugin_registrar]
-- 
cgit v1.2.3