From cbdf4ec03e92ed36c162bb8c645993e48a1caa02 Mon Sep 17 00:00:00 2001 From: John Kåre Alsaker Date: Wed, 7 Mar 2018 02:44:10 +0100 Subject: Remove syntax and syntax_pos thread locals --- src/tools/error_index_generator/main.rs | 5 ++++- src/tools/tidy/src/deps.rs | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'src/tools') diff --git a/src/tools/error_index_generator/main.rs b/src/tools/error_index_generator/main.rs index 76f5f98358c..cdeb6015672 100644 --- a/src/tools/error_index_generator/main.rs +++ b/src/tools/error_index_generator/main.rs @@ -263,7 +263,10 @@ fn main() { *slot.borrow_mut() = Some((None, String::from("https://play.rust-lang.org/"))); }); let (format, dst) = parse_args(); - if let Err(e) = main_with_result(format, &dst) { + let result = syntax::with_globals(move || { + main_with_result(format, &dst) + }); + if let Err(e) = result { panic!("{}", e.description()); } } diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 22c6af28cea..63f40110225 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -93,6 +93,7 @@ static WHITELIST: &'static [Crate] = &[ Crate("regex-syntax"), Crate("remove_dir_all"), Crate("rustc-demangle"), + Crate("scoped-tls"), Crate("smallvec"), Crate("stable_deref_trait"), Crate("tempdir"), -- cgit 1.4.1-3-g733a5