Auto merge of #164940 - JonathanBrouwer:rollup-rCORLRu, r=JonathanBrouwer

Rollup of 6 pull requests

Successful merges:

 - #164617 (tools: remote-test-server: Fix UEFI crash return code)
 - #164549 (feat!: change return type of `TryFromIntError::kind`)
 - #164893 (Add diagnostic items for env::vars / env::vars_os)
 - #164897 (Add regression test for CoerceShared impl with unnormalizable target)
 - #164908 (Add regression test for self referential inherent associated type ICE)
 - #164925 (Cleanup `rustdoc-html` tests)

Author: bors

library/core/src/num/error.rs

@@ -12,8 +12,8 @@ impl TryFromIntError {
     /// Outputs the detailed cause of converting an integer failing.
     #[must_use]
     #[unstable(feature = "try_from_int_error_kind", issue = "153978")]
-    pub const fn kind(&self) -> &IntErrorKind {
-        &self.0
+    pub const fn kind(&self) -> IntErrorKind {
+        self.0
     }
 }
 

library/coretests/tests/nonzero.rs

@@ -285,11 +285,11 @@ fn test_nonzero_from_int_on_success() {
 
 #[test]
 fn test_nonzero_from_int_on_err() {
-    assert_eq!(NonZero::<u8>::try_from(0).unwrap_err().kind(), &IntErrorKind::Zero);
-    assert_eq!(NonZero::<u32>::try_from(0).unwrap_err().kind(), &IntErrorKind::Zero);
+    assert_eq!(NonZero::<u8>::try_from(0).unwrap_err().kind(), IntErrorKind::Zero);
+    assert_eq!(NonZero::<u32>::try_from(0).unwrap_err().kind(), IntErrorKind::Zero);
 
-    assert_eq!(NonZero::<i8>::try_from(0).unwrap_err().kind(), &IntErrorKind::Zero);
-    assert_eq!(NonZero::<i32>::try_from(0).unwrap_err().kind(), &IntErrorKind::Zero);
+    assert_eq!(NonZero::<i8>::try_from(0).unwrap_err().kind(), IntErrorKind::Zero);
+    assert_eq!(NonZero::<i32>::try_from(0).unwrap_err().kind(), IntErrorKind::Zero);
 }
 
 #[test]

library/coretests/tests/num/mod.rs

@@ -388,17 +388,14 @@ macro_rules! test_impl_try_from_integer_to_bool {
             let zero: $source = 0;
             let one: $source = 1;
             let two: $source = 2;
-            assert_eq!(bool::try_from(max).unwrap_err().kind(), &IntErrorKind::PosOverflow);
+            assert_eq!(bool::try_from(max).unwrap_err().kind(), IntErrorKind::PosOverflow);
             if min != 0 {
-                assert_eq!(bool::try_from(min).unwrap_err().kind(), &IntErrorKind::NegOverflow);
-                assert_eq!(
-                    bool::try_from(zero - 1).unwrap_err().kind(),
-                    &IntErrorKind::NegOverflow
-                );
+                assert_eq!(bool::try_from(min).unwrap_err().kind(), IntErrorKind::NegOverflow);
+                assert_eq!(bool::try_from(zero - 1).unwrap_err().kind(), IntErrorKind::NegOverflow);
             }
             assert_eq!(bool::try_from(zero).unwrap(), false);
             assert_eq!(bool::try_from(one).unwrap(), true);
-            assert_eq!(bool::try_from(two).unwrap_err().kind(), &IntErrorKind::PosOverflow);
+            assert_eq!(bool::try_from(two).unwrap_err().kind(), IntErrorKind::PosOverflow);
         }
     };
 }
