diff options
| author | bors <bors@rust-lang.org> | 2023-04-14 01:14:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-14 01:14:36 +0000 |
| commit | d61570ceb6e73b1efa78b5e796cb7cd9c2775c55 (patch) | |
| tree | cc02b36b1e6ff1429e6eb14ed61a25d77dae52f2 | |
| parent | 4680aa2fd07876a4d2f7059defef2595e3184038 (diff) | |
| parent | 5989400e2e068aec0ecc12e53dddc1d8b0c0e585 (diff) | |
| download | rust-d61570ceb6e73b1efa78b5e796cb7cd9c2775c55.tar.gz rust-d61570ceb6e73b1efa78b5e796cb7cd9c2775c55.zip | |
Auto merge of #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.
| -rw-r--r-- | tests/ui/macro_use_imports.fixed | 2 | ||||
| -rw-r--r-- | tests/ui/macro_use_imports.stderr | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/ui/macro_use_imports.fixed b/tests/ui/macro_use_imports.fixed index 15f7a099a7d..a395e4f5653 100644 --- a/tests/ui/macro_use_imports.fixed +++ b/tests/ui/macro_use_imports.fixed @@ -16,7 +16,7 @@ extern crate macro_use_helper as mac; extern crate proc_macro_derive as mini_mac; mod a { - use mac::{pub_macro, function_macro, ty_macro, inner_mod_macro, pub_in_private_macro}; + use mac::{pub_macro, inner_mod_macro, function_macro, ty_macro, pub_in_private_macro}; use mac; use mini_mac::ClippyMiniMacroTest; use mini_mac; diff --git a/tests/ui/macro_use_imports.stderr b/tests/ui/macro_use_imports.stderr index 68d558dede0..6fd338cef86 100644 --- a/tests/ui/macro_use_imports.stderr +++ b/tests/ui/macro_use_imports.stderr @@ -22,7 +22,7 @@ error: `macro_use` attributes are no longer needed in the Rust 2018 edition --> $DIR/macro_use_imports.rs:19:5 | LL | #[macro_use] - | ^^^^^^^^^^^^ 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};` + | ^^^^^^^^^^^^ 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};` error: aborting due to 4 previous errors |