Skip to content

Commit 4b64a0a

Browse files
committed
Auto merge of #51285 - Mark-Simulacrum:remove-quote_apis, r=<try>
Remove quote_*! macros This deletes a considerable amount of test cases, some of which we may want to keep. I'm not entirely certain what the primary intent of many of them was; if we should keep them I can attempt to edit each case to continue compiling without the quote_*! macros involved. Fixes #46849. Fixes #12265. Fixes #12266. r? @Manishearth
2 parents 1c5e9c6 + e0da27b commit 4b64a0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+50
-2170
lines changed

src/bootstrap/builder.rs

-2
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,6 @@ impl<'a> Builder<'a> {
389389
test::Debuginfo,
390390
test::UiFullDeps,
391391
test::RunPassFullDeps,
392-
test::RunFailFullDeps,
393392
test::CompileFailFullDeps,
394393
test::IncrementalFullDeps,
395394
test::Rustdoc,
@@ -398,7 +397,6 @@ impl<'a> Builder<'a> {
398397
test::RunFailPretty,
399398
test::RunPassValgrindPretty,
400399
test::RunPassFullDepsPretty,
401-
test::RunFailFullDepsPretty,
402400
test::Crate,
403401
test::CrateLibrustc,
404402
test::CrateRustdoc,

src/bootstrap/test.rs

-13
Original file line numberDiff line numberDiff line change
@@ -829,12 +829,6 @@ host_test!(RunPassFullDeps {
829829
suite: "run-pass-fulldeps"
830830
});
831831

832-
host_test!(RunFailFullDeps {
833-
path: "src/test/run-fail-fulldeps",
834-
mode: "run-fail",
835-
suite: "run-fail-fulldeps"
836-
});
837-
838832
host_test!(CompileFailFullDeps {
839833
path: "src/test/compile-fail-fulldeps",
840834
mode: "compile-fail",
@@ -888,13 +882,6 @@ test!(RunPassFullDepsPretty {
888882
default: false,
889883
host: true
890884
});
891-
test!(RunFailFullDepsPretty {
892-
path: "src/test/run-fail-fulldeps/pretty",
893-
mode: "pretty",
894-
suite: "run-fail-fulldeps",
895-
default: false,
896-
host: true
897-
});
898885

899886
default_test!(RunMake {
900887
path: "src/test/run-make",

src/doc/unstable-book/src/language-features/plugin.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,15 @@ that implements Roman numeral integer literals.
5252
#![feature(plugin_registrar, rustc_private)]
5353
5454
extern crate syntax;
55+
extern crate syntax_pos;
5556
extern crate rustc;
5657
extern crate rustc_plugin;
5758
5859
use syntax::parse::token;
5960
use syntax::tokenstream::TokenTree;
6061
use syntax::ext::base::{ExtCtxt, MacResult, DummyResult, MacEager};
6162
use syntax::ext::build::AstBuilder; // A trait for expr_usize.
62-
use syntax::ext::quote::rt::Span;
63+
use syntax_pos::Span;
6364
use rustc_plugin::Registry;
6465
6566
fn expand_rn(cx: &mut ExtCtxt, sp: Span, args: &[TokenTree])

src/librustc/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
#![feature(nll)]
5353
#![feature(non_exhaustive)]
5454
#![feature(proc_macro_internals)]
55-
#![feature(quote)]
5655
#![feature(optin_builtin_traits)]
5756
#![feature(refcell_replace_swap)]
5857
#![feature(rustc_diagnostic_macros)]

src/librustc_borrowck/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#![allow(non_camel_case_types)]
1616

1717
#![feature(nll)]
18-
#![feature(quote)]
1918

2019
#![recursion_limit="256"]
2120

src/librustc_codegen_llvm/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#![allow(unused_attributes)]
2828
#![feature(libc)]
2929
#![feature(nll)]
30-
#![feature(quote)]
3130
#![feature(range_contains)]
3231
#![feature(rustc_diagnostic_macros)]
3332
#![feature(slice_sort_by_cached_key)]

src/librustc_codegen_utils/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#![feature(custom_attribute)]
2222
#![feature(nll)]
2323
#![allow(unused_attributes)]
24-
#![feature(quote)]
2524
#![feature(rustc_diagnostic_macros)]
2625

2726
#![recursion_limit="256"]

src/librustc_driver/driver.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -953,7 +953,7 @@ where
953953
&resolver_arenas,
954954
);
955955
resolver.whitelisted_legacy_custom_derives = whitelisted_legacy_custom_derives;
956-
syntax_ext::register_builtins(&mut resolver, syntax_exts, sess.features_untracked().quote);
956+
syntax_ext::register_builtins(&mut resolver, syntax_exts);
957957

958958
// Expand all macros
959959
sess.profiler(|p| p.start_activity(ProfileCategory::Expansion));

src/librustc_driver/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#![cfg_attr(unix, feature(libc))]
2323
#![feature(nll)]
2424
#![feature(option_replace)]
25-
#![feature(quote)]
2625
#![feature(rustc_diagnostic_macros)]
2726
#![feature(slice_sort_by_cached_key)]
2827
#![feature(set_stdio)]

src/librustc_lint/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#![feature(box_patterns)]
2828
#![feature(box_syntax)]
2929
#![feature(nll)]
30-
#![feature(quote)]
3130
#![feature(rustc_diagnostic_macros)]
3231
#![feature(macro_at_most_once_rep)]
3332

src/librustc_metadata/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#![feature(nll)]
1919
#![feature(proc_macro_internals)]
2020
#![feature(proc_macro_quote)]
21-
#![feature(quote)]
2221
#![feature(rustc_diagnostic_macros)]
2322
#![feature(slice_sort_by_cached_key)]
2423
#![feature(crate_visibility_modifier)]

src/librustc_typeck/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ This API is completely unstable and subject to change.
7676
#![feature(crate_visibility_modifier)]
7777
#![feature(exhaustive_patterns)]
7878
#![feature(nll)]
79-
#![feature(quote)]
8079
#![feature(refcell_replace_swap)]
8180
#![feature(rustc_diagnostic_macros)]
8281
#![feature(slice_patterns)]

src/libsyntax/ext/expand.rs

-1
Original file line numberDiff line numberDiff line change
@@ -1601,7 +1601,6 @@ impl<'feat> ExpansionConfig<'feat> {
16011601
}
16021602

16031603
feature_tests! {
1604-
fn enable_quotes = quote,
16051604
fn enable_asm = asm,
16061605
fn enable_custom_test_frameworks = custom_test_frameworks,
16071606
fn enable_global_asm = global_asm,

0 commit comments

Comments
 (0)