replace String::from_utf8() with std::str::from_utf8()

allocation should be avoided when possible since it's relatively slow
NixOS · Aug 8, 2024 · 29bae01 · 29bae01
1 parent f362b08
commit 29bae01
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/ofborg/src/tasks/build.rs b/ofborg/src/tasks/build.rs
@@ -269,7 +269,7 @@ impl notifyworker::SimpleNotifyWorker for BuildWorker {
         match buildjob::from(body) {
             Ok(job) => Ok(job),
             Err(err) => {
-                error!("{:?}", String::from_utf8(body.to_vec()));
+                error!("{:?}", std::str::from_utf8(body).unwrap_or("<not utf8>"));
                 panic!("{err:?}");
             }
         }
@@ -453,8 +453,8 @@ mod tests {
         actions
             .position(|job| match job {
                 worker::Action::Publish(ref body) => {
-                    let content = String::from_utf8(body.content.clone()).unwrap();
-                    let text = strip_escaped_ansi(&content);
+                    let content = std::str::from_utf8(&body.content).unwrap();
+                    let text = strip_escaped_ansi(content);
                     eprintln!("{text}");
                     if text.contains(text_to_match) {
                         println!(" ok");

diff --git a/ofborg/src/tasks/evaluate.rs b/ofborg/src/tasks/evaluate.rs
@@ -68,8 +68,8 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for EvaluationWorker<E>
             Err(err) => {
                 self.events.notify(Event::JobDecodeFailure);
                 error!(
-                    "Failed to decode message: {:?}, Err: {err:?}",
-                    String::from_utf8(body.to_vec())
+                    "Failed to decode message: {}, Err: {err:?}",
+                    std::str::from_utf8(body).unwrap_or("<message not utf8>")
                 );
                 Err("Failed to decode message".to_owned())
             }

diff --git a/ofborg/src/tasks/evaluationfilter.rs b/ofborg/src/tasks/evaluationfilter.rs
@@ -23,7 +23,7 @@ impl worker::SimpleWorker for EvaluationFilterWorker {
             Ok(event) => Ok(event),
             Err(err) => Err(format!(
                 "Failed to deserialize job {err:?}: {:?}",
-                String::from_utf8(body.to_vec())
+                std::str::from_utf8(body).unwrap_or("<job not utf8>")
             )),
         }
     }

diff --git a/ofborg/src/tasks/githubcommentfilter.rs b/ofborg/src/tasks/githubcommentfilter.rs
@@ -27,7 +27,7 @@ impl worker::SimpleWorker for GitHubCommentWorker {
             Err(err) => {
                 error!(
                     "Failed to deserialize IsssueComment: {:?}",
-                    String::from_utf8(body.to_vec())
+                    std::str::from_utf8(body).unwrap_or("<not utf8>")
                 );
                 panic!("{err:?}");
             }

diff --git a/ofborg/src/tasks/statscollector.rs b/ofborg/src/tasks/statscollector.rs
@@ -39,7 +39,7 @@ impl<E: stats::SysEvents + 'static> worker::SimpleWorker for StatCollectorWorker
                         self.events.notify(stats::Event::StatCollectorBogusEvent);
                         error!(
                             "Failed to decode message: {:?}, Err: {err:?}",
-                            String::from_utf8(body.to_vec())
+                            std::str::from_utf8(body).unwrap_or("<message not utf8>")
                         );
                         Err("Failed to decode message".to_owned())
                     }