Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 3 insertions, 4 deletions

diff --git a/testing/webdriver/src/command.rs b/testing/webdriver/src/command.rs
index 3f531ebd3e..2aa72d5140 100644
--- a/testing/webdriver/src/command.rs
+++ b/testing/webdriver/src/command.rs
@@ -14,7 +14,7 @@ use crate::error::{ErrorStatus, WebDriverError, WebDriverResult};
 use crate::httpapi::{Route, VoidWebDriverExtensionRoute, WebDriverExtensionRoute};
 use crate::Parameters;
 use serde::de::{self, Deserialize, Deserializer};
-use serde_json::{self, Value};
+use serde_json::Value;
 
 #[derive(Debug, PartialEq)]
 pub enum WebDriverCommand<T: WebDriverExtensionCommand> {
diff --git a/testing/webdriver/src/error.rs b/testing/webdriver/src/error.rs
index d4032a70db..0fdc7a7fc0 100644
--- a/testing/webdriver/src/error.rs
+++ b/testing/webdriver/src/error.rs
@@ -7,7 +7,6 @@ use http::StatusCode;
 use serde::de::{Deserialize, Deserializer};
 use serde::ser::{Serialize, Serializer};
 use std::borrow::Cow;
-use std::convert::From;
 use std::error;
 use std::io;
 use thiserror::Error;
diff --git a/testing/webdriver/src/server.rs b/testing/webdriver/src/server.rs
index 3aa55c690e..c1ddb7f6c5 100644
--- a/testing/webdriver/src/server.rs
+++ b/testing/webdriver/src/server.rs
@@ -10,7 +10,7 @@ use crate::httpapi::{
 use crate::response::{CloseWindowResponse, WebDriverResponse};
 use crate::Parameters;
 use bytes::Bytes;
-use http::{self, Method, StatusCode};
+use http::{Method, StatusCode};
 use std::marker::PhantomData;
 use std::net::{SocketAddr, TcpListener as StdTcpListener};
 use std::sync::mpsc::{channel, Receiver, Sender};
@@ -19,7 +19,7 @@ use std::thread;
 use tokio::net::TcpListener;
 use tokio_stream::wrappers::TcpListenerStream;
 use url::{Host, Url};
-use warp::{self, Buf, Filter, Rejection};
+use warp::{Buf, Filter, Rejection};
 
 // Silence warning about Quit being unused for now.
 #[allow(dead_code)]