Skip to content

tri mods orphan: a one-line #[path = ..] .. mod x; binds its own mod, not the next line (Closes #10936) #10950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gHashTag merged 1 commit into from
Oct 19, 2026
Merged

tri mods orphan: a one-line #[path = ..] .. mod x; binds its own mod, not the next line (Closes #10936) #10950

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cli/tri/src/modreach.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,15 +40,14 @@ pub fn edges_from(src: &str, here: &Path, dir: &Path) -> Vec<Edge> {
let mut out = Vec::new();
let mut pending_path: Option<String> = None;
for line in src.lines() {
let t = line.trim();
let mut t = line.trim();
if let Some(p) = attr_path(t) {
pending_path = Some(p);
continue;
t = t.split("//").next().unwrap_or("").rsplit_once(']').map_or("", |(_, r)| r.trim()); // `#[path = ".."] #[allow(..)] mod x;` on one line (#10936)
if t.is_empty() { continue; }
}
if let Some(p) = include_path(t) {
out.push(Edge {
candidates: vec![own.join(p)],
});
out.push(Edge { candidates: vec![own.join(p)] });
continue;
}
let Some(name) = mod_decl(t) else {
Expand Down Expand Up @@ -548,10 +547,11 @@ mod tests {
#[test]
fn a_path_attribute_does_not_carry_to_a_later_unrelated_mod() {
let e = edges_from(
"#[path = \"x.rs\"]\nmod c;\nmod d;\n",
"#[path = \"x.rs\"] #[allow(dead_code)] mod c; // one line (#10936)\nmod d;\n",
Path::new("/s/a/b.rs"),
Path::new("/s/a/b"),
);
assert_eq!(e[0].candidates[0], PathBuf::from("/s/a/x.rs"), "the path binds the mod on its own line");
assert_eq!(
e[1].candidates[0],
PathBuf::from("/s/a/b/d.rs"),
Expand Down
Loading