Merge pull request #213 from dmarriner/master

Color user-defined async functions correctly for Rust coloring
jonhoo · May 26, 2021 · 7ecd6e1 · 7ecd6e1
2 parents 98bc13d + 0291e6b
commit 7ecd6e1
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/flamegraph/color/palettes.rs b/src/flamegraph/color/palettes.rs
@@ -106,7 +106,11 @@ pub(super) mod rust {
         if name.starts_with("core::")
             || name.starts_with("std::")
             || name.starts_with("alloc::")
-            || name.starts_with("<core::")
+            || (name.starts_with("<core::") 
+                // Rust user-defined async functions are desugared into 
+                // GenFutures so we don't want to include those as Rust 
+                // system functions
+                && !name.starts_with("<core::future::from_generator::GenFuture<T>"))
             || name.starts_with("<std::")
             || name.starts_with("<alloc::")
         {
@@ -512,6 +516,12 @@ mod tests {
                 input: String::from("<core::something as something::else"),
                 output: BasicPalette::Orange,
             },
+            TestData {
+                input: String::from(
+                    "<core::future::from_generator::GenFuture<T> as something::else",
+                ),
+                output: BasicPalette::Aqua,
+            },
             TestData {
                 input: String::from("<std::something something::else"),
                 output: BasicPalette::Orange,