fix: Allow flyimport to import primitive shadowing modules

This commit is contained in:
Lukas Wirth 2024-07-21 13:26:19 +02:00
parent 062822ce91
commit 0851d21d1e
4 changed files with 28 additions and 2 deletions

View file

@ -1618,3 +1618,18 @@ pub struct FooStruct;
"#]], "#]],
); );
} }
#[test]
fn primitive_mod() {
check(
r#"
//- minicore: str
fn main() {
str::from$0
}
"#,
expect![[r#"
fn from_utf8_unchecked() (use core::str) const unsafe fn(&[u8]) -> &str
"#]],
);
}

View file

@ -703,7 +703,7 @@ fn path_import_candidate(
) -> Option<ImportCandidate> { ) -> Option<ImportCandidate> {
Some(match qualifier { Some(match qualifier {
Some(qualifier) => match sema.resolve_path(&qualifier) { Some(qualifier) => match sema.resolve_path(&qualifier) {
None => { Some(PathResolution::Def(ModuleDef::BuiltinType(_))) | None => {
if qualifier.first_qualifier().map_or(true, |it| sema.resolve_path(&it).is_none()) { if qualifier.first_qualifier().map_or(true, |it| sema.resolve_path(&it).is_none()) {
let qualifier = qualifier let qualifier = qualifier
.segments() .segments()

View file

@ -197,7 +197,9 @@ fn structure_token(token: SyntaxToken) -> Option<StructureNode> {
if let Some(comment) = ast::Comment::cast(token) { if let Some(comment) = ast::Comment::cast(token) {
let text = comment.text().trim(); let text = comment.text().trim();
if let Some(region_name) = text.strip_prefix("// region:").map(str::trim) { if let Some(region_name) =
text.strip_prefix("// region:").map(str::trim).filter(|it| !it.is_empty())
{
return Some(StructureNode { return Some(StructureNode {
parent: None, parent: None,
label: region_name.to_owned(), label: region_name.to_owned(),

View file

@ -55,6 +55,7 @@
//! size_of: sized //! size_of: sized
//! sized: //! sized:
//! slice: //! slice:
//! str:
//! sync: sized //! sync: sized
//! transmute: //! transmute:
//! try: infallible //! try: infallible
@ -1368,6 +1369,14 @@ pub mod iter {
} }
// endregion:iterator // endregion:iterator
// region:str
pub mod str {
pub const unsafe fn from_utf8_unchecked(v: &[u8]) -> &str {
""
}
}
// endregion:str
// region:panic // region:panic
mod panic { mod panic {
pub macro panic_2021 { pub macro panic_2021 {