Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 20 deletions

diff --git a/src/test/ui/env-vars.rs b/src/test/ui/env-vars.rs
deleted file mode 100644
index f5035bb2c..000000000
--- a/src/test/ui/env-vars.rs
+++ /dev/null
@@ -1,20 +0,0 @@
-// run-pass
-// ignore-wasm32-bare no env vars
-
-use std::env::*;
-
-fn main() {
-    for (k, v) in vars_os() {
-        // On Windows, the environment variable NUMBER_OF_PROCESSORS has special meaning.
-        // Unfortunately, you can get different answers, depending on whether you are
-        // enumerating all environment variables or querying a specific variable.
-        // This was causing this test to fail on machines with more than 64 processors.
-        if cfg!(target_os = "windows") && k == "NUMBER_OF_PROCESSORS" {
-            continue;
-        }
-
-        let v2 = var_os(&k);
-        assert!(v2.as_ref().map(|s| &**s) == Some(&*v),
-                "bad vars->var transition: {:?} {:?} {:?}", k, v, v2);
-    }
-}