@@ -540,12 +537,12 @@ macro_rules! test_impl_try_from_signed_to_unsigned_upper_ok {
             assert_eq!(<$target as TryFrom<$source>>::try_from(max).unwrap(), max as $target);
             assert_eq!(
                 <$target as TryFrom<$source>>::try_from(min).unwrap_err().kind(),
-                &IntErrorKind::NegOverflow
+                IntErrorKind::NegOverflow
             );
             assert_eq!(<$target as TryFrom<$source>>::try_from(zero).unwrap(), zero as $target);
             assert_eq!(
                 <$target as TryFrom<$source>>::try_from(neg_one).unwrap_err().kind(),
-                &IntErrorKind::NegOverflow
+                IntErrorKind::NegOverflow
             );
         }
     };
@@ -609,7 +606,7 @@ macro_rules! test_impl_try_from_unsigned_to_signed_upper_err {
             let zero: $source = 0;
             assert_eq!(
                 <$target as TryFrom<$source>>::try_from(max).unwrap_err().kind(),
-                &IntErrorKind::PosOverflow
+                IntErrorKind::PosOverflow
             );
             assert_eq!(<$target as TryFrom<$source>>::try_from(min).unwrap(), min as $target);
             assert_eq!(<$target as TryFrom<$source>>::try_from(zero).unwrap(), zero as $target);
@@ -675,12 +672,12 @@ macro_rules! test_impl_try_from_same_sign_err {
             let t_min = <$target>::MIN;
             assert_eq!(
                 <$target as TryFrom<$source>>::try_from(max).unwrap_err().kind(),
-                &IntErrorKind::PosOverflow
+                IntErrorKind::PosOverflow
             );
             if min != 0 {
                 assert_eq!(
                     <$target as TryFrom<$source>>::try_from(min).unwrap_err().kind(),
-                    &IntErrorKind::NegOverflow
+                    IntErrorKind::NegOverflow
                 );
             }
             assert_eq!(<$target as TryFrom<$source>>::try_from(zero).unwrap(), zero as $target);
@@ -770,11 +767,11 @@ macro_rules! test_impl_try_from_signed_to_unsigned_err {
             let t_min = <$target>::MIN;
             assert_eq!(
                 <$target as TryFrom<$source>>::try_from(max).unwrap_err().kind(),
-                &IntErrorKind::PosOverflow
+                IntErrorKind::PosOverflow
             );
             assert_eq!(
                 <$target as TryFrom<$source>>::try_from(min).unwrap_err().kind(),
-                &IntErrorKind::NegOverflow
+                IntErrorKind::NegOverflow
             );
             assert_eq!(<$target as TryFrom<$source>>::try_from(zero).unwrap(), zero as $target);
             assert_eq!(

library/std/src/env.rs

@@ -132,6 +132,7 @@ impl !Sync for VarsOs {}
 /// [`env::vars_os()`]: vars_os
 #[must_use]
 #[stable(feature = "env", since = "1.0.0")]
+#[cfg_attr(not(test), rustc_diagnostic_item = "env_vars")]
 pub fn vars() -> Vars {
     Vars { inner: vars_os() }
 }
@@ -157,6 +158,7 @@ pub fn vars() -> Vars {
 /// ```
 #[must_use]
 #[stable(feature = "env", since = "1.0.0")]
+#[cfg_attr(not(test), rustc_diagnostic_item = "env_vars_os")]
 pub fn vars_os() -> VarsOs {
     VarsOs { inner: env_imp::env() }
 }

src/tools/remote-test-server/src/main.rs

@@ -337,7 +337,13 @@ fn get_status_code(status: &ExitStatus) -> (u8, i32) {
     }
 }
 
-#[cfg(any(windows, target_os = "motor", target_os = "uefi"))]
+#[cfg(target_os = "uefi")]
+fn get_status_code(status: &ExitStatus) -> (u8, i32) {
+    let status = status.code().unwrap();
+    if (status & i32::MIN) != 0 { (1, status & !i32::MIN) } else { (0, status) }
+}
+
+#[cfg(any(windows, target_os = "motor"))]
 fn get_status_code(status: &ExitStatus) -> (u8, i32) {
     (0, status.code().unwrap())
 }