File d51c275fc63d1ee5bbdc6fc70279ec8dae86a9c1.patch of Package hurl

Overview Repositories Revisions Requests Users Attributes Meta

File d51c275fc63d1ee5bbdc6fc70279ec8dae86a9c1.patch of Package hurl (Revision b61c6e3bdf8a1edd0ee4efb671a61460)

Currently displaying revision b61c6e3bdf8a1edd0ee4efb671a61460 , Show latest

From d51c275fc63d1ee5bbdc6fc70279ec8dae86a9c1 Mon Sep 17 00:00:00 2001
From: Jean-Christophe Amiel <jeanchristophe.amiel@orange.com>
Date: Fri, 14 Jun 2024 10:21:36 +0200
Subject: [PATCH] Fix Rust 1.79 warnings.

---
 packages/hurl/src/http/options.rs            |  5 -----
 packages/hurl/src/parallel/message.rs        | 10 +++++-----
 packages/hurl/src/parallel/worker.rs         |  2 +-
 packages/hurl/src/report/junit/xml/writer.rs | 15 +++++++++++++--
 packages/hurl/src/runner/entry.rs            |  1 -
 5 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/packages/hurl/src/http/options.rs b/packages/hurl/src/http/options.rs
index acb6b9f6525..ae87273498d 100644
--- a/packages/hurl/src/http/options.rs
+++ b/packages/hurl/src/http/options.rs
@@ -17,8 +17,6 @@
  */
 use std::time::Duration;
 
-use hurl_core::ast::Retry;
-
 use crate::http::request::RequestedHttpVersion;
 use crate::http::IpResolve;
 
@@ -46,7 +44,6 @@ pub struct ClientOptions {
     pub path_as_is: bool,
     pub proxy: Option<String>,
     pub resolves: Vec<String>,
-    pub retry: Retry,
     pub ssl_no_revoke: bool,
     pub timeout: Duration,
     pub unix_socket: Option<String>,
@@ -87,7 +84,6 @@ impl Default for ClientOptions {
             path_as_is: false,
             proxy: None,
             resolves: vec![],
-            retry: Retry::None,
             ssl_no_revoke: false,
             timeout: Duration::from_secs(300),
             unix_socket: None,
@@ -242,7 +238,6 @@ mod tests {
                     "foo.com:80:192.168.0.1".to_string(),
                     "bar.com:443:127.0.0.1".to_string(),
                 ],
-                retry: Retry::None,
                 ssl_no_revoke: false,
                 timeout: Duration::from_secs(10),
                 unix_socket: Some("/var/run/example.sock".to_string()),
diff --git a/packages/hurl/src/parallel/message.rs b/packages/hurl/src/parallel/message.rs
index 5f7e1cf0fc1..c21689d788d 100644
--- a/packages/hurl/src/parallel/message.rs
+++ b/packages/hurl/src/parallel/message.rs
@@ -19,7 +19,7 @@ use std::io;
 
 use crate::parallel::job::{Job, JobResult};
 use crate::parallel::worker::WorkerId;
-use crate::util::term::{Stderr, Stdout};
+use crate::util::term::Stderr;
 
 /// Represents a message sent from the worker to the runner (running on the main thread).
 pub enum WorkerMessage {
@@ -38,6 +38,7 @@ pub enum WorkerMessage {
 /// A message sent from worker to runner when the input file can't be read.
 pub struct IOErrorMsg {
     /// Identifier of the worker sending this message.
+    #[allow(dead_code)]
     pub worker_id: WorkerId,
     /// Job originator of this message.
     pub job: Job,
@@ -59,8 +60,10 @@ impl IOErrorMsg {
 /// A message sent from worker to runner when the input file can't be parsed.
 pub struct ParsingErrorMsg {
     /// Identifier of the worker sending this message.
+    #[allow(dead_code)]
     pub worker_id: WorkerId,
     /// Job originator of this message.
+    #[allow(dead_code)]
     pub job: Job,
     /// Standard error of the worker for this job.
     pub stderr: Stderr,
@@ -107,19 +110,16 @@ pub struct CompletedMsg {
     pub worker_id: WorkerId,
     /// Result execution of the originator job, can successful or failed.
     pub result: JobResult,
-    /// Standard output of the worker for this job.
-    pub stdout: Stdout,
     /// Standard error of the worker for this job.
     pub stderr: Stderr,
 }
 
 impl CompletedMsg {
     /// Creates a new completed message: the job has completed, successfully or not.
-    pub fn new(worker_id: WorkerId, result: JobResult, stdout: Stdout, stderr: Stderr) -> Self {
+    pub fn new(worker_id: WorkerId, result: JobResult, stderr: Stderr) -> Self {
         CompletedMsg {
             worker_id,
             result,
-            stdout,
             stderr,
         }
     }
diff --git a/packages/hurl/src/parallel/worker.rs b/packages/hurl/src/parallel/worker.rs
index 66689864ddc..0537697831b 100644
--- a/packages/hurl/src/parallel/worker.rs
+++ b/packages/hurl/src/parallel/worker.rs
@@ -127,7 +127,7 @@ impl Worker {
                 ));
             }
             let job_result = JobResult::new(job, content, result);
-            let msg = CompletedMsg::new(worker_id, job_result, stdout, logger.stderr);
+            let msg = CompletedMsg::new(worker_id, job_result, logger.stderr);
             _ = tx.send(WorkerMessage::Completed(msg));
         });
 
diff --git a/packages/hurl/src/report/junit/xml/writer.rs b/packages/hurl/src/report/junit/xml/writer.rs
index 74b6957b9da..91c62353dbd 100644
--- a/packages/hurl/src/report/junit/xml/writer.rs
+++ b/packages/hurl/src/report/junit/xml/writer.rs
@@ -16,6 +16,8 @@
  *
  */
 use std::borrow::Cow;
+use std::fmt;
+use std::fmt::{Debug, Formatter};
 use std::string::FromUtf8Error;
 
 use xml::attribute::Attribute;
@@ -24,7 +26,6 @@ use xml::namespace::Namespace;
 use xml::writer::{Error, XmlEvent};
 use xml::EventWriter;
 
-use crate::report::junit::xml::writer::WriterError::GenericError;
 use crate::report::junit::xml::{Element, XmlDocument, XmlNode};
 
 /// Errors raised when serializing an XML document.
@@ -35,6 +36,16 @@ pub enum WriterError {
     GenericError(String),
 }
 
+impl fmt::Display for WriterError {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        match self {
+            WriterError::Io(err) => write!(f, "{err}"),
+            WriterError::FromUtf8Error(err) => write!(f, "{err}"),
+            WriterError::GenericError(err) => write!(f, "{err}"),
+        }
+    }
+}
+
 impl From<Error> for WriterError {
     fn from(value: Error) -> Self {
         match value {
@@ -42,7 +53,7 @@ impl From<Error> for WriterError {
             Error::DocumentStartAlreadyEmitted
             | Error::LastElementNameNotAvailable
             | Error::EndElementNameIsNotEqualToLastStartElementName
-            | Error::EndElementNameIsNotSpecified => GenericError(value.to_string()),
+            | Error::EndElementNameIsNotSpecified => WriterError::GenericError(value.to_string()),
         }
     }
 }
diff --git a/packages/hurl/src/runner/entry.rs b/packages/hurl/src/runner/entry.rs
index d516dfc4deb..21cbb3d844d 100644
--- a/packages/hurl/src/runner/entry.rs
+++ b/packages/hurl/src/runner/entry.rs
@@ -224,7 +224,6 @@ impl ClientOptions {
             no_proxy: runner_options.no_proxy.clone(),
             insecure: runner_options.insecure,
             resolves: runner_options.resolves.clone(),
-            retry: runner_options.retry,
             ssl_no_revoke: runner_options.ssl_no_revoke,
             timeout: runner_options.timeout,
             unix_socket: runner_options.unix_socket.clone(),

Places

File d51c275fc63d1ee5bbdc6fc70279ec8dae86a9c1.patch of Package hurl (Revision b61c6e3bdf8a1edd0ee4efb671a61460)

Places