aboutsummaryrefslogtreecommitdiff
path: root/crates/hir/src/lib.rs
diff options
context:
space:
mode:
authorAleksey Kladov <[email protected]>2021-06-13 15:29:25 +0100
committerAleksey Kladov <[email protected]>2021-06-13 15:29:25 +0100
commitf85e383b94376d55bb5ee6be375ef3dc0006590f (patch)
tree03e3c3685a893891c7b9f144597362a5e57c02ca /crates/hir/src/lib.rs
parentfa9ed4e0ce633e51d1411951bf044719e6837457 (diff)
internal: refactor inactive code diagnostics
Diffstat (limited to 'crates/hir/src/lib.rs')
-rw-r--r--crates/hir/src/lib.rs24
1 files changed, 12 insertions, 12 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index 0a9414013..d59b52b25 100644
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -506,12 +506,14 @@ impl Module {
506 506
507 DefDiagnosticKind::UnconfiguredCode { ast, cfg, opts } => { 507 DefDiagnosticKind::UnconfiguredCode { ast, cfg, opts } => {
508 let item = ast.to_node(db.upcast()); 508 let item = ast.to_node(db.upcast());
509 sink.push(InactiveCode { 509 acc.push(
510 file: ast.file_id, 510 InactiveCode {
511 node: AstPtr::new(&item).into(), 511 node: ast.with_value(AstPtr::new(&item).into()),
512 cfg: cfg.clone(), 512 cfg: cfg.clone(),
513 opts: opts.clone(), 513 opts: opts.clone(),
514 }); 514 }
515 .into(),
516 );
515 } 517 }
516 518
517 DefDiagnosticKind::UnresolvedProcMacro { ast } => { 519 DefDiagnosticKind::UnresolvedProcMacro { ast } => {
@@ -1045,12 +1047,10 @@ impl Function {
1045 let source_map = db.body_with_source_map(self.id.into()).1; 1047 let source_map = db.body_with_source_map(self.id.into()).1;
1046 for diag in source_map.diagnostics() { 1048 for diag in source_map.diagnostics() {
1047 match diag { 1049 match diag {
1048 BodyDiagnostic::InactiveCode { node, cfg, opts } => sink.push(InactiveCode { 1050 BodyDiagnostic::InactiveCode { node, cfg, opts } => acc.push(
1049 file: node.file_id, 1051 InactiveCode { node: node.clone(), cfg: cfg.clone(), opts: opts.clone() }
1050 node: node.value.clone(), 1052 .into(),
1051 cfg: cfg.clone(), 1053 ),
1052 opts: opts.clone(),
1053 }),
1054 BodyDiagnostic::MacroError { node, message } => sink.push(MacroError { 1054 BodyDiagnostic::MacroError { node, message } => sink.push(MacroError {
1055 file: node.file_id, 1055 file: node.file_id,
1056 node: node.value.clone().into(), 1056 node: node.value.clone().into(),