Skip to content

Commit d61570c

Browse files
committed
Auto merge of rust-lang#110160 - petrochenkov:notagain2, r=cjgillot
resolve: Pre-compute non-reexport module children Instead of repeating the same logic by walking HIR during metadata encoding. The only difference is that we are no longer encoding `macro_rules` items, but we never currently need them as a part of this list. They can be encoded separately if this need ever arises. `module_reexports` is also un-querified, because I don't see any reasons to make it a query, only overhead.
2 parents 4680aa2 + 5989400 commit d61570c

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

tests/ui/macro_use_imports.fixed

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ extern crate macro_use_helper as mac;
1616
extern crate proc_macro_derive as mini_mac;
1717

1818
mod a {
19-
use mac::{pub_macro, function_macro, ty_macro, inner_mod_macro, pub_in_private_macro};
19+
use mac::{pub_macro, inner_mod_macro, function_macro, ty_macro, pub_in_private_macro};
2020
use mac;
2121
use mini_mac::ClippyMiniMacroTest;
2222
use mini_mac;

tests/ui/macro_use_imports.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ error: `macro_use` attributes are no longer needed in the Rust 2018 edition
2222
--> $DIR/macro_use_imports.rs:19:5
2323
|
2424
LL | #[macro_use]
25-
| ^^^^^^^^^^^^ help: remove the attribute and import the macro directly, try: `use mac::{pub_macro, function_macro, ty_macro, inner_mod_macro, pub_in_private_macro};`
25+
| ^^^^^^^^^^^^ help: remove the attribute and import the macro directly, try: `use mac::{pub_macro, inner_mod_macro, function_macro, ty_macro, pub_in_private_macro};`
2626

2727
error: aborting due to 4 previous errors
2828

0 commit comments

Comments
 (0)