diff options
| author | bors <bors@rust-lang.org> | 2024-07-29 12:06:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-29 12:06:31 +0000 |
| commit | ca16c0633d438ef037f3b20c3616691df51f0fd0 (patch) | |
| tree | b26c622b9ce71a701658ee0beef8ea2f22894f19 /compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp | |
| parent | ee7212234224f463ca3818593ec395bd6a37d199 (diff) | |
| parent | 77dc02862ae7ab5a006e9128c8c6b4b4814e5f4c (diff) | |
| download | rust-ca16c0633d438ef037f3b20c3616691df51f0fd0.tar.gz rust-ca16c0633d438ef037f3b20c3616691df51f0fd0.zip | |
Auto merge of #17715 - Throne3d:fix/glob-may-override-vis-2, r=Veykril
fix: let glob imports override other globs' visibility
Follow up to #14930
Fixes #11858
Fixes #14902
Fixes #17704
I haven't reworked the code here at all - I don't feel confident in the codebase to do so - just rebased it onto the current main branch and fixed conflicts.
I'm not _entirely_ sure I understand the structure of the `check` function in `crates/hir-def/src/nameres` tests. I think the change to the test expectation from #14930 is correct, marking the `crate::reexport::inner` imports with `i`, and I understand it to mean there's a specific token in the import that we can match it to (in this case, `Trait`, `function` and `makro` of `pub use crate::defs::{Trait, function, makro};` respectively), but I had some trouble understanding the meaning of the different parts of `PerNs` to be sure.
Does this make sense?
I tested building and using RA locally with `cargo xtask install` and after this change the documentation for `arrow_array::ArrowPrimitiveType` seems to be picked up correctly!
Diffstat (limited to 'compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp')
0 files changed, 0 insertions, 0 deletions