lang/rust-nightly: Update to 1.62.0.20220409

Changes: https://github.com/rust-lang/rust/compare/4e8fb743ccbec27344b2dd42de7057f41d4ebfdd...f4a7ce997a1d7546d2b737f8b87d36907bcea2ad

4 files changed, 38 insertions, 37 deletions

diff --git a/lang/rust-nightly/Makefile b/lang/rust-nightly/Makefile
index 50b388ef8add..72cc3b06a6ff 100644
--- a/lang/rust-nightly/Makefile
+++ b/lang/rust-nightly/Makefile
@@ -1,7 +1,7 @@
 # Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org>
 
 # Run update.sh to update to the latest nightly
-PORTVERSION=	1.60.0.${NIGHTLY_DATE:C,-,,g}
+PORTVERSION=	1.62.0.${NIGHTLY_DATE:C,-,,g}
 # Always set PORTREVISION explicitly as otherwise it is inherited from lang/rust
 PORTREVISION=	0
 PKGNAMESUFFIX=	-nightly
@@ -18,8 +18,8 @@ DISTINFO_FILE=	${.CURDIR}/distinfo
 
 OPTIONS_EXCLUDE=	DOCS
 
-NIGHTLY_DATE=		2022-02-04
-BOOTSTRAPS_DATE=	2022-01-28
+NIGHTLY_DATE=		2022-04-09
+BOOTSTRAPS_DATE=	2022-04-05
 RUST_BOOTSTRAP_VERSION=	beta
 
 .include "${MASTERDIR}/Makefile"
