Skip to content

Commit cb7faf8

Browse files
committed
Fix trailing semicolon warnings on latest rustc nightly
Latest rustc nightly compiles are filled with warnings like the following, which we fix here: ``` warning: trailing semicolon in macro used in expression position --> lightning/src/util/macro_logger.rs:163:114 | 163 | $logger.log(&$crate::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!())); | ^ | ::: lightning/src/chain/chainmonitor.rs:165:9 | 165 | log_debug!(self.logger, "New best block {} at height {} provided via block_connected", header.block_hash(), height); | -------------------------------------------------------------------------------------------------------------------- in this macro invocation | = note: `#[warn(semicolon_in_expressions_from_macros)]` on by default = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release! = note: for more information, see issue #79813 <rust-lang/rust#79813> = note: this warning originates in the macro `log_internal` (in Nightly builds, run with -Z macro-backtrace for more info) ```
1 parent 803d804 commit cb7faf8

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lightning/src/ln/functional_tests.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4048,7 +4048,7 @@ fn test_invalid_channel_announcement() {
40484048
bitcoin_key_1: if were_node_one { as_bitcoin_key } else { bs_bitcoin_key },
40494049
bitcoin_key_2: if were_node_one { bs_bitcoin_key } else { as_bitcoin_key },
40504050
excess_data: Vec::new(),
4051-
};
4051+
}
40524052
}
40534053
}
40544054

lightning/src/ln/peer_handler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -739,7 +739,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref> PeerManager<D
739739
},
740740
}
741741
}
742-
};
742+
}
743743
}
744744
}
745745

lightning/src/util/macro_logger.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ macro_rules! log_spendable {
160160
#[macro_export]
161161
macro_rules! log_internal {
162162
($logger: expr, $lvl:expr, $($arg:tt)+) => (
163-
$logger.log(&$crate::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()));
163+
$logger.log(&$crate::util::logger::Record::new($lvl, format_args!($($arg)+), module_path!(), file!(), line!()))
164164
);
165165
}
166166

0 commit comments

Comments
 (0)