openharmony/third_party_rust_log
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_rust_log synced 2024-11-23 07:40:08 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

revert to old macro impl for now

Browse Source
This commit is contained in:
Ashley Mannix 2019-12-19 07:15:14 +10:00
parent bb0224c120
commit c3a9a14c58
3 changed files with 8 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/lib.rs
View File

@ -1365,39 +1365,10 @@ pub fn logger() -> &'static dyn Log {
// WARNING: this is not part of the crate's public API and is subject to change at any time
#[doc(hidden)]
#[cfg(not(feature = "kv_unstable"))]
pub fn __private_api_log(
args: fmt::Arguments,
level: Level,
&(target, module_path, file, line): &(&str, &'static str, &'static str, u32),
kvs: Option<&[(&str, &str)]>,
) {
if kvs.is_some() {
panic!(
"key-value support is experimental and must be enabled using the `kv_unstable` feature"
)
}
logger().log(
&Record::builder()
.args(args)
.level(level)
.target(target)
.module_path_static(Some(module_path))
.file_static(Some(file))
.line(Some(line))
.build(),
);
}
// WARNING: this is not part of the crate's public API and is subject to change at any time
#[cfg(feature = "kv_unstable")]
#[doc(hidden)]
pub fn __private_api_log(
args: fmt::Arguments<'_>,
level: Level,
&(target, module_path, file, line): &(&str, &'static str, &'static str, u32),
kvs: Option<&[(&str, &dyn kv::ToValue)]>,
) {
logger().log(
&Record::builder()
@ -1407,7 +1378,6 @@ pub fn __private_api_log(
.module_path_static(Some(module_path))
.file_static(Some(file))
.line(Some(line))
.key_values(&kvs)
.build(),
);
}

70
src/macros.rs
View File

@ -29,75 +29,29 @@
/// ```
#[macro_export(local_inner_macros)]
macro_rules! log {
// log!(target: "...", "...")
(target: $target:expr, $lvl:expr, $e:expr) => (
$crate::log_impl!(target: $target, $lvl, ($e));
);
// log!(target: "...", "...", args...)
(target: $target:expr, $lvl:expr, $e:expr, $($rest:tt)*) => (
$crate::log_impl!(target: $target, $lvl, ($e) $($rest)*);
);
// log!("...", args...)
($lvl:expr, $($arg:tt)+) => (
$crate::log!(target: __log_module_path!(), $lvl, $($arg)+);
)
}
#[macro_export(local_inner_macros)]
#[doc(hidden)]
macro_rules! log_impl {
// End of macro input
(target: $target:expr, $lvl:expr, ($message:expr)) => {{
(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::__private_api_log_lit(
$message,
lvl,
&($target, __log_module_path!(), __log_file!(), __log_line!()),
);
}
}};
(target: $target:expr, $lvl:expr, ($($arg:expr),*)) => {{
});
(target: $target:expr, $lvl:expr, $($arg:tt)+) => ({
let lvl = $lvl;
if lvl <= $crate::STATIC_MAX_LEVEL && lvl <= $crate::max_level() {
$crate::__private_api_log(
__log_format_args!($($arg),*),
__log_format_args!($($arg)+),
lvl,
&($target, __log_module_path!(), __log_file!(), __log_line!()),
None,
);
}
}};
// // Trailing k-v pairs containing no trailing comma
(target: $target:expr, $lvl:expr, ($($arg:expr),*) { $($key:ident : $value:expr),* }) => {{
let lvl = log::Level::Info;
if lvl <= $crate::STATIC_MAX_LEVEL && lvl <= $crate::max_level() {
$crate::__private_api_log(
__log_format_args!($($arg),*),
lvl,
&(__log_module_path!(), __log_module_path!(), __log_file!(), __log_line!()),
Some(&[$((__log_stringify!($key), &$value)),*])
);
}
}};
// Trailing k-v pairs with trailing comma
(target: $target:expr, $lvl:expr, ($($e:expr),*) { $($key:ident : $value:expr,)* }) => (
$crate::log_impl!(target: $target, $lvl, ($($e),*) { $($key : $value),* });
);
// Last expression arg with no trailing comma
(target: $target:expr, $lvl:expr, ($($e:expr),*) $arg:expr) => (
$crate::log_impl!(target: $target, $lvl, ($($e,)* $arg));
);
// Expression arg
(target: $target:expr, $lvl:expr, ($($e:expr),*) $arg:expr, $($rest:tt)*) => (
$crate::log_impl!(target: $target, $lvl, ($($e,)* $arg) $($rest)*);
)
});
($lvl:expr, $($arg:tt)+) => (log!(target: __log_module_path!(), $lvl, $($arg)+))
}
/// Logs a message at the error level.
@ -306,11 +260,3 @@ macro_rules! __log_line {
line!()
};
}
#[doc(hidden)]
#[macro_export]
macro_rules! __log_stringify {
($($args:tt)*) => {
stringify!($($args)*)
};
}

18
tests/macros.rs
View File

@ -34,21 +34,3 @@ fn with_named_args() {
info!("hello {cats}", cats = cats,);
info!("hello {cats}", cats = cats,);
}
#[test]
fn kv() {
info!("hello {}", "cats", {
cat_1: "chashu",
cat_2: "nori",
});
}
#[test]
fn kv_expr_context() {
match "chashu" {
cat_1 => info!("hello {}", "cats", {
cat_1: cat_1,
cat_2: "nori",
}),
};
}