diff --git a/lang/rust-nightly/distinfo b/lang/rust-nightly/distinfo
index 9133063f050a..6e397a600a31 100644
--- a/lang/rust-nightly/distinfo
+++ b/lang/rust-nightly/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1644044204
-SHA256 (rust/2022-02-04/rustc-nightly-src.tar.xz) = b4bc57c3ac6f4511393891d2fac8f47e7c94a85f8b22707dea7f829e8716c9ce
-SIZE (rust/2022-02-04/rustc-nightly-src.tar.xz) = 128936328
-SHA256 (rust/2022-01-28/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 3506fc1b57f8da75e93f48d00c49f4d0cdf61b459955449a87d1a7fc051c40dd
-SIZE (rust/2022-01-28/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 76199452
-SHA256 (rust/2022-01-28/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 87cdacf1caa7fb3656be04fb3b37f21541b2e8eed214bb5822c0723fe9f23067
-SIZE (rust/2022-01-28/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 26324336
-SHA256 (rust/2022-01-28/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 800ac9e61fdff1e046c8bf5708fde53a8ea96ebb9c74d1268dbb15518fa1a2cb
-SIZE (rust/2022-01-28/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6396872
+TIMESTAMP = 1649492829
+SHA256 (rust/2022-04-09/rustc-nightly-src.tar.xz) = b31ec602bf925d2af2ea242ca7d539b5e25332590d4b41da188d997cb7ce3fc3
+SIZE (rust/2022-04-09/rustc-nightly-src.tar.xz) = 136886400
+SHA256 (rust/2022-04-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 5b461322da60b08554f2557deb69485d3991abf13b75750a307c004d6547a42f
+SIZE (rust/2022-04-05/rustc-beta-x86_64-unknown-freebsd.tar.xz) = 77575576
+SHA256 (rust/2022-04-05/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = d457f1c09dd446e30e94e4bcb1e3b5fde9cc54080cbe5e0a329ee810ab07d312
+SIZE (rust/2022-04-05/rust-std-beta-x86_64-unknown-freebsd.tar.xz) = 27789452
+SHA256 (rust/2022-04-05/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 832c90d532ffcba10039f1244bf06c7121ddd3b7fd7c0d913b62fd0ad82e1dce
+SIZE (rust/2022-04-05/cargo-beta-x86_64-unknown-freebsd.tar.xz) = 6743924
diff --git a/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs b/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs
index 308bb0d4b551..992e475acf91 100644
--- a/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs
+++ b/lang/rust-nightly/files/patch-compiler_rustc__target_src_spec_i686__unknown__freebsd.rs
@@ -1,11 +1,11 @@
 --- compiler/rustc_target/src/spec/i686_unknown_freebsd.rs.orig	2021-10-17 19:23:05 UTC
 +++ compiler/rustc_target/src/spec/i686_unknown_freebsd.rs
-@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, StackProbeType, Target
+@@ -2,7 +2,7 @@ pub fn target() -> Target {
  
  pub fn target() -> Target {
      let mut base = super::freebsd_base::opts();
--    base.cpu = "pentium4".to_string();
-+    base.cpu = "pentiumpro".to_string();
+-    base.cpu = "pentium4".into();
++    base.cpu = "pentiumpro".into();
      base.max_atomic_width = Some(64);
      let pre_link_args = base.pre_link_args.entry(LinkerFlavor::Gcc).or_default();
-     pre_link_args.push("-m32".to_string());
+     pre_link_args.push("-m32".into());
diff --git a/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs b/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs
index 7e0f0f6eca4d..ee09c8d53031 100644
--- a/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs
+++ b/lang/rust-nightly/files/patch-src_tools_cargo_src_cargo_sources_git_source.rs
@@ -13,33 +13,34 @@ be stabilized first.  It will be available in Rust 1.56.
 
 --- src/tools/cargo/src/cargo/sources/git/source.rs.orig	2021-10-04 20:59:57 UTC
 +++ src/tools/cargo/src/cargo/sources/git/source.rs
-@@ -84,6 +84,9 @@ impl<'cfg> Debug for GitSource<'cfg> {
+@@ -86,6 +86,9 @@ impl<'cfg> Source for GitSource<'cfg> {
  
  impl<'cfg> Source for GitSource<'cfg> {
-     fn query(&mut self, dep: &Dependency, f: &mut dyn FnMut(Summary)) -> CargoResult<()> {
+     fn query(&mut self, dep: &Dependency, f: &mut dyn FnMut(Summary)) -> Poll<CargoResult<()>> {
 +        if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {
-+            return Ok(());
++            return Poll::Ready(Ok(()));
 +        }
-         let src = self
-             .path_source
-             .as_mut()
-@@ -92,6 +95,9 @@ impl<'cfg> Source for GitSource<'cfg> {
-     }
- 
-     fn fuzzy_query(&mut self, dep: &Dependency, f: &mut dyn FnMut(Summary)) -> CargoResult<()> {
+         if let Some(src) = self.path_source.as_mut() {
+             src.query(dep, f)
+         } else {
+@@ -98,6 +101,9 @@ impl<'cfg> Source for GitSource<'cfg> {
+         dep: &Dependency,
+         f: &mut dyn FnMut(Summary),
+     ) -> Poll<CargoResult<()>> {
 +        if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {
-+            return Ok(());
++            return Poll::Ready(Ok(()));
 +        }
-         let src = self
-             .path_source
-             .as_mut()
-@@ -112,6 +118,9 @@ impl<'cfg> Source for GitSource<'cfg> {
-     }
+         if let Some(src) = self.path_source.as_mut() {
+             src.fuzzy_query(dep, f)
+         } else {
+@@ -119,6 +125,10 @@ impl<'cfg> Source for GitSource<'cfg> {
  
-     fn update(&mut self) -> CargoResult<()> {
-+        if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {
+     fn block_until_ready(&mut self) -> CargoResult<()> {
+         if self.path_source.is_some() {
 +            return Ok(());
 +        }
-         let git_path = self.config.git_path();
-         let git_path = self.config.assert_package_cache_locked(&git_path);
-         let db_path = git_path.join("db").join(&self.ident);
++
++        if std::env::var("CARGO_FREEBSD_PORTS_SKIP_GIT_UPDATE").is_ok() {
+             return Ok(());
+         }
+