From 4e16c992379d216b1ef7c26f3b7243b2d66cc846 Mon Sep 17 00:00:00 2001
From: Joey Vagedes <joeyvagedes@microsoft.com>
Date: Wed, 27 Sep 2023 08:45:12 -0700
Subject: [PATCH] update

---
 edk2toolext/edk2_logging.py     |  2 +-
 tests.unit/test_edk2_logging.py | 61 ++++++++++++++++++++++++++++++---
 2 files changed, 58 insertions(+), 5 deletions(-)

diff --git a/edk2toolext/edk2_logging.py b/edk2toolext/edk2_logging.py
index 10d0e11e6..28c22bd9c 100644
--- a/edk2toolext/edk2_logging.py
+++ b/edk2toolext/edk2_logging.py
@@ -231,7 +231,7 @@ def output_compiler_error(match, line, start_txt="Compiler"):
     build_py_error_exp = re.compile(r"error (\d+)E:")
     linker_error_exp = re.compile(r"error LNK(\d+):")
     warning_exp = re.compile(r"warning [A-Z]?(\d+):")
-    rust_error_exp = re.compile(r"^(-->|\d+\s*\||error:)")
+    rust_error_exp = re.compile(r"^(-->|error(?:\[[A-Za-z]\d+\])?:)")
     for raw_line in output_stream.readlines():
         line = raw_line.strip("\n").strip()
         match = error_exp.search(line)
diff --git a/tests.unit/test_edk2_logging.py b/tests.unit/test_edk2_logging.py
index bae9446ac..c61429a93 100644
--- a/tests.unit/test_edk2_logging.py
+++ b/tests.unit/test_edk2_logging.py
@@ -6,10 +6,11 @@
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 ##
 import io
+import logging
 import os
 import tempfile
 import unittest
-import logging
+
 from edk2toolext import edk2_logging
 
 
@@ -194,7 +195,7 @@ def test_scan_compiler_output_gcc_mixed_actual(self):
 def test_NO_secret_filter(caplog):
     end_list = [" ", ",", ";", ":", " "]
     start_list = [" ", " ", " ", " ", ":"]
-    
+
     edk2_logging.setup_console_logging(logging.DEBUG)
     # Test secret github (valid) 1
     fake_secret = "ghp_aeiou1"
@@ -209,7 +210,7 @@ def test_CI_secret_filter(caplog):
     caplog.set_level(logging.DEBUG)
     end_list = [" ", ",", ";", ":", " "]
     start_list = [" ", " ", " ", " ", ":"]
-    
+
     os.environ["CI"] = "TRUE"
     edk2_logging.setup_console_logging(logging.DEBUG)
     caplog.clear()
@@ -227,7 +228,7 @@ def test_TF_BUILD_secret_filter(caplog):
     caplog.set_level(logging.DEBUG)
     end_list = [" ", ",", ";", ":", " "]
     start_list = [" ", " ", " ", " ", ":"]
-    
+
     os.environ["TF_BUILD"] = "TRUE"
     edk2_logging.setup_console_logging(logging.DEBUG)
     caplog.clear()
@@ -286,3 +287,55 @@ def test_catch_secrets_filter(caplog):
     for (record, start, end) in zip(caplog.records, start_list, end_list):
         assert record.msg == f"This is a secret{start}{fake_secret}{end}to be caught"
     caplog.clear()
+
+def test_scan_compiler_output_rust_scenarios():
+    output_stream = io.StringIO(r"""
+error: This should be caught
+error[AA500]: This should not be caught
+error[E0605]: This should be caught
+error[E0605] This should not be caught
+catch this error: This should not be caught
+--> This should be caught
+> This should not be caught
+catch this error --> This should not be caught
+    """)
+    expected_output = [
+        (logging.ERROR, 'error: This should be caught'),
+        (logging.ERROR, 'error[E0605]: This should be caught'),
+        (logging.ERROR, '--> This should be caught'),
+    ]
+    assert edk2_logging.scan_compiler_output(output_stream) == expected_output
+
+def test_scan_compiler_output_rust_actual():
+    output_stream = io.StringIO(r"""
+[cargo-make] INFO - cargo make 0.37.1
+[cargo-make] INFO - Calling cargo metadata to extract project info
+[cargo-make] INFO - Cargo metadata done
+[cargo-make] INFO - Build File: Makefile.toml
+[cargo-make] INFO - Task: build
+[cargo-make] INFO - Profile: development
+[cargo-make] INFO - Running Task: legacy-migration
+[cargo-make] INFO - Running Task: individual-package-targets
+[cargo-make] INFO - Execute Command: "cargo" "build" "-p" "DxeRust" "--profile" "dev" "--target" "x86_64-unknown-uefi" "-Zbuild-std=core,compiler_builtins,alloc" "-Zbuild-std-features=compiler-builtins-mem" "-Zunstable-options" "--timings=html"
+   Compiling RustCrate v0.1.0 (C:\\src\\RustCrate)
+error[E0605]: non-primitive cast: `MemorySpaceDescriptor` as `*mut MemorySpaceDescriptor`
+   --> RustCrate\\src/main.rs:248:66
+    |
+248 |         if get_memory_space_descriptor(desc.memory_base_address, descriptor as *mut MemorySpaceDescriptor)
+    |                                                                  ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ invalid cast
+    |
+help: consider borrowing the value
+    |
+248 |         if get_memory_space_descriptor(desc.memory_base_address, &mut descriptor as *mut MemorySpaceDescriptor)
+    |                                                                  ++++
+
+For more information about this error, try `rustc --explain E0605`.
+error: could not compile `RustCrate` (bin "RustCrate") due to previous error
+      Timing report saved to C:\\src\\RustCrate\\target\\cargo-timings\\cargo-timing-20230927T151803Z.html
+[cargo-make] ERROR - Error while executing command, exit code: 101
+[cargo-make] WARN - Build Failed.
+    """)
+    expected_output = [(logging.ERROR, 'error[E0605]: non-primitive cast: `MemorySpaceDescriptor` as `*mut MemorySpaceDescriptor`'),
+                        (logging.ERROR, r'--> RustCrate\\src/main.rs:248:66'),
+                        (logging.ERROR, 'error: could not compile `RustCrate` (bin "RustCrate") due to previous error')]
+    assert edk2_logging.scan_compiler_output(output_stream) == expected_output