fix rust-analyzer hint on control flow keywords

LuisaGroup · Oct 16, 2023 · d5bf1f0 · d5bf1f0
1 parent 484772b
commit d5bf1f0
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 38 deletions.
diff --git a/luisa_compute/src/lang/debug.rs b/luisa_compute/src/lang/debug.rs
@@ -3,7 +3,7 @@ use std::fmt::Debug;
 
 use crate::internal_prelude::*;
 
-use super::{with_recorder, recording_started};
+use super::{recording_started, with_recorder};
 
 #[macro_export]
 macro_rules! cpu_dbg {
@@ -163,4 +163,20 @@ macro_rules! lc_comment_lineno {
             column!()
         ))
     };
+    ($msg:literal, $e:expr) => {
+        $crate::lang::debug::with_lineno(
+            $msg,
+            file!(),
+            line!(),
+            column!(),
+            || $e,
+        )
+    };
+}
+
+pub fn with_lineno<T>(msg: &str, file: &str, line: u32, col: u32, f: impl FnOnce() -> T) -> T {
+    comment(&format!("`{}` begin at {}:{}:{}", msg, file, line, col));
+    let ret = f();
+    comment(&format!("`{}` end at {}:{}:{}", msg, file, line, col));
+    ret
 }
diff --git a/luisa_compute/src/runtime.rs b/luisa_compute/src/runtime.rs
@@ -20,7 +20,7 @@ use crate::lang::soa::{SoaBuffer, SoaBufferVar, SoaBufferView, SoaMetadata};
 use crate::lang::types::SoaValue;
 use ir::{
     CallableModule, CallableModuleRef, Capture, CpuCustomOp, KernelModule, Module, ModuleFlags,
-    ModuleKind, ModulePools,
+    ModuleKind,
 };
 
 use crate::backend::Backend;

diff --git a/luisa_compute_track/src/lib.rs b/luisa_compute_track/src/lib.rs
@@ -71,6 +71,7 @@ impl VisitMut for TraceVisitor {
     fn visit_expr_mut(&mut self, node: &mut Expr) {
         let flow_path = &self.flow_path;
         let trait_path = &self.trait_path;
+        let debug_path = quote!(::luisa_compute::lang::debug);
         let span = node.span();
 
         match node {
@@ -98,45 +99,39 @@ impl VisitMut for TraceVisitor {
                 if let Expr::Let(_) = **cond {
                 } else if let Some((_, else_branch)) = else_branch {
                     *node = parse_quote_spanned! {span=>
-                        {
-                            ::luisa_compute::lc_comment_lineno!("if stmt begin");
-                            let __ret = <_ as #trait_path::SelectMaybeExpr<_>>::if_then_else(#cond, || #then_branch, || #else_branch);
-                            ::luisa_compute::lc_comment_lineno!("if stmt end");
-                            __ret
-                        }
+                        #debug_path::with_lineno("if", 
+                            file!(),
+                            line!(),
+                            column!(),
+                            || <_ as #trait_path::SelectMaybeExpr<_>>::if_then_else(#cond, || #then_branch, || #else_branch))
                     }
                 } else {
                     *node = parse_quote_spanned! {span=>
-                        {
-                            ::luisa_compute::lc_comment_lineno!("if stmt begin");
-                            let __ret = <_ as #trait_path::ActivateMaybeExpr>::activate(#cond, || #then_branch);
-                            ::luisa_compute::lc_comment_lineno!("if stmt end");
-                            __ret
-                        }
+                        #debug_path::with_lineno("if", 
+                            file!(),
+                            line!(),
+                            column!(),
+                            || <_ as #trait_path::ActivateMaybeExpr>::activate(#cond, || #then_branch))
                     }
                 }
             }
             Expr::While(expr) => {
                 let cond = &expr.cond;
                 let body = &expr.body;
                 *node = parse_quote_spanned! {span=>
-                    {
-                        ::luisa_compute::lc_comment_lineno!("while stmt begin");
-                        let __ret = <_ as #trait_path::LoopMaybeExpr>::while_loop(|| #cond, || #body);
-                        ::luisa_compute::lc_comment_lineno!("while stmt end");
-                        __ret
-                    }
+                    #debug_path::with_lineno("while", 
+                            file!(),
+                            line!(),
+                            column!(), ||<_ as #trait_path::LoopMaybeExpr>::while_loop(|| #cond, || #body))
                 }
             }
             Expr::Loop(expr) => {
                 let body = &expr.body;
                 *node = parse_quote_spanned! {span=>
-                    {
-                        ::luisa_compute::lc_comment_lineno!("loop stmt begin");
-                        let __ret = #flow_path::loop_(|| #body);
-                        ::luisa_compute::lc_comment_lineno!("loop stmt end");
-                        __ret
-                    }
+                    #debug_path::with_lineno("loop", 
+                        file!(),
+                        line!(),
+                        column!(), || #flow_path::loop_(|| #body))
                 }
             }
             Expr::ForLoop(expr) => {
@@ -149,20 +144,17 @@ impl VisitMut for TraceVisitor {
                     let unroll = attrs.iter().any(|attr| attr.path().is_ident("unroll"));
                     if unroll {
                         *node = parse_quote_spanned! {span=>
-                            {
-                                ::luisa_compute::lc_comment_lineno!("for loop stmt begin");
-                                let __ret = #range.for_each(|#pat| #body);
-                                ::luisa_compute::lc_comment_lineno!("for loop stmt end");
-                                __ret
-                            }
+                            #debug_path::with_lineno("for range", 
+                                file!(),
+                                line!(),
+                                column!(), || #range.for_each(|#pat| #body))
                         }
                     } else {
-                        *node = parse_quote_spanned! {span=> {
-                                ::luisa_compute::lc_comment_lineno!("for loop stmt begin");
-                                let __ret = #flow_path::for_range(#range, |#pat| #body);
-                                ::luisa_compute::lc_comment_lineno!("for loop stmt end");
-                                __ret
-                            }
+                        *node = parse_quote_spanned! {span=> 
+                            #debug_path::with_lineno("for range", 
+                                file!(),
+                                line!(),
+                                column!(), ||#flow_path::for_range(#range, |#pat| #body))
                         }
                     }
                 }