File tree Expand file tree Collapse file tree 1 file changed +7
-6
lines changed
Expand file tree Collapse file tree 1 file changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -107,12 +107,6 @@ pub fn monitor(
107107 let firmware_elf = elfs. first ( ) . map ( |v| & * * v) ;
108108 let stdout = stdout ( ) ;
109109 let mut stdout = if monitor_args. no_addresses {
110- if monitor_args. all_addresses {
111- log:: warn!(
112- "Using ` --no-addresses` disables address resolution, making `--all-addresses` ineffective. Consider using only one of these flags.\r \n "
113- ) ;
114- }
115-
116110 ResolvingPrinter :: new_no_addresses ( firmware_elf, stdout. lock ( ) )
117111 } else {
118112 ResolvingPrinter :: new ( elfs, stdout. lock ( ) , monitor_args. all_addresses )
@@ -481,6 +475,7 @@ pub fn check_monitor_args(
481475 || non_interactive
482476 || monitor_args. no_reset
483477 || monitor_args. no_addresses
478+ || monitor_args. all_addresses
484479 || monitor_args. monitor_baud != 115_200 )
485480 {
486481 warn ! (
@@ -494,6 +489,12 @@ pub fn check_monitor_args(
494489 ) ;
495490 }
496491
492+ if monitor_args. no_addresses && monitor_args. all_addresses {
493+ log:: warn!(
494+ "Using `--no-addresses` disables address resolution, making `--all-addresses` ineffective. Consider using only one of these flags."
495+ ) ;
496+ }
497+
497498 // Check if log-format is used with serial but output-format is specified
498499 if let Some ( LogFormat :: Serial ) = monitor_args. log_format {
499500 if monitor_args. output_format . is_some ( ) {
You can’t perform that action at this time.
0 commit comments