Merging upstream version 126.0.

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

6 files changed, 24 insertions, 24 deletions

diff --git a/testing/geckodriver/.cargo/config b/testing/geckodriver/.cargo/config.toml
index 18086c84c5..18086c84c5 100644
--- a/testing/geckodriver/.cargo/config
+++ b/testing/geckodriver/.cargo/config.toml
diff --git a/testing/geckodriver/README.md b/testing/geckodriver/README.md
index 6329e48736..ec43117ae7 100644
--- a/testing/geckodriver/README.md
+++ b/testing/geckodriver/README.md
@@ -1,5 +1,4 @@
-geckodriver
-===========
+# geckodriver
 
 Proxy for using W3C [WebDriver] compatible clients to interact with
 Gecko-based browsers.
@@ -13,16 +12,21 @@ as a proxy between the local- and remote ends.
 [Marionette remote protocol]: https://firefox-source-docs.mozilla.org/testing/marionette/
 [WebDriver]: https://developer.mozilla.org/en-US/docs/Web/WebDriver
 
+## Installation
 
-Downloads
----------
+Geckodriver can be installed through various distribution channels:
 
-* [Releases](https://github.com/mozilla/geckodriver/releases/latest)
-* [Change log](https://searchfox.org/mozilla-central/source/testing/geckodriver/CHANGES.md)
+* You can download pre-built binaries for the most common platforms from our [Releases] page on GitHub.
+* Alternatively, you can compile it yourself by using:
+  * `cargo install geckodriver`, or
+  * Checking out the `release` branch or a specific tag.
 
+For a detailed list of changes included in each release, please refer to the [change log].
 
-Documentation
--------------
+[change log]: https://github.com/mozilla/geckodriver/blob/release/CHANGES.md
+[Releases]: https://github.com/mozilla/geckodriver/releases/latest
+
+## Documentation
 
 * [WebDriver] (work in progress)
   * [Commands](https://developer.mozilla.org/en-US/docs/Web/WebDriver/Commands)
@@ -52,21 +56,17 @@ Documentation
   * [Releasing](https://firefox-source-docs.mozilla.org/testing/geckodriver/Releasing.html)
   * [Self-serving an ARM build](https://firefox-source-docs.mozilla.org/testing/geckodriver/ARM.html)
 
-
-Source code
------------
+## Source code
 
 geckodriver is made available under the [Mozilla Public License].
 
 Its source code can be found in [mozilla-central] under testing/geckodriver.
 This GitHub repository is only used for issue tracking and making releases.
 
-[source code]: https://hg.mozilla.org/mozilla-unified/file/tip/testing/geckodriver
 [Mozilla Public License]: https://www.mozilla.org/en-US/MPL/2.0/
 [mozilla-central]: https://hg.mozilla.org/mozilla-central/file/tip/testing/geckodriver
 
-Custom release builds
----------------------
+## Custom release builds
 
 If a binary is not available for your platform, it's possibe to create a custom
 build using the [Rust] toolchain. To do this, checkout the release tag for the
@@ -75,11 +75,11 @@ be built and installed from `crates.io` using `cargo install geckodriver`.
 
 [Rust]: https://rustup.rs/
 
-Contact
--------
+## Contact
 
 The mailing list for geckodriver discussion is
-https://groups.google.com/a/mozilla.org/g/dev-webdriver.
+<https://groups.google.com/a/mozilla.org/g/dev-webdriver>.
 
-There is also an Element channel to talk about using and developing
-geckodriver on `#webdriver:mozilla.org <https://chat.mozilla.org/#/room/#webdriver:mozilla.org>`__
+There is also a [Matrix](https://wiki.mozilla.org/Matrix) channel on
+chat.mozilla.org to talk about using and developing geckodriver in
+[#webdriver](https://chat.mozilla.org/#/room/#webdriver:mozilla.org).
diff --git a/testing/geckodriver/doc/ARM.md b/testing/geckodriver/doc/ARM.md
index 8ae9afae58..1b93f8f17c 100644
--- a/testing/geckodriver/doc/ARM.md
+++ b/testing/geckodriver/doc/ARM.md
@@ -32,7 +32,7 @@ cross-compile ARMv7 from a Linux host system is as follows:
       % rustup target install armv7-unknown-linux-gnueabihf
       ```
 
-  5. Put this in [testing/geckodriver/.cargo/config]:
+  5. Put this in [testing/geckodriver/.cargo/config.toml]:
 
       ```rust
       [target.armv7-unknown-linux-gnueabihf]
@@ -47,4 +47,4 @@ cross-compile ARMv7 from a Linux host system is as follows:
       ```
 
 [central]: https://hg.mozilla.org/mozilla-central/
-[testing/geckodriver/.cargo/config]: https://searchfox.org/mozilla-central/source/testing/geckodriver/.cargo/config
+[testing/geckodriver/.cargo/config.toml]: https://searchfox.org/mozilla-central/source/testing/geckodriver/.cargo/config.toml
diff --git a/testing/geckodriver/src/capabilities.rs b/testing/geckodriver/src/capabilities.rs
index bd58741eed..d79ae53fa6 100644
--- a/testing/geckodriver/src/capabilities.rs
+++ b/testing/geckodriver/src/capabilities.rs
@@ -12,7 +12,7 @@ use mozprofile::preferences::Pref;
 use mozprofile::profile::Profile;
 use mozrunner::firefox_args::{get_arg_value, parse_args, Arg};
 use mozrunner::runner::platform::firefox_default_path;
-use mozversion::{self, firefox_binary_version, firefox_version, Version};
+use mozversion::{firefox_binary_version, firefox_version, Version};
 use regex::bytes::Regex;
 use serde_json::{Map, Value};
 use std::collections::BTreeMap;
diff --git a/testing/geckodriver/src/command.rs b/testing/geckodriver/src/command.rs
index c92eabf6f3..5a949a70f3 100644
--- a/testing/geckodriver/src/command.rs
+++ b/testing/geckodriver/src/command.rs
@@ -7,7 +7,7 @@ use base64::prelude::BASE64_STANDARD;
 use base64::Engine;
 use hyper::Method;
 use serde::de::{self, Deserialize, Deserializer};
-use serde_json::{self, Value};
+use serde_json::Value;
 use std::env;
 use std::fs::File;
 use std::io::prelude::*;
diff --git a/testing/geckodriver/src/marionette.rs b/testing/geckodriver/src/marionette.rs
index d1e9991f74..ad27cae367 100644
--- a/testing/geckodriver/src/marionette.rs
+++ b/testing/geckodriver/src/marionette.rs
@@ -31,7 +31,7 @@ use marionette_rs::webdriver::{
 use mozdevice::AndroidStorageInput;
 use serde::de::{self, Deserialize, Deserializer};
 use serde::ser::{Serialize, Serializer};
-use serde_json::{self, Map, Value};
+use serde_json::{Map, Value};
 use std::io::prelude::*;
 use std::io::Error as IoError;
 use std::io::ErrorKind;