summary refs log tree commit diff
path: root/sys_util/src/syslog.rs
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2018-12-01 17:49:30 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-12-03 20:32:03 -0800
commit5bbbf610828e975fd308b90543359a85ef59b67f (patch)
tree4cd736628475d702b7ac45feb2e359c3fb74d220 /sys_util/src/syslog.rs
parent21fb34fb937678d85e9bfa4c721ab4a29196c764 (diff)
downloadcrosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.gz
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.bz2
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.lz
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.xz
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.zst
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.zip
lint: Resolve the easier clippy lints
Hopefully the changes are self-explanatory and uncontroversial. This
eliminates much of the noise from `cargo clippy` and, for my purposes,
gives me a reasonable way to use it as a tool when writing and reviewing
code.

Here is the Clippy invocation I was using:

    cargo +nightly clippy -- -W clippy::correctness -A renamed_and_removed_lints -Aclippy::{blacklisted_name,borrowed_box,cast_lossless,cast_ptr_alignment,enum_variant_names,identity_op,if_same_then_else,mut_from_ref,needless_pass_by_value,new_without_default,new_without_default_derive,or_fun_call,ptr_arg,should_implement_trait,single_match,too_many_arguments,trivially_copy_pass_by_ref,unreadable_literal,unsafe_vector_initialization,useless_transmute}

TEST=cargo check --features wl-dmabuf,gpu,usb-emulation
TEST=boot linux

Change-Id: I55eb1b4a72beb2f762480e3333a921909314a0a2
Reviewed-on: https://chromium-review.googlesource.com/1356911
Commit-Ready: David Tolnay <dtolnay@chromium.org>
Tested-by: David Tolnay <dtolnay@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'sys_util/src/syslog.rs')
-rw-r--r--sys_util/src/syslog.rs26
1 files changed, 11 insertions, 15 deletions
diff --git a/sys_util/src/syslog.rs b/sys_util/src/syslog.rs
index c080041..be85d2b 100644
--- a/sys_util/src/syslog.rs
+++ b/sys_util/src/syslog.rs
@@ -45,7 +45,7 @@ use libc::{
 
 use getpid;
 
-const SYSLOG_PATH: &'static str = "/dev/log";
+const SYSLOG_PATH: &str = "/dev/log";
 
 /// The priority (i.e. severity) of a syslog message.
 ///
@@ -65,14 +65,14 @@ pub enum Priority {
 impl fmt::Display for Priority {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self {
-            &Priority::Emergency => write!(f, "EMERGENCY"),
-            &Priority::Alert => write!(f, "ALERT"),
-            &Priority::Critical => write!(f, "CRITICAL"),
-            &Priority::Error => write!(f, "ERROR"),
-            &Priority::Warning => write!(f, "WARNING"),
-            &Priority::Notice => write!(f, "NOTICE"),
-            &Priority::Info => write!(f, "INFO"),
-            &Priority::Debug => write!(f, "DEBUG"),
+            Priority::Emergency => write!(f, "EMERGENCY"),
+            Priority::Alert => write!(f, "ALERT"),
+            Priority::Critical => write!(f, "CRITICAL"),
+            Priority::Error => write!(f, "ERROR"),
+            Priority::Warning => write!(f, "WARNING"),
+            Priority::Notice => write!(f, "NOTICE"),
+            Priority::Info => write!(f, "INFO"),
+            Priority::Debug => write!(f, "DEBUG"),
         }
     }
 }
@@ -417,7 +417,7 @@ fn get_localtime() -> tm {
 /// # }
 /// ```
 pub fn log(pri: Priority, fac: Facility, file_name: &str, line: u32, args: fmt::Arguments) {
-    const MONTHS: [&'static str; 12] = [
+    const MONTHS: [&str; 12] = [
         "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec",
     ];
 
@@ -457,11 +457,7 @@ pub fn log(pri: Priority, fac: Facility, file_name: &str, line: u32, args: fmt::
     let (res, len) = {
         let mut buf_cursor = Cursor::new(&mut buf[..]);
         (
-            write!(
-                &mut buf_cursor,
-                "[{}:{}:{}] {}\n",
-                pri, file_name, line, args
-            ),
+            writeln!(&mut buf_cursor, "[{}:{}:{}] {}", pri, file_name, line, args),
             buf_cursor.position() as usize,
         )
     };