Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 10 pull requests #70257

Closed
wants to merge 44 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
6f6fe38
parse/lexer: support `StringReader::retokenize` called on external fi…
eddyb Mar 20, 2020
4d30b92
recover on `for<'a> |...| body` closures.
Centril Mar 21, 2020
a9c2378
fix type of const params in associated types.
lcnr Mar 21, 2020
e991df8
Only display definition on typo
LeSeulArtichaut Mar 21, 2020
cb7a2c1
Bless tests
LeSeulArtichaut Mar 21, 2020
54e103b
don't convert results to options just for matching (clippy::if_let_so…
matthiaskrgr Mar 21, 2020
1dcbdbd
use let instead of match for matches with single bindings (clippy::ma…
matthiaskrgr Mar 21, 2020
5566a1c
remove redundant returns (clippy::needless_return)
matthiaskrgr Mar 21, 2020
3b4c2f6
don't redundantly repeat field names (clippy::redundant_field_names)
matthiaskrgr Mar 21, 2020
c8140a8
Return NonZeroU64 from ThreadId::as_u64.
Mar 21, 2020
a6692b7
clarify when we pass () to functions (clippy::unit_arg)
matthiaskrgr Mar 21, 2020
47e9775
make some let-if-bindings more idiomatic (clippy::useless_let_if_seq)
matthiaskrgr Mar 21, 2020
e45fdcf
remove unused unit values (clippy::unused_unit)
matthiaskrgr Mar 21, 2020
c2fd465
rustc_expand::base: nix panictry! uses
Centril Mar 17, 2020
2a9cd1d
nix panictry! in ParserAnyMacro::make
Centril Mar 17, 2020
e6743b0
nix remaining rustc_expand::panictry! uses.
Centril Mar 17, 2020
5f3d63e
generic_extension: defatalize Error case
Centril Mar 17, 2020
20a5c4a
defatalize BangProcMacro::expand
Centril Mar 17, 2020
1b2ef28
defatalize AttrProcMacro::expand
Centril Mar 17, 2020
daa3056
defatalize ProcMacroDerive::expand
Centril Mar 17, 2020
ba4cf18
remove ExtCxt::struct_span_warn
Centril Mar 17, 2020
60d7608
mbe::transcribe: defatalize errors.
Centril Mar 17, 2020
5fb479f
defatalize `compile_declarative_macro`
Centril Mar 17, 2020
3ff9376
expand: nix unused method
Centril Mar 17, 2020
615a5f0
defatalize get_test_runner
Centril Mar 17, 2020
f41ae8e
defatalize expand_test_or_bench
Centril Mar 17, 2020
aa9a70c
expand: add recovery for parse_nt
Centril Mar 17, 2020
7c5dcc9
expand: address review comments
Centril Mar 18, 2020
1110690
fix rebase fallout
Centril Mar 20, 2020
4a67a1b
fix rebase fallout due to #69497.
Centril Mar 21, 2020
c746d93
Remove wrong entry from RELEASES.md
jplatte Mar 21, 2020
3f42104
Remove another wrong entry from RELEASES.md
jplatte Mar 21, 2020
3599fd3
summarize if-else-code with identical blocks (clippy::if_same_then_else)
matthiaskrgr Mar 21, 2020
74d68ea
don't create variable bindings just to return the bound value immedia…
matthiaskrgr Mar 21, 2020
9f802cd
Rollup merge of #70074 - Centril:unpanictry, r=petrochenkov
Centril Mar 22, 2020
34ef6d0
Rollup merge of #70172 - eddyb:retokenize-external-src, r=petrochenkov
Centril Mar 22, 2020
ddd59bc
Rollup merge of #70209 - Centril:recover-quant-closure, r=petrochenkov
Centril Mar 22, 2020
520dbfe
Rollup merge of #70223 - lcnr:issue70167, r=eddyb
Centril Mar 22, 2020
2d25f71
Rollup merge of #70227 - LeSeulArtichaut:typo-def, r=Centril
Centril Mar 22, 2020
e90a648
Rollup merge of #70229 - matthiaskrgr:cl3ppy, r=Mark-Simulacrum
Centril Mar 22, 2020
b465c20
Rollup merge of #70240 - brain0:thread_id, r=Mark-Simulacrum
Centril Mar 22, 2020
aade079
Rollup merge of #70250 - jplatte:patch-1, r=Centril
Centril Mar 22, 2020
8406150
Rollup merge of #70253 - jplatte:patch-2, r=Mark-Simulacrum
Centril Mar 22, 2020
688d655
Rollup merge of #70254 - matthiaskrgr:cl4ppy, r=Centril
Centril Mar 22, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix rebase fallout due to #69497.
Centril committed Mar 21, 2020

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
commit 4a67a1b4c8dc21d2e1c242e74e5fabc9e47658eb
12 changes: 5 additions & 7 deletions src/test/ui/macros/trace_faulty_macros.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// compile-flags: -Z trace-macros

#![recursion_limit="4"]
#![recursion_limit = "4"]

macro_rules! my_faulty_macro {
() => {
@@ -24,9 +24,7 @@ macro_rules! my_recursive_macro {
}

macro_rules! my_macro {
() => {

};
() => {};
}

fn main() {
@@ -39,7 +37,7 @@ fn main() {
}

#[my_macro]
fn use_bang_macro_as_attr(){}
fn use_bang_macro_as_attr() {}

#[derive(Debug)]
fn use_derive_macro_as_attr(){}
#[derive(Debug)] //~ ERROR `derive` may only be applied to structs
fn use_derive_macro_as_attr() {}
23 changes: 20 additions & 3 deletions src/test/ui/macros/trace_faulty_macros.stderr
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ LL | my_faulty_macro!();
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)

note: trace_macro
--> $DIR/trace_faulty_macros.rs:33:5
--> $DIR/trace_faulty_macros.rs:31:5
|
LL | my_faulty_macro!();
| ^^^^^^^^^^^^^^^^^^^
@@ -35,7 +35,7 @@ LL | my_recursive_macro!();
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)

note: trace_macro
--> $DIR/trace_faulty_macros.rs:34:5
--> $DIR/trace_faulty_macros.rs:32:5
|
LL | my_recursive_macro!();
| ^^^^^^^^^^^^^^^^^^^^^^
@@ -60,5 +60,22 @@ LL | let a = pat_macro!();
|
= note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)

error: aborting due to 3 previous errors
error: `derive` may only be applied to structs, enums and unions
--> $DIR/trace_faulty_macros.rs:42:1
|
LL | #[derive(Debug)]
| ^^^^^^^^^^^^^^^^

note: trace_macro
--> $DIR/trace_faulty_macros.rs:36:13
|
LL | let a = pat_macro!();
| ^^^^^^^^^^^^
|
= note: expanding `pat_macro! { }`
= note: to `pat_macro ! (A { a : a, b : 0, c : _, .. }) ;`
= note: expanding `pat_macro! { A { a : a, b : 0, c : _, .. } }`
= note: to `A { a: a, b: 0, c: _, .. }`

error: aborting due to 4 previous errors