dist(release/1.29): backport patches

Cargo.toml

@@ -71,9 +71,9 @@ openssl = { version = "0.10", optional = true }
 # HACK: Temporarily pinned due to ppc64 ELFv1/v2 ABI issue in 300.5.5, to be
 # removed when <https://github.com/openssl/openssl/issues/29815> lands.
 openssl-src = { version = "=300.5.4", optional = true }
-opentelemetry = { version = "0.31", optional = true }
-opentelemetry-otlp = { version = "0.31", features = ["grpc-tonic"], optional = true }
-opentelemetry_sdk = { version = "0.31", features = ["rt-tokio"], optional = true }
+opentelemetry = { version = "0.32", optional = true }
+opentelemetry-otlp = { version = "0.32", features = ["grpc-tonic"], optional = true }
+opentelemetry_sdk = { version = "0.32", features = ["rt-tokio"], optional = true }
 platforms = "3.4"
 pulldown-cmark = { version = "0.13", default-features = false }
 rand = "0.10"
@@ -101,7 +101,7 @@ tokio-stream = "0.1.14"
 toml = "1.0"
 tracing = "0.1"
 tracing-log = "0.2"
-tracing-opentelemetry = { version = "0.32", optional = true }
+tracing-opentelemetry = { version = "0.33", optional = true }
 tracing-subscriber = { version = "0.3.23", features = ["env-filter"] }
 url = "2.4"
 wait-timeout = "0.2"

doc/dev-guide/src/coding-standards.md

@@ -58,7 +58,7 @@ which can build up over time.
 
 ## Writing platform-specific code
 
-For developers using BSD/Linux/Mac OS, there are Windows VM's suitable for such
+For developers using BSD/Linux/Mac OS, there are Windows VMs suitable for such
 development tasks for use with virtualbox and other hypervisors are downloadable
 from
 [Microsoft](https://developer.microsoft.com/en-us/windows/downloads/virtual-machines/).

doc/user-guide/src/installation/other.md

@@ -102,7 +102,7 @@ which is a `brew`-managed `rust` toolchain installation.
 ## Manual installation
 
 You can manually download `rustup-init` for a given target from
-`https://static.rust-lang.org/rustup/dist/{target-triple}/rustup-init[.exe]`[^msys2] [^msvc].
+`https://static.rust-lang.org/rustup/dist/{target-tuple}/rustup-init[.exe]`[^msys2] [^msvc].
 
 <details>
 <summary>Direct links</summary>
@@ -187,7 +187,7 @@ You can manually download `rustup-init` for a given target from
 </details>
 
 To get a previous version, use
-`https://static.rust-lang.org/rustup/archive/{rustup-version}/{target-triple}/rustup-init[.exe]`.
+`https://static.rust-lang.org/rustup/archive/{rustup-version}/{target-tuple}/rustup-init[.exe]`.
 
 SHA-256 checksums are also available by appending `.sha256` to the link.
 

doc/user-guide/src/installation/windows.md

@@ -20,7 +20,7 @@ a target tuple of either `i686-pc-windows-msvc`, `x86_64-pc-windows-msvc`, or `a
 depending on the CPU architecture of the host Windows OS. The toolchains that
 `rustup` chooses to install, unless told otherwise through the [toolchain
 specification], will be compiled to run on that target tuple host and will
-target that triple by default.
+target that tuple by default.
 
 You can change this behavior with `rustup set default-host` or during
 installation.

rustup-init.sh

@@ -44,7 +44,7 @@ Options:
           Set log level to 'DEBUG' if 'RUSTUP_LOG' is unset
   -q, --quiet
           Disable progress output, set log level to 'WARN' if 'RUSTUP_LOG' is unset
-  -y
+  -y, --yes
           Disable confirmation prompt
       --default-host <DEFAULT_HOST>
           Choose a default host tuple
@@ -134,6 +134,11 @@ main() {
             --quiet)
                 RUSTUP_QUIET=yes
                 ;;
+            --yes)
+                # user wants to skip the prompt --
+                # we don't need /dev/tty
+                need_tty=no
+                ;;
             *)
                 OPTIND=1
                 if [ "${arg%%--*}" = "" ]; then

src/cli/common.rs

@@ -17,7 +17,7 @@ use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
 
 use crate::{
     config::Cfg,
-    dist::{DistOptions, TargetTriple, ToolchainDesc},
+    dist::{DistOptions, TargetTuple, ToolchainDesc},
     errors::RustupError,
     install::{InstallMethod, UpdateStatus},
     process::Process,
@@ -510,16 +510,16 @@ pub(crate) fn ignorable_error(
 /// - The `force_non_host` flag is set to `false`.
 pub(crate) fn check_non_host_toolchain(
     toolchain: String,
-    host_arch: &TargetTriple,
-    target_triple: &TargetTriple,
+    host_arch: &TargetTuple,
+    target_tuple: &TargetTuple,
     force_non_host: bool,
 ) -> Result<()> {
-    if force_non_host || host_arch.can_run(target_triple)? {
+    if force_non_host || host_arch.can_run(target_tuple)? {
         return Ok(());
     }
     Err(RustupError::ToolchainIncompatible {
         toolchain,
-        target_triple: target_triple.clone(),
+        target_tuple: target_tuple.clone(),
     }
     .into())
 }
@@ -531,10 +531,10 @@ pub(crate) fn warn_if_host_is_emulated(process: &Process) {
     if process.var("RUSTUP_CI").is_ok() {
         return;
     }
-    if TargetTriple::is_host_emulated() {
+    if TargetTuple::is_host_emulated() {
         warn!(
             "Rustup is not running natively. It's running under emulation of {}.",
-            TargetTriple::from_host_or_build(process)
+            TargetTuple::from_host_or_build(process)
         );
         warn!(
             "For best compatibility and performance you should reinstall rustup for your native CPU."

src/cli/help.rs

@@ -99,7 +99,7 @@ pub(crate) fn toolchain_help() -> String {
     {PLACEHOLDER}<versioned>     = <major.minor>|<major.minor.patch>{PLACEHOLDER:#}
     {PLACEHOLDER}<prerelease>    = beta[.<number>]{PLACEHOLDER:#}
     {PLACEHOLDER}<date>          = YYYY-MM-DD{PLACEHOLDER:#}
-    {PLACEHOLDER}<host>          = <target-triple>{PLACEHOLDER:#}
+    {PLACEHOLDER}<host>          = <target-tuple>{PLACEHOLDER:#}
 
   'channel' is a named release channel, a major and minor version
   number such as `1.42`, or a fully specified version number, such

src/cli/proxy_mode.rs

@@ -32,11 +32,11 @@ pub async fn main(arg0: &str, current_dir: PathBuf, process: &Process) -> Result
         .skip(1 + toolchain.is_some() as usize)
         .collect();
 
-    let cfg = Cfg::from_env(current_dir, false, process)?;
+    let cfg = Cfg::from_env(current_dir, false, true, process)?;
     let (toolchain, source) = cfg
         .local_toolchain(match toolchain {
             Some(name) => Some((
-                name.resolve(&cfg.get_default_host_triple()?)?,
+                name.resolve(&cfg.default_host_tuple()?)?,
                 ActiveSource::CommandLine,
             )),
             None => None,