8000 log: format a message that has no arguments after it by benface · Pull Request #687 · not-fl3/miniquad · GitHub
[go: up one dir, main page]
Skip to content

log: format a message that has no arguments after it #687

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
benface wants to merge 2 commits into
base: master
Choose a base branch
from
Open

log: format a message that has no arguments after it #687

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4094c58
log: format a message that has no arguments after it
benface Oct 10, 2026
6c83777
log: check what test_logs logs
benface Oct 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 21 additions & 12 deletions src/log.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,18 +68,6 @@ impl Ord for Level {

#[macro_export(local_inner_macros)]
macro_rules! log {
(target: $target:expr, $lvl:expr, $message:expr) => ({
let lvl = $lvl;
//if lvl <= $crate::STATIC_MAX_LEVEL && lvl <= $crate::max_level() {
// ensure that $message is a valid format string literal
let _ = __log_format_args!($message);
$crate::log::__private_api_log_lit(
$message,
lvl,
&($target, __log_module_path!(), __log_file!(), __log_line!()),
);
//}
});
(target: $target:expr, $lvl:expr, $($arg:tt)+) => ({
let lvl = $lvl;
//if lvl <= $crate::STATIC_MAX_LEVEL && lvl <= $crate::max_level() {
Expand Down Expand Up @@ -184,6 +172,8 @@ pub fn __private_api_log_lit(
_level: Level,
&(_target, _module_path, _file, _line): &(&str, &'static str, &'static str, u32),
) {
#[cfg(test)]
LOGGED.with(|logged| logged.borrow_mut().push(message.to_owned()));
eprintln!("{}", message);
}

Expand Down Expand Up @@ -237,20 +227,39 @@ pub fn __private_api_log_lit(
crate::native::ios::log(message);
}

#[cfg(test)]
thread_local! {
/// Every message the desktop logger was given, so `test_logs` can check them.
static LOGGED: std::cell::RefCell<Vec<String>> = std::cell::RefCell::new(Vec::new());
}

#[test]
fn test_logs() {
let value = 1;

trace!("info");
trace!("info: {}", 1);
trace!("info: {value}");

debug!("info");
debug!("info: {}", 1);
debug!("info: {value}");

info!("info");
info!("info: {}", 1);
info!("info: {value}");

warn!("info");
warn!("info: {}", 1);
warn!("info: {value}");

error!("info");
error!("info: {}", 1);
error!("info: {value}");

info!("{{value}}");

let mut expected = ["info", "info: 1", "info: 1"].repeat(5);
expected.push("{value}");
LOGGED.with(|logged| assert_eq!(*logged.borrow(), expected));
}
Loading
0