Fix Rust 1.79 warnings.

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()),

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,
  }
  }

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));
  });
 

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,14 +36,24 @@ 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 {
  Error::Io(error) => WriterError::Io(error),
  Error::DocumentStartAlreadyEmitted
  | Error::LastElementNameNotAvailable
  | Error::EndElementNameIsNotEqualToLastStartElementName
- | Error::EndElementNameIsNotSpecified => GenericError(value.to_string()),
+ | Error::EndElementNameIsNotSpecified => WriterError::GenericError(value.to_string()),
  }
  }
 }

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(),