From 861fd0f8e30021f642430b2f34f658bdabf834eb Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 25 Nov 2024 16:12:16 +0100 Subject: [PATCH 01/10] Clean up trailing whitespace in rustup-init.sh --- rustup-init.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rustup-init.sh b/rustup-init.sh index 0f009b0af1..48b15fd76a 100755 --- a/rustup-init.sh +++ b/rustup-init.sh @@ -154,8 +154,8 @@ main() { ensure downloader "$_url" "$_file" "$_arch" ensure chmod u+x "$_file" if [ ! -x "$_file" ]; then - err "Cannot execute $_file (likely because of mounting /tmp as noexec)." - err "Please copy the file to a location where you can execute binaries and run ./rustup-init${_ext}." + err "Cannot execute $_file (likely because of mounting /tmp as noexec)." + err "Please copy the file to a location where you can execute binaries and run ./rustup-init${_ext}." exit 1 fi @@ -508,7 +508,7 @@ get_architecture() { err "This host is running an x32 userland, for which no native toolchain is provided." err "You will have to install multiarch compatibility with i686 or amd64." err "To do so, set the RUSTUP_CPUTYPE environment variable set to i686 or amd64 and re-run this script." - err "You will be able to add an x32 target after installation by running \`rustup target add x86_64-unknown-linux-gnux32\`." + err "You will be able to add an x32 target after installation by running \`rustup target add x86_64-unknown-linux-gnux32\`." exit 1 }; else _cputype=i686 @@ -588,7 +588,7 @@ check_cmd() { } assert_nz() { - if [ -z "$1" ]; then + if [ -z "$1" ]; then err "assert_nz $2" exit 1 fi From 68a212382f71dd5cc4f9db25add275f0ca2c313d Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 25 Nov 2024 16:12:36 +0100 Subject: [PATCH 02/10] Bump version, commit and date in rustup-init.sh --- rustup-init.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rustup-init.sh b/rustup-init.sh index 48b15fd76a..663f0c87e4 100755 --- a/rustup-init.sh +++ b/rustup-init.sh @@ -33,7 +33,7 @@ RUSTUP_QUIET=no # NOTICE: If you change anything here, please make the same changes in setup_mode.rs usage() { cat < Date: Mon, 25 Nov 2024 16:14:52 +0100 Subject: [PATCH 03/10] Append to 1.28.0 changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74548ac0ed..6bb78f473d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -177,6 +177,14 @@ members, so we're happy to have him on board to help address Windows-specific is * feat(cli/rustup-mode): support more books in `rustup doc` by @rami3l in https://github.com/rust-lang/rustup/pull/4071 * docs: update channel toolchain syntax by @kyle-leonhard in https://github.com/rust-lang/rustup/pull/4074 * fix(cli/rustup-mode): remove `.num_args()` when `.value_delimiter(',')` is present by @rami3l in https://github.com/rust-lang/rustup/pull/4076 +* Upgrade to rustls-platform-verifier 0.4 by @djc in https://github.com/rust-lang/rustup/pull/4087 +* Upgrade thiserror to 2 by @djc in https://github.com/rust-lang/rustup/pull/4088 +* fix: add missing close body tag by @Rustin170506 in https://github.com/rust-lang/rustup/pull/4090 +* Upgrade to opentelemetry 0.27 by @djc in https://github.com/rust-lang/rustup/pull/4089 +* feat: add nushell support by @LittleJianCH in https://github.com/rust-lang/rustup/pull/4078 +* Add aliases for remove/uninstall/unset commands by @joshtriplett in https://github.com/rust-lang/rustup/pull/4093 +* chore(deps): update remove-dir-all to 1.0 by @rbtcollins in https://github.com/rust-lang/rustup/pull/4095 +* Prepare 1.28.0 release by @djc in https://github.com/rust-lang/rustup/pull/4079 [pr#3985]: https://github.com/rust-lang/rustup/pull/3985 [pr#4028]: https://github.com/rust-lang/rustup/pull/4028 From 1f9774462ee98d996d65d597257b7288d6bebaec Mon Sep 17 00:00:00 2001 From: rami3l Date: Mon, 2 Dec 2024 10:31:41 +0800 Subject: [PATCH 04/10] Apply clippy suggestions --- src/cli/self_update.rs | 6 +++--- src/cli/self_update/unix.rs | 2 +- src/cli/self_update/windows.rs | 6 +++--- src/config.rs | 2 +- src/diskio/threaded.rs | 10 +++++----- src/dist/component/package.rs | 8 ++++---- src/dist/component/transaction.rs | 2 +- src/dist/manifestation.rs | 2 +- src/dist/mod.rs | 2 +- src/dist/notifications.rs | 4 ++-- src/dist/temp.rs | 12 ++++++------ src/install.rs | 2 +- src/notifications.rs | 4 ++-- src/utils/mod.rs | 6 +++--- src/utils/notifications.rs | 4 ++-- 15 files changed, 36 insertions(+), 36 deletions(-) diff --git a/src/cli/self_update.rs b/src/cli/self_update.rs index ab77d6d277..bf43ffb004 100644 --- a/src/cli/self_update.rs +++ b/src/cli/self_update.rs @@ -98,7 +98,7 @@ pub(crate) struct InstallOpts<'a> { pub targets: &'a [&'a str], } -impl<'a> InstallOpts<'a> { +impl InstallOpts<'_> { fn install(self, cfg: &mut Cfg<'_>) -> Result> { let Self { default_host_triple, @@ -508,9 +508,9 @@ pub(crate) async fn install( ) })?; - if !process + if process .var_os("RUSTUP_INIT_SKIP_EXISTENCE_CHECKS") - .map_or(false, |s| s == "yes") + .is_none_or(|s| s != "yes") { check_existence_of_rustc_or_cargo_in_path(no_prompt, process)?; check_existence_of_settings_file(process)?; diff --git a/src/cli/self_update/unix.rs b/src/cli/self_update/unix.rs index 4d29ded00e..7951d15fc2 100644 --- a/src/cli/self_update/unix.rs +++ b/src/cli/self_update/unix.rs @@ -18,7 +18,7 @@ pub(crate) fn do_anti_sudo_check(no_prompt: bool, process: &Process) -> Result) -> Result<()> { HWND_BROADCAST, WM_SETTINGCHANGE, 0 as WPARAM, - "Environment\0".as_ptr() as LPARAM, + c"Environment".as_ptr() as LPARAM, SMTO_ABORTIFHUNG, 5000, ptr::null_mut(), @@ -774,7 +774,7 @@ pub struct RegistryGuard<'a> { } #[cfg(any(test, feature = "test"))] -impl<'a> RegistryGuard<'a> { +impl RegistryGuard<'_> { pub fn new(id: &'static RegistryValueId) -> Result { Ok(Self { _locked: REGISTRY_LOCK.lock(), @@ -785,7 +785,7 @@ impl<'a> RegistryGuard<'a> { } #[cfg(any(test, feature = "test"))] -impl<'a> Drop for RegistryGuard<'a> { +impl Drop for RegistryGuard<'_> { fn drop(&mut self) { self.id.set(self.prev.as_ref()).unwrap(); } diff --git a/src/config.rs b/src/config.rs index 009fe136b6..b9ae7b6e7e 100644 --- a/src/config.rs +++ b/src/config.rs @@ -982,7 +982,7 @@ pub(crate) fn dist_root_server(process: &Process) -> Result { }) } -impl<'a> Debug for Cfg<'a> { +impl Debug for Cfg<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let Self { profile_override, diff --git a/src/diskio/threaded.rs b/src/diskio/threaded.rs index 27ce9eca74..032e99eae3 100644 --- a/src/diskio/threaded.rs +++ b/src/diskio/threaded.rs @@ -234,7 +234,7 @@ impl<'a> Threaded<'a> { } } -impl<'a> Executor for Threaded<'a> { +impl Executor for Threaded<'_> { fn dispatch(&self, item: Item) -> Box + '_> { // Yield any completed work before accepting new work - keep memory // pressure under control @@ -351,7 +351,7 @@ impl<'a> Executor for Threaded<'a> { } } -impl<'a> Drop for Threaded<'a> { +impl Drop for Threaded<'_> { fn drop(&mut self) { // We are not permitted to fail - consume but do not handle the items. self.join().for_each(drop); @@ -363,7 +363,7 @@ struct JoinIterator<'a, 'b> { consume_sentinel: bool, } -impl<'a, 'b> JoinIterator<'a, 'b> { +impl JoinIterator<'_, '_> { fn inner>(&self, mut iter: T) -> Option { loop { let task_o = iter.next(); @@ -387,7 +387,7 @@ impl<'a, 'b> JoinIterator<'a, 'b> { } } -impl<'a, 'b> Iterator for JoinIterator<'a, 'b> { +impl Iterator for JoinIterator<'_, '_> { type Item = CompletedIo; fn next(&mut self) -> Option { @@ -404,7 +404,7 @@ struct SubmitIterator<'a, 'b> { item: Cell>, } -impl<'a, 'b> Iterator for SubmitIterator<'a, 'b> { +impl Iterator for SubmitIterator<'_, '_> { type Item = CompletedIo; fn next(&mut self) -> Option { diff --git a/src/dist/component/package.rs b/src/dist/component/package.rs index 02646829ec..bfa981b00d 100644 --- a/src/dist/component/package.rs +++ b/src/dist/component/package.rs @@ -533,7 +533,7 @@ fn unpack_without_first_dir( Ok(()) } -impl<'a> Package for TarPackage<'a> { +impl Package for TarPackage<'_> { fn contains(&self, component: &str, short_name: Option<&str>) -> bool { self.0.contains(component, short_name) } @@ -571,7 +571,7 @@ impl<'a> TarGzPackage<'a> { } } -impl<'a> Package for TarGzPackage<'a> { +impl Package for TarGzPackage<'_> { fn contains(&self, component: &str, short_name: Option<&str>) -> bool { self.0.contains(component, short_name) } @@ -609,7 +609,7 @@ impl<'a> TarXzPackage<'a> { } } -impl<'a> Package for TarXzPackage<'a> { +impl Package for TarXzPackage<'_> { fn contains(&self, component: &str, short_name: Option<&str>) -> bool { self.0.contains(component, short_name) } @@ -647,7 +647,7 @@ impl<'a> TarZStdPackage<'a> { } } -impl<'a> Package for TarZStdPackage<'a> { +impl Package for TarZStdPackage<'_> { fn contains(&self, component: &str, short_name: Option<&str>) -> bool { self.0.contains(component, short_name) } diff --git a/src/dist/component/transaction.rs b/src/dist/component/transaction.rs index 4a1aaa1bc5..80e3de57b9 100644 --- a/src/dist/component/transaction.rs +++ b/src/dist/component/transaction.rs @@ -198,7 +198,7 @@ impl<'a> Transaction<'a> { /// If a Transaction is dropped without being committed, the changes /// are automatically rolled back. -impl<'a> Drop for Transaction<'a> { +impl Drop for Transaction<'_> { fn drop(&mut self) { if !self.committed { (self.notify_handler)(Notification::RollingBack); diff --git a/src/dist/manifestation.rs b/src/dist/manifestation.rs index cad1c36981..62e7a4b33a 100644 --- a/src/dist/manifestation.rs +++ b/src/dist/manifestation.rs @@ -90,7 +90,7 @@ impl Manifestation { /// may be either a freshly-downloaded one, or the same one used /// for the previous install), as well as lists of extension /// components to add and remove. - + /// /// From that it schedules a list of components to install and /// to uninstall to bring the installation up to date. It /// downloads the components' packages. Then in a Transaction diff --git a/src/dist/mod.rs b/src/dist/mod.rs index 3b8b6a5707..4f93ccddff 100644 --- a/src/dist/mod.rs +++ b/src/dist/mod.rs @@ -396,7 +396,7 @@ impl TargetTriple { let mut ret: libc::c_int = 0; let mut size = std::mem::size_of::() as libc::size_t; let err = libc::sysctlbyname( - b"sysctl.proc_translated\0".as_ptr().cast(), + c"sysctl.proc_translated".as_ptr().cast(), (&mut ret) as *mut _ as *mut libc::c_void, &mut size, std::ptr::null_mut(), diff --git a/src/dist/notifications.rs b/src/dist/notifications.rs index fa901bc1eb..bd7ec6e422 100644 --- a/src/dist/notifications.rs +++ b/src/dist/notifications.rs @@ -50,7 +50,7 @@ impl<'a> From> for Notification<'a> { } } -impl<'a> Notification<'a> { +impl Notification<'_> { pub(crate) fn level(&self) -> NotificationLevel { use self::Notification::*; match self { @@ -84,7 +84,7 @@ impl<'a> Notification<'a> { } } -impl<'a> Display for Notification<'a> { +impl Display for Notification<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::result::Result<(), fmt::Error> { use self::Notification::*; match self { diff --git a/src/dist/temp.rs b/src/dist/temp.rs index a87eeafb22..72b3677a42 100644 --- a/src/dist/temp.rs +++ b/src/dist/temp.rs @@ -25,7 +25,7 @@ pub(crate) struct Dir<'a> { path: PathBuf, } -impl<'a> ops::Deref for Dir<'a> { +impl ops::Deref for Dir<'_> { type Target = Path; fn deref(&self) -> &Path { @@ -33,7 +33,7 @@ impl<'a> ops::Deref for Dir<'a> { } } -impl<'a> Drop for Dir<'a> { +impl Drop for Dir<'_> { fn drop(&mut self) { if raw::is_directory(&self.path) { let n = Notification::DirectoryDeletion( @@ -51,7 +51,7 @@ pub struct File<'a> { path: PathBuf, } -impl<'a> ops::Deref for File<'a> { +impl ops::Deref for File<'_> { type Target = Path; fn deref(&self) -> &Path { @@ -59,7 +59,7 @@ impl<'a> ops::Deref for File<'a> { } } -impl<'a> Drop for File<'a> { +impl Drop for File<'_> { fn drop(&mut self) { if raw::is_file(&self.path) { let n = Notification::FileDeletion(&self.path, fs::remove_file(&self.path)); @@ -77,7 +77,7 @@ pub enum Notification<'a> { DirectoryDeletion(&'a Path, io::Result<()>), } -impl<'a> Notification<'a> { +impl Notification<'_> { pub(crate) fn level(&self) -> NotificationLevel { use self::Notification::*; match self { @@ -93,7 +93,7 @@ impl<'a> Notification<'a> { } } -impl<'a> Display for Notification<'a> { +impl Display for Notification<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::result::Result<(), fmt::Error> { use self::Notification::*; match self { diff --git a/src/install.rs b/src/install.rs index eb9c1c39c5..35f26dc5e1 100644 --- a/src/install.rs +++ b/src/install.rs @@ -35,7 +35,7 @@ pub(crate) enum InstallMethod<'a> { Dist(DistOptions<'a>), } -impl<'a> InstallMethod<'a> { +impl InstallMethod<'_> { // Install a toolchain #[tracing::instrument(level = "trace", err(level = "trace"), skip_all)] pub(crate) async fn install(&self) -> Result { diff --git a/src/notifications.rs b/src/notifications.rs index fe90f067fe..12db560660 100644 --- a/src/notifications.rs +++ b/src/notifications.rs @@ -55,7 +55,7 @@ impl<'a> From> for Notification<'a> { } } -impl<'a> Notification<'a> { +impl Notification<'_> { pub(crate) fn level(&self) -> NotificationLevel { use self::Notification::*; match self { @@ -84,7 +84,7 @@ impl<'a> Notification<'a> { } } -impl<'a> Display for Notification<'a> { +impl Display for Notification<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::result::Result<(), fmt::Error> { use self::Notification::*; match self { diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 9fb3db6b79..dae45d4b73 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -247,10 +247,10 @@ async fn download_file_( // Keep the curl env var around for a bit let use_curl_backend = process .var_os("RUSTUP_USE_CURL") - .map_or(false, |it| it != "0"); + .is_some_and(|it| it != "0"); let use_rustls = process .var_os("RUSTUP_USE_RUSTLS") - .map_or(true, |it| it != "0"); + .is_none_or(|it| it != "0"); let (backend, notification) = if use_curl_backend { (Backend::Curl, Notification::UsingCurl) } else { @@ -648,7 +648,7 @@ impl<'a> FileReaderWithProgress<'a> { } } -impl<'a> io::Read for FileReaderWithProgress<'a> { +impl io::Read for FileReaderWithProgress<'_> { fn read(&mut self, buf: &mut [u8]) -> io::Result { match self.fh.read(buf) { Ok(nbytes) => { diff --git a/src/utils/notifications.rs b/src/utils/notifications.rs index 1e74e11637..007bd39834 100644 --- a/src/utils/notifications.rs +++ b/src/utils/notifications.rs @@ -42,7 +42,7 @@ pub enum Notification<'a> { RenameInUse(&'a Path, &'a Path), } -impl<'a> Notification<'a> { +impl Notification<'_> { pub(crate) fn level(&self) -> NotificationLevel { use self::Notification::*; match self { @@ -67,7 +67,7 @@ impl<'a> Notification<'a> { } } -impl<'a> Display for Notification<'a> { +impl Display for Notification<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> std::result::Result<(), fmt::Error> { use self::Notification::*; match self { From db0fb8219b9a3835d70f2a9ce7db4d92a7a36ce2 Mon Sep 17 00:00:00 2001 From: Rustin170506 Date: Tue, 19 Nov 2024 20:48:35 +0800 Subject: [PATCH 05/10] chore: remove the old pitch first Signed-off-by: Rustin170506 --- www/index.html | 6 ------ www/rustup.css | 14 -------------- 2 files changed, 20 deletions(-) diff --git a/www/index.html b/www/index.html index a6df3fcaf5..134dbf301b 100644 --- a/www/index.html +++ b/www/index.html @@ -19,12 +19,6 @@ click or press "n" to cycle platforms -

- rustup is an installer for
- the systems programming language - Rust -

- -

+

Need help?
Ask on #beginners in the Rust Discord
or in the Rust Users Forum.

@@ -232,6 +239,7 @@  ·  about rustup

+ diff --git a/www/rustup.css b/www/rustup.css index 94319a8f50..57cdea10b7 100644 --- a/www/rustup.css +++ b/www/rustup.css @@ -31,6 +31,15 @@ src: local('Work Sans Medium'), url("fonts/WorkSans-Medium.ttf") format('truetype'); } +@font-face { + font-family: 'Alfa Slab One'; + font-style: normal; + font-weight: 400; + src: local('Alfa Slab One'), + url("fonts/AlfaSlabOne-Regular.woff2") format('woff2'), + url("fonts/AlfaSlabOne-Regular.woff") format('woff'); +} + body { margin-top: 2em; background-color: white; @@ -45,6 +54,29 @@ pre { font-weight: 400; } +header > div { + display: flex; + flex-direction: column; + align-items: flex-start; +} + +header > div > h1 { + font-family: "Alfa Slab One", serif; + color: black; + font-size: 4rem; + margin-bottom: 0; + margin-top: 1rem; + line-height: 1; + font-weight: 300; + letter-spacing: 1px; +} + +header > div > h2 { + color: black; + font-size: 2rem; + font-weight: 300; +} + a { color: #428bca; text-decoration: none; @@ -54,11 +86,12 @@ a:hover { color: rgb(42, 100, 150); } -body#idx > * { +main { + width: 80%; + max-width: 1200px; + padding: 0 20px; margin-left: auto; margin-right: auto; - text-align: center; - width: 35em; } body#idx p { @@ -195,9 +228,15 @@ hr { line-height: 2rem; } +#help { + font-size: 20px; + text-align: center; +} + #about { font-size: 16px; line-height: 2em; + text-align: center; } #about > img { From bcff94dc6cf545604fd2f83bc7e7742e7c1539a9 Mon Sep 17 00:00:00 2001 From: Rustin170506 Date: Tue, 19 Nov 2024 20:58:28 +0800 Subject: [PATCH 07/10] feat: use the color form the rust website for tags, hr and copy button Signed-off-by: Rustin170506 --- www/rustup.css | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/www/rustup.css b/www/rustup.css index 57cdea10b7..cbeb626a91 100644 --- a/www/rustup.css +++ b/www/rustup.css @@ -78,12 +78,13 @@ header > div > h2 { } a { - color: #428bca; - text-decoration: none; + color: #0b7261; + text-decoration: underline; } a:hover { - color: rgb(42, 100, 150); + color: #0d8b75; + text-decoration: underline; } main { @@ -120,6 +121,7 @@ body#idx p.other-platforms-help { } hr { + border-color: #0b7261; margin-top: 2em; margin-bottom: 2em; } @@ -202,7 +204,7 @@ hr { transition: opacity 0.2s ease-in-out; opacity: 0; font-size: 10px; - color: green; + color: #0b7261; width: 41px; height: 15px; position: relative; From f7225aa8f153c710b4e0820afc27a4f6e48c65c3 Mon Sep 17 00:00:00 2001 From: Rustin170506 Date: Tue, 19 Nov 2024 21:01:49 +0800 Subject: [PATCH 08/10] feat: make the box white Signed-off-by: Rustin170506 --- www/rustup.css | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/www/rustup.css b/www/rustup.css index cbeb626a91..d0f4a04b76 100644 --- a/www/rustup.css +++ b/www/rustup.css @@ -105,7 +105,6 @@ body#idx p.other-platforms-help { } .instructions { - background-color: rgb(250, 250, 250); margin-left: auto; margin-right: auto; text-align: center; @@ -136,20 +135,19 @@ hr { } .rustup-command::before { - color: #999; + color: black; content: " $ "; margin-left: 15px; } .rustup-command { - background-color: #515151; - color: white; + color: black; padding: 1rem 1rem 1rem 0; width: 45rem; height: auto; text-align: center; border-radius: 3px 0 0 3px; - box-shadow: inset 0px 0px 20px 0px #333333; + box-shadow: inset 0px 0px 20px 0px #f1eeee; overflow: hidden; font-size: 0.6em; white-space: nowrap; From 14470b2b14c10e1578d0d343c4a4f8445cd96a0f Mon Sep 17 00:00:00 2001 From: Rustin170506 Date: Tue, 19 Nov 2024 21:03:38 +0800 Subject: [PATCH 09/10] fix: make sure no overflow on small screens Signed-off-by: Rustin170506 --- www/index.html | 4 ---- www/rustup.css | 7 ++++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/www/index.html b/www/index.html index ea9a486fd7..ebe37d9e06 100644 --- a/www/index.html +++ b/www/index.html @@ -129,7 +129,6 @@

An installer for the systems programming language 
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
@@ -142,7 +141,6 @@

An installer for the systems programming language Copied! -
@@ -177,7 +175,6 @@

An installer for the systems programming language - -
diff --git a/www/rustup.css b/www/rustup.css index d0f4a04b76..36f05e40fd 100644 --- a/www/rustup.css +++ b/www/rustup.css @@ -114,7 +114,6 @@ body#idx p.other-platforms-help { } .instructions > * { - width: 45rem; margin-left: auto; margin-right: auto; } @@ -131,7 +130,7 @@ hr { #platform-instructions-win-arm64 > p, #platform-instructions-default > p, #platform-instructions-unknown > p { - width: 40rem; + width: 80%; } .rustup-command::before { @@ -143,7 +142,6 @@ hr { .rustup-command { color: black; padding: 1rem 1rem 1rem 0; - width: 45rem; height: auto; text-align: center; border-radius: 3px 0 0 3px; @@ -153,6 +151,7 @@ hr { white-space: nowrap; height: 26px; line-height: 26px; + overflow-x: auto; } #platform-instructions-unix div.copy-container, @@ -163,6 +162,8 @@ hr { #platform-instructions-unknown div.copy-container { display: flex; align-items: center; + width: 90%; + justify-content: center; } #platform-instructions-unix button.copy-button, From fe906c97d32c98ea2668e9339d0ebc868b23f0a4 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Fri, 6 Dec 2024 11:36:43 +0100 Subject: [PATCH 10/10] Update semver-compatible dependencies --- Cargo.lock | 189 ++++++++++++++++++++++++------------------------- src/cli/log.rs | 9 +-- 2 files changed, 97 insertions(+), 101 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c0fb694f3f..fde575b720 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -86,9 +86,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "as-slice" @@ -340,15 +340,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac0150caa2ae65ca5bd83f25c7de183dea78d4d366469f148435e2acfbad0da" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cc" -version = "1.2.1" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd9de9f2205d5ef3fd67e685b0df337994ddd4495e2a28d185500d0e1edfea47" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" dependencies = [ "jobserver", "libc", @@ -410,9 +410,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f" +checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84" dependencies = [ "clap_builder", "clap_derive", @@ -420,9 +420,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.21" +version = "4.5.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec" +checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838" dependencies = [ "anstream", "anstyle", @@ -454,15 +454,15 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afb84c814227b90d6895e01398aee0d8033c00e7466aca416fb6a8e0eb19d8a7" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "cmake" -version = "0.1.51" +version = "0.1.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb1e43aa7fd152b1f968787f7dbcdeb306d1867ff373c69955211876c053f91a" +checksum = "c682c223677e0e5b6b7f63a64b9351844c3f1b1678a68b7ee617e30fb082620e" dependencies = [ "cc", ] @@ -655,7 +655,7 @@ dependencies = [ "rustls", "rustls-platform-verifier", "tempfile", - "thiserror 2.0.3", + "thiserror 2.0.4", "tokio", "tokio-stream", "url", @@ -724,12 +724,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -912,18 +912,18 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "git-testament" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "710c78d2b68e46e62f5ba63ba0a7a2986640f37f9ecc07903b9ad4e7b2dbfc8e" +checksum = "5a74999c921479f919c87a9d2e6922a79a18683f18105344df8e067149232e51" dependencies = [ "git-testament-derive", ] [[package]] name = "git-testament-derive" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b31494efbbe1a6730f6943759c21b92c8dc431cb4df177e6f2a6429c3c96842" +checksum = "bbeac967e71eb3dc1656742fc7521ec7cd3b6b88738face65bf1fddf702bc4c0" dependencies = [ "log", "proc-macro2", @@ -950,7 +950,7 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap 2.6.0", + "indexmap 2.7.0", "slab", "tokio", "tokio-util", @@ -992,9 +992,9 @@ dependencies = [ [[package]] name = "http" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea" dependencies = [ "bytes", "fnv", @@ -1289,9 +1289,9 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", "hashbrown 0.15.2", @@ -1329,9 +1329,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.13" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "540654e97a3f4470a492cd30ff187bc95d89557a903a2bbf112e2fae98104ef2" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jni" @@ -1364,10 +1364,11 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -1385,9 +1386,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55" [[package]] name = "libc" -version = "0.2.164" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libdbus-sys" @@ -1401,9 +1402,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if 1.0.0", "windows-targets", @@ -1511,11 +1512,10 @@ dependencies = [ [[package]] name = "mio" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec" +checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" dependencies = [ - "hermit-abi", "libc", "wasi", "windows-sys 0.52.0", @@ -1713,16 +1713,16 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f3cebff57f7dbd1255b44d8bddc2cebeb0ea677dbaa2e25a3070a91b318f660" +checksum = "ab70038c28ed37b97d8ed414b6429d343a8bbf44c9f79ec854f3a643029ba6d7" dependencies = [ "futures-core", "futures-sink", "js-sys", - "once_cell", "pin-project-lite", "thiserror 1.0.69", + "tracing", ] [[package]] @@ -1758,16 +1758,15 @@ dependencies = [ [[package]] name = "opentelemetry_sdk" -version = "0.27.0" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b742c1cae4693792cc564e58d75a2a0ba29421a34a85b50da92efa89ecb2bc" +checksum = "231e9d6ceef9b0b2546ddf52335785ce41252bc7474ee8ba05bfad277be13ab8" dependencies = [ "async-trait", "futures-channel", "futures-executor", "futures-util", "glob", - "once_cell", "opentelemetry", "percent-encoding", "rand", @@ -2189,9 +2188,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.18" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9cc1d47e243d655ace55ed38201c19ae02c148ae56412ab8750e8f0166ab7f" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "aws-lc-rs", "log", @@ -2311,7 +2310,7 @@ dependencies = [ "tar", "tempfile", "termcolor", - "thiserror 2.0.3", + "thiserror 2.0.4", "threadpool", "tokio", "tokio-retry", @@ -2542,9 +2541,9 @@ dependencies = [ [[package]] name = "socket2" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8" dependencies = [ "libc", "windows-sys 0.52.0", @@ -2576,9 +2575,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.89" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -2656,9 +2655,9 @@ dependencies = [ [[package]] name = "terminal_size" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef" +checksum = "5352447f921fda68cf61b4101566c0bdb5104eff6804d0678e5227580ab6a4e9" dependencies = [ "rustix", "windows-sys 0.59.0", @@ -2675,11 +2674,11 @@ dependencies = [ [[package]] name = "thiserror" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa" +checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" dependencies = [ - "thiserror-impl 2.0.3", + "thiserror-impl 2.0.4", ] [[package]] @@ -2695,9 +2694,9 @@ dependencies = [ [[package]] name = "thiserror-impl" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568" +checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" dependencies = [ "proc-macro2", "quote", @@ -2725,9 +2724,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.36" +version = "0.3.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" +checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21" dependencies = [ "deranged", "itoa", @@ -2746,9 +2745,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de" dependencies = [ "num-conv", "time-core", @@ -2766,9 +2765,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", @@ -2814,12 +2813,11 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.26.0" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37" dependencies = [ "rustls", - "rustls-pki-types", "tokio", ] @@ -2837,9 +2835,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.16" +version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1" +checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047" dependencies = [ "futures-core", "pin-project-lite", @@ -2848,9 +2846,9 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.12" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a" +checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078" dependencies = [ "bytes", "futures-core", @@ -2886,7 +2884,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.6.0", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -2971,9 +2969,9 @@ checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" [[package]] name = "tracing" -version = "0.1.40" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" +checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ "pin-project-lite", "tracing-attributes", @@ -2982,9 +2980,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" dependencies = [ "proc-macro2", "quote", @@ -2993,9 +2991,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.32" +version = "0.1.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" +checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" dependencies = [ "once_cell", "valuable", @@ -3032,9 +3030,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.18" +version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" dependencies = [ "matchers", "nu-ansi-term", @@ -3185,9 +3183,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" dependencies = [ "cfg-if 1.0.0", "once_cell", @@ -3196,9 +3194,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" dependencies = [ "bumpalo", "log", @@ -3211,21 +3209,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d" dependencies = [ "cfg-if 1.0.0", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3233,9 +3232,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" dependencies = [ "proc-macro2", "quote", @@ -3246,9 +3245,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" [[package]] name = "wasm-streams" @@ -3265,9 +3264,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" dependencies = [ "js-sys", "wasm-bindgen", diff --git a/src/cli/log.rs b/src/cli/log.rs index e307bfe8c6..1bd8139f29 100644 --- a/src/cli/log.rs +++ b/src/cli/log.rs @@ -156,7 +156,7 @@ fn telemetry_default_tracer() -> Tracer { use opentelemetry_otlp::WithExportConfig; use opentelemetry_sdk::{ runtime::Tokio, - trace::{Config, Sampler, TracerProvider}, + trace::{Sampler, TracerProvider}, Resource, }; @@ -167,11 +167,8 @@ fn telemetry_default_tracer() -> Tracer { .unwrap(); let provider = TracerProvider::builder() - .with_config( - Config::default() - .with_sampler(Sampler::AlwaysOn) - .with_resource(Resource::new(vec![KeyValue::new("service.name", "rustup")])), - ) + .with_sampler(Sampler::AlwaysOn) + .with_resource(Resource::new(vec![KeyValue::new("service.name", "rustup")])) .with_batch_exporter(exporter, Tokio) .build();