From 53c599d50f6394a301f0aa491454bd69ba42a962 Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 7 Jul 2023 15:46:41 -0400
Subject: [PATCH] Fix warn_report and error_report macros.

Originally they didn't check err.kind(), since err.kind() can never
increase their severity.  We lost that behavior with !1386, and we
became dependent on it with arti!1383.  Since they both merged at
the same time, CI broke.

This patch restores their original behavior.
---
 crates/tor-error/src/tracing.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/crates/tor-error/src/tracing.rs b/crates/tor-error/src/tracing.rs
index e44de7aba..a622c4397 100644
--- a/crates/tor-error/src/tracing.rs
+++ b/crates/tor-error/src/tracing.rs
@@ -110,8 +110,9 @@ macro_rules! define_report_macros { {
     # $title_1:tt
     LEVEL
     # $title_2:tt
+
     $D:tt
-    $( $level:ident )*
+    $( [$($flag:tt)*] $level:ident )*
 } => { $( paste!{
     # $title_1
     #[doc = concat!("`", stringify!( [< $level:upper >] ), "`")]
@@ -132,7 +133,8 @@ macro_rules! define_report_macros { {
     #[macro_export]
     macro_rules! [< $level _report >] {
         ( $D err:expr, $D ($D rest:expr),+ $D (,)? ) => {
-            $D crate::event_report!($D crate::tracing::Level::[< $level:upper >],
+            $D crate::event_report!($($flag)*
+                                    $D crate::tracing::Level::[< $level:upper >],
                                     $D err, $D ($D rest),+)
         }
     }
@@ -142,12 +144,16 @@ define_report_macros! {
     /// Log a report for `err` at level
     LEVEL
     /// (or higher if it is a bug).
-    $ trace debug info
+
+    $ [] trace
+      [] debug
+      [] info
 }
 
 define_report_macros! {
     /// Log a report for `err` at level
     LEVEL
     ///
-    $ warn error
+    $ [@raw] warn
+      [@raw] error
 }