[meta] update self_update to 0.43.1, use ureq, excise ring (#3141)

The ring crate has caused no end of issues with spurious recompiles.

* Update self_update to 0.43.1.
* Switch to ureq -- we don't need reqwest for a single serial HTTP
download.
* Remove ring by manually enabling aws-lc-rs and doing the download with
ureq ourselves. (As a bonus, we can use nextest's progress bar style.)

The ring crate is still present in Cargo.lock, but that's only due to
rust-lang/cargo#10801.

Author: sunshowers

Cargo.lock

@@ -111,9 +111,15 @@ recursion = "0.5.4"
 regex = "1.12.3"
 regex-syntax = "0.8.10"
 sapling-streampager = "0.12.0"
-self_update = { version = "0.42.0", default-features = false, features = [
+rustls = { version = "0.23.37", default-features = false }
+self_update = { version = "0.43.1", default-features = false, features = [
     "archive-tar",
     "compression-flate2",
+    # nextest only uses self_update for archive extraction (ArchiveKind,
+    # Compression, Extract), not its HTTP client. But self_update's Download
+    # struct unconditionally calls http_client::get, so at least one HTTP
+    # backend must be enabled for it to compile.
+    "ureq",
 ] }
 semver = "1.0.27"
 serde = { version = "1.0.228", features = ["derive"] }
@@ -142,6 +148,7 @@ tracing = "0.1.44"
 tracing-subscriber = { version = "0.3.22", default-features = false, features = ["std", "tracing-log", "fmt"] }
 unicode-ident = "1.0.24"
 unicode-normalization = "0.1.25"
+ureq = { version = "3.2.0", default-features = false }
 usdt = "0.6.0"
 walkdir = "2.5.0"
 whoami = "2.1.1"

Cargo.toml

@@ -6,10 +6,11 @@ passthrough = ["CARGO_PROFILE_RELEASE_LTO"]
 # https://github.com/cross-rs/cross/pull/1166
 image = "ghcr.io/cross-rs/x86_64-unknown-freebsd:edge"
 
-# This doesn't work because the cross 0.2.4 Docker container is based on Ubuntu 18.04, which doesn't
-# have binary packages available for riscv64.
-# [target.riscv64gc-unknown-linux-gnu]
-# pre-build = [
-#     "dpkg --add-architecture aarch64",
-#     "apt-get update && apt-get install --assume-yes libssl-dev:aarch64"
-# ]
+[target.riscv64gc-unknown-linux-gnu]
+# The default cross image is based on Ubuntu 18.04, which doesn't have riscv64
+# packages. The edge image is newer and does.
+image = "ghcr.io/cross-rs/riscv64gc-unknown-linux-gnu:edge"
+pre-build = [
+    "dpkg --add-architecture riscv64",
+    "apt-get update && apt-get install --assume-yes libssl-dev:riscv64",
+]

Cross.toml

@@ -4,7 +4,10 @@
 use crate::{ExpectedError, Result, output::OutputContext};
 use camino::Utf8PathBuf;
 use nextest_metadata::NextestExitCode;
-use nextest_runner::update::{CheckStatus, MuktiBackend, UpdateVersionReq};
+use nextest_runner::{
+    helpers::ThemeCharacters,
+    update::{CheckStatus, MuktiBackend, UpdateDisplayStyles, UpdateVersionReq},
+};
 use owo_colors::OwoColorize;
 use semver::Version;
 use std::cmp::Ordering;
@@ -111,8 +114,16 @@ pub(crate) fn perform_update(
             };
 
             if should_apply {
+                let mut update_styles = UpdateDisplayStyles {
+                    theme_characters: ThemeCharacters::detect(supports_unicode::Stream::Stderr),
+                    ..Default::default()
+                };
+                if output.color.should_colorize(supports_color::Stream::Stderr) {
+                    update_styles.colorize();
+                }
+
                 debug!(url = ctx.location.url, "updating cargo nextest");
-                ctx.do_update()
+                ctx.do_update(&update_styles)
                     .map_err(|err| ExpectedError::UpdateError { err })?;
                 info!(
                     "cargo-nextest updated to {}",

cargo-nextest/src/update.rs

@@ -142,16 +142,20 @@ windows-sys = { workspace = true, features = [
 ] }
 win32job.workspace = true
 
-# Use rustls by default, OpenSSL on platforms where rustls isn't available:
+# Use rustls with aws-lc-rs by default, OpenSSL on platforms where rustls
+# isn't available:
 # RISC-V: https://github.com/nextest-rs/nextest/issues/820
-# (default features for self_update turns on openssl)
 [target.'cfg(not(any(target_arch = "riscv32", target_arch = "riscv64")))'.dependencies]
-self_update = { workspace = true, optional = true, default-features = false, features = [
-    "rustls",
-] }
+self_update = { workspace = true, optional = true, default-features = false }
+# self_update's "rustls" feature hardcodes ureq's ring crypto provider. To use
+# aws-lc-rs instead, activate ureq's TLS and rustls's provider separately.
+ureq = { workspace = true, optional = true, features = ["rustls-no-provider", "rustls-webpki-roots"] }
+rustls = { workspace = true, optional = true, features = ["aws-lc-rs"] }
 
 [target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64"))'.dependencies]
-self_update = { workspace = true, optional = true, default-features = true }
+self_update = { workspace = true, optional = true, default-features = false }
+# On RISC-V, rustls/aws-lc-rs aren't available, so use native-tls instead.
+ureq = { workspace = true, optional = true, features = ["native-tls"] }
 
 
 [dev-dependencies]
@@ -176,7 +180,9 @@ self-update = [
     "dep:self_update",
     "dep:http",
     "dep:mukti-metadata",
+    "dep:rustls",
     "dep:sha2",
+    "dep:ureq",
 ]
 usdt = ["dep:usdt"]
 experimental-tokio-console = [

nextest-runner/Cargo.toml

@@ -2890,6 +2890,32 @@ mod self_update_errors {
         #[error("self-update failed")]
         SelfUpdate(#[source] self_update::errors::Error),
 
+        /// An HTTP error occurred while performing a request.
+        #[error("error performing HTTP request")]
+        Http(#[source] ureq::Error),
+
+        /// An error occurred while reading an HTTP response body.
+        #[error("error reading HTTP response body")]
+        HttpBody(#[source] std::io::Error),
+
+        /// The server's Content-Length header was present but could not be
+        /// parsed.
+        #[error("Content-Length header present but could not be parsed as an integer: {value:?}")]
+        ContentLengthInvalid {
+            /// The raw header value.
+            value: String,
+        },
+
+        /// The server's Content-Length header didn't match the number of bytes
+        /// received.
+        #[error("content length mismatch: expected {expected} bytes, received {actual} bytes")]
+        ContentLengthMismatch {
+            /// The expected number of bytes (from the Content-Length header).
+            expected: u64,
+            /// The actual number of bytes received.
+            actual: u64,
+        },
+
         /// Deserializing release metadata failed.
         #[error("deserializing release metadata failed")]
         ReleaseMetadataDe(#[source] serde_json::Error),

nextest-runner/src/errors.rs

@@ -735,6 +735,16 @@ impl Default for ThemeCharacters {
 }
 
 impl ThemeCharacters {
+    /// Creates a `ThemeCharacters` with Unicode auto-detected for the given
+    /// stream.
+    pub fn detect(stream: supports_unicode::Stream) -> Self {
+        let mut this = Self::default();
+        if supports_unicode::on(stream) {
+            this.use_unicode();
+        }
+        this
+    }
+
     /// Switches to Unicode characters for richer terminal output.
     pub fn use_unicode(&mut self) {
         self.hbar = '─';

nextest-runner/src/helpers.rs

@@ -91,19 +91,16 @@ impl DisplayReporterBuilder {
             styles.colorize();
         }
 
-        let mut theme_characters = ThemeCharacters::default();
-        match &output {
-            ReporterOutput::Terminal => {
-                if supports_unicode::on(supports_unicode::Stream::Stderr) {
-                    theme_characters.use_unicode();
-                }
-            }
+        let theme_characters = match &output {
+            ReporterOutput::Terminal => ThemeCharacters::detect(supports_unicode::Stream::Stderr),
             ReporterOutput::Writer { use_unicode, .. } => {
+                let mut tc = ThemeCharacters::default();
                 if *use_unicode {
-                    theme_characters.use_unicode();
+                    tc.use_unicode();
                 }
+                tc
             }
-        }
+        };
 
         let is_terminal = matches!(&output, ReporterOutput::Terminal) && io::stderr().is_terminal();
         let is_ci = is_ci::uncached();