Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-17 13:36:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Do not include module path in callsite/log

Browse Source
This commit is contained in:
Floris Bruynooghe
2019-11-29 14:39:31 +01:00
parent ac48ada198
commit ecf1b4a9f7
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/log.rs
View File

@@ -36,14 +36,13 @@ impl fmt::Display for LogLevel {
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Callsite<'a> {
pub module: &'a str,
pub file: &'a str,
pub line: u32,
}
impl fmt::Display for Callsite<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "{}:{} in {}", self.file, self.line, self.module)
write!(f, "{}:{}", self.file, self.line)
}
}
@@ -148,7 +147,6 @@ impl Logger {
macro_rules! callsite {
() => {
$crate::log::Callsite {
module: module_path!(),
file: file!(),
line: line!(),
}
@@ -226,7 +224,6 @@ mod tests {
assert!(lines[0]
.contains(format!("{}", std::thread::current().name().unwrap_or("unnamed")).as_str()));
assert!(lines[0].contains(&format!("src{}log.rs", std::path::MAIN_SEPARATOR)));
assert!(lines[0].contains("deltachat::log::tests"));
assert!(lines[0].contains("foo"));
assert!(lines[1].starts_with("W"));
@@ -234,7 +231,6 @@ mod tests {
assert!(lines[1]
.contains(format!("{}", std::thread::current().name().unwrap_or("unnamed")).as_str()));
assert!(lines[1].contains(&format!("src{}log.rs", std::path::MAIN_SEPARATOR)));
assert!(lines[1].contains("deltachat::log::tests"));
assert!(lines[1].contains("bar"));
assert!(lines[2].starts_with("E"));
@@ -242,7 +238,6 @@ mod tests {
assert!(lines[2]
.contains(format!("{}", std::thread::current().name().unwrap_or("unnamed")).as_str()));
assert!(lines[2].contains(&format!("src{}log.rs", std::path::MAIN_SEPARATOR)));
assert!(lines[2].contains("deltachat::log::tests"));
assert!(lines[2].contains("baz"));
}