Skip to content

Commit 9789059

Browse files
author
Paolo Tranquilli
committed
Rust: add more thourough canonical path testing
1 parent 34b1055 commit 9789059

31 files changed

+171
-55
lines changed

rust/extractor/src/translate/base.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use log::Level;
88
use ra_ap_base_db::CrateOrigin;
99
use ra_ap_hir::db::ExpandDatabase;
1010
use ra_ap_hir::{Adt, ItemContainer, Module, Semantics, Type};
11+
use ra_ap_hir_def::ModuleId;
1112
use ra_ap_hir_def::type_ref::Mutability;
1213
use ra_ap_hir_expand::ExpandTo;
1314
use ra_ap_ide_db::line_index::{LineCol, LineIndex};
@@ -346,6 +347,10 @@ impl<'a> Translator<'a> {
346347
}
347348

348349
fn canonical_path_from_hir_module(&self, item: Module) -> Option<String> {
350+
if ModuleId::from(item).is_block_module() {
351+
// this means this is a block module, i.e. a virtual module for a block scope
352+
return None;
353+
}
349354
if item.is_crate_root() {
350355
return Some("crate".into());
351356
}

rust/ql/.generated.list

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/.gitattributes

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/AssocItemList.qll

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/Trait.qll

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/internal/AssocItemListImpl.qll

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/internal/TraitImpl.qll

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/internal/generated/AssocItemList.qll

Lines changed: 1 addition & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll

Lines changed: 9 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

rust/ql/lib/codeql/rust/elements/internal/generated/Trait.qll

Lines changed: 8 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)