From cb84df085824ea6083ae2b86734c117229ab8ffb Mon Sep 17 00:00:00 2001
From: Michal Nazarewicz <mina86@mina86.com>
Date: Thu, 25 Jan 2024 16:32:44 +0100
Subject: [PATCH] bless

---
 tests/run-make/overwrite-input/file.stderr          | 4 ++++
 tests/run-make/overwrite-input/folder.stderr        | 4 ++++
 tests/run-make/unknown-mod-stdin/unknown-mod.stderr | 4 ++++
 tests/ui/traits/issue-77982.stderr                  | 1 +
 tests/ui/try-trait/bad-interconversion.stderr       | 1 +
 5 files changed, 14 insertions(+)

diff --git a/tests/run-make/overwrite-input/file.stderr b/tests/run-make/overwrite-input/file.stderr
index c13a270b067f4..60501b7f62d40 100644
--- a/tests/run-make/overwrite-input/file.stderr
+++ b/tests/run-make/overwrite-input/file.stderr
@@ -1,3 +1,7 @@
+warning: failed to connect to jobserver from environment variable `MAKEFLAGS=" -j36 --jobserver-auth=3,4"`: cannot open file descriptor 3 from the jobserver environment variable value: Bad file descriptor (os error 9)
+  |
+  = note: the build environment is likely misconfigured
+
 warning: ignoring --out-dir flag due to -o flag
 
 error: the input file "main.rs" would be overwritten by the generated executable
diff --git a/tests/run-make/overwrite-input/folder.stderr b/tests/run-make/overwrite-input/folder.stderr
index 6e51cb812ceb1..c680826368ba2 100644
--- a/tests/run-make/overwrite-input/folder.stderr
+++ b/tests/run-make/overwrite-input/folder.stderr
@@ -1,3 +1,7 @@
+warning: failed to connect to jobserver from environment variable `MAKEFLAGS=" -j36 --jobserver-auth=3,4"`: cannot open file descriptor 3 from the jobserver environment variable value: Bad file descriptor (os error 9)
+  |
+  = note: the build environment is likely misconfigured
+
 warning: ignoring --out-dir flag due to -o flag
 
 error: the generated executable for the input file "main.rs" conflicts with the existing directory "."
diff --git a/tests/run-make/unknown-mod-stdin/unknown-mod.stderr b/tests/run-make/unknown-mod-stdin/unknown-mod.stderr
index bdbaa3817093c..a429cc8cae9ea 100644
--- a/tests/run-make/unknown-mod-stdin/unknown-mod.stderr
+++ b/tests/run-make/unknown-mod-stdin/unknown-mod.stderr
@@ -1,3 +1,7 @@
+warning: failed to connect to jobserver from environment variable `MAKEFLAGS=" -j36 --jobserver-auth=3,4"`: cannot open file descriptor 3 from the jobserver environment variable value: Bad file descriptor (os error 9)
+  |
+  = note: the build environment is likely misconfigured
+
 error[E0583]: file not found for module `unknown`
  --> <anon>:1:1
   |
diff --git a/tests/ui/traits/issue-77982.stderr b/tests/ui/traits/issue-77982.stderr
index 592cfd970c64a..b130b7620fc0d 100644
--- a/tests/ui/traits/issue-77982.stderr
+++ b/tests/ui/traits/issue-77982.stderr
@@ -44,6 +44,7 @@ LL |     let ips: Vec<_> = (0..100_000).map(|_| u32::from(0u32.into())).collect(
    |                                            type must be known at this point
    |
    = note: multiple `impl`s satisfying `u32: From<_>` found in the `core` crate:
+           - impl From<Char> for u32;
            - impl From<Ipv4Addr> for u32;
            - impl From<NonZeroU32> for u32;
            - impl From<bool> for u32;
diff --git a/tests/ui/try-trait/bad-interconversion.stderr b/tests/ui/try-trait/bad-interconversion.stderr
index 97fbbdbf8f8a8..4d046635d6442 100644
--- a/tests/ui/try-trait/bad-interconversion.stderr
+++ b/tests/ui/try-trait/bad-interconversion.stderr
@@ -12,6 +12,7 @@ LL |     Ok(Err(123_i32)?)
    = help: the following other types implement trait `From<T>`:
              <u8 as From<bool>>
              <u8 as From<NonZeroU8>>
+             <u8 as From<Char>>
    = note: required for `Result<u64, u8>` to implement `FromResidual<Result<Infallible, i32>>`
 
 error[E0277]: the `?` operator can only be used on `Result`s, not `Option`s, in a function that returns `Result`