correlation-parser: fix linter warnings

Typical warnings: * extra &s * enum variants ending with Error * manually implementing += operator Signed-off-by: Tibor Benke <[email protected]>
balabit · Jun 28, 2016 · dd364aa · dd364aa
1 parent 3eb3323
commit dd364aa
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/correlation-parser/correlation/src/config/action/message/mod.rs b/correlation-parser/correlation/src/config/action/message/mod.rs
@@ -58,7 +58,7 @@ impl<T> MessageAction<T> {
         let context_id = context.uuid.hyphenated().to_string();
         let mut message = Vec::new();
         self.message.format_with_context(state.messages(), &context_id, &mut message);
-        let mut event = E::new(&self.uuid.as_bytes(), &message);
+        let mut event = E::new(self.uuid.as_bytes(), &message);
         event.set_name(self.name.as_ref().map(|name| name.as_bytes()));
         let mut value = Vec::new();
         for (k, v) in &self.values {

diff --git a/correlation-parser/correlation/src/context/base.rs b/correlation-parser/correlation/src/context/base.rs
@@ -91,7 +91,7 @@ impl<E, T> BaseContext<E, T> where E: Event, T: Template<Event=E> {
                     state: &mut State<E>,
                     responder: &mut VecDeque<Alert<E>>) {
         if state.is_open() {
-            state.update_timers(&event);
+            state.update_timers(event);
         }
         if self.is_closing(state) {
             self.close(state, responder);

diff --git a/correlation-parser/correlation/src/context/map/map.rs b/correlation-parser/correlation/src/context/map/map.rs
@@ -36,7 +36,7 @@ impl<E, T> MapContext<E, T> where E: Event, T: Template<Event=E> {
     #[allow(for_kv_map)]
     pub fn on_timer(&mut self, event: &Duration, responder: &mut VecDeque<Alert<E>>) {
         for (_, mut state) in &mut self.map {
-            self.base.on_timer(&event, &mut state, responder);
+            self.base.on_timer(event, &mut state, responder);
         }
         self.remove_closed_states();
     }
@@ -67,7 +67,7 @@ impl<E, T> MapContext<E, T> where E: Event, T: Template<Event=E> {
 
     fn update_state(&mut self, event: E, responder: &mut VecDeque<Alert<E>>) {
         let key = self.context_id.iter().map(|key| {
-                ((&key[..].as_bytes()).to_vec(), event.get(key.as_bytes()).map_or_else(Vec::new, |value| value.to_vec()))
+                ((key[..].as_bytes()).to_vec(), event.get(key.as_bytes()).map_or_else(Vec::new, |value| value.to_vec()))
             }).collect::<ContextKey>();
         let mut state = self.map.entry(key).or_insert_with(State::new);
         self.base.on_message(event, &mut state, responder);

diff --git a/correlation-parser/correlation/src/correlator/error.rs b/correlation-parser/correlation/src/correlator/error.rs
@@ -18,7 +18,7 @@ pub enum Error {
     Io(io::Error),
     SerdeJson(serde_json::error::Error),
     SerdeYaml(serde_yaml::error::Error),
-    TemplateCompileError(CompileError),
+    TemplateCompile(CompileError),
     UnsupportedFileExtension(String),
     FileExtensionNotFound,
     NotUtf8FileName
@@ -44,7 +44,7 @@ impl From<serde_yaml::error::Error> for Error {
 
 impl From<CompileError> for Error {
     fn from(error: CompileError) -> Error {
-        Error::TemplateCompileError(error)
+        Error::TemplateCompile(error)
     }
 }
 
@@ -54,7 +54,7 @@ impl Display for Error {
             Error::Io(ref error) => error.fmt(formatter),
             Error::SerdeJson(ref error) => error.fmt(formatter),
             Error::SerdeYaml(ref error) => error.fmt(formatter),
-            Error::TemplateCompileError(ref error) => error.fmt(formatter),
+            Error::TemplateCompile(ref error) => error.fmt(formatter),
             Error::UnsupportedFileExtension(ref ext) => formatter.write_fmt(format_args!("File extension '{}' is not supported", ext)),
             Error::FileExtensionNotFound => formatter.write_str("The configuration file does not have an extension"),
             Error::NotUtf8FileName => formatter.write_str("File name is not a valid UTF-8 character sequence"),
@@ -68,7 +68,7 @@ impl ::std::error::Error for Error {
             Error::Io(ref error) => error.description(),
             Error::SerdeJson(ref error) => error.description(),
             Error::SerdeYaml(ref error) => error.description(),
-            Error::TemplateCompileError(ref error) => error.description(),
+            Error::TemplateCompile(ref error) => error.description(),
             Error::UnsupportedFileExtension(_) => "The correlation library does not support this file format",
             Error::FileExtensionNotFound => "The configuration file does not have file extension",
             Error::NotUtf8FileName => "File name is not a valid UTF-8 character sequence",
@@ -79,7 +79,7 @@ impl ::std::error::Error for Error {
             Error::Io(ref error) => error.cause(),
             Error::SerdeJson(ref error) => error.cause(),
             Error::SerdeYaml(ref error) => error.cause(),
-            Error::TemplateCompileError(ref error) => error.cause(),
+            Error::TemplateCompile(ref error) => error.cause(),
             Error::UnsupportedFileExtension(_) |
                 Error::FileExtensionNotFound |
                 Error::NotUtf8FileName => None,

diff --git a/correlation-parser/correlation/src/state.rs b/correlation-parser/correlation/src/state.rs
@@ -68,8 +68,8 @@ impl<E: Event> State<E> {
 
     pub fn update_timers(&mut self, event: &Duration) {
         let delta = *event;
-        self.elapsed_time = self.elapsed_time + delta;
-        self.elapsed_time_since_last_message = self.elapsed_time_since_last_message + delta;
+        self.elapsed_time +=  delta;
+        self.elapsed_time_since_last_message += delta;
     }
 
     fn reset(&mut self) {