Skip to content

Commit dce9987

Browse files
author
Jonas Schievink
committed
Check that visibility upgrade path is hit
1 parent c07eaf8 commit dce9987

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

crates/ra_hir_def/src/nameres/collector.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,12 @@ impl DefCollector<'_> {
625625
panic!("`Tr as _` imports with unrelated visibilities {:?} and {:?} (trait {:?})", old_vis, vis, tr);
626626
});
627627

628-
max_vis != old_vis
628+
if max_vis == old_vis {
629+
false
630+
} else {
631+
mark::hit!(upgrade_underscore_visibility);
632+
true
633+
}
629634
}
630635
};
631636

crates/ra_hir_def/src/nameres/tests.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,7 @@ use crate::reex::*;
619619

620620
#[test]
621621
fn underscore_pub_crate_reexport() {
622+
mark::check!(upgrade_underscore_visibility);
622623
check(
623624
r#"
624625
//- /main.rs crate:main deps:lib
@@ -629,9 +630,7 @@ use tr::Tr as _;
629630
pub use tr::Tr as _;
630631
631632
mod tr {
632-
pub trait Tr {
633-
fn method(&self) {}
634-
}
633+
pub trait Tr {}
635634
}
636635
"#,
637636
expect![[r#"

0 commit comments

Comments
 (0)