From 24ddcd176bd16a8d1efc62d590e322fd1b2411ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0rem=20=C3=9Cnl=C3=BC?= <betulunlu0018@gmail.com>
Date: Wed, 4 Feb 2026 22:41:23 +0300
Subject: [PATCH 1/2] trying to fix the inconsistency with #111832

---
 library/std/src/env.rs                |  3 ++
 library/std/src/sys/pal/windows/os.rs |  2 +-
 library/std/tests/path.rs             | 47 ++++++++++++++++++++++++++-
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/library/std/src/env.rs b/library/std/src/env.rs
index 1f0ced5d0fd0d..56564a251038b 100644
--- a/library/std/src/env.rs
+++ b/library/std/src/env.rs
@@ -456,6 +456,9 @@ pub struct SplitPaths<'a> {
 /// On most Unix platforms, the separator is `:` and on Windows it is `;`. This
 /// also performs unquoting on Windows.
 ///
+/// On Unix systems an empty path corresponds to the current working directory
+/// and on Windows systems an empty path is disregarded.
+///
 /// [`join_paths`] can be used to recombine elements.
 ///
 /// # Panics
diff --git a/library/std/src/sys/pal/windows/os.rs b/library/std/src/sys/pal/windows/os.rs
index 3eb6ec8278401..2638e02d02de3 100644
--- a/library/std/src/sys/pal/windows/os.rs
+++ b/library/std/src/sys/pal/windows/os.rs
@@ -45,7 +45,7 @@ impl<'a> Iterator for SplitPaths<'a> {
 
         let mut in_progress = Vec::new();
         let mut in_quote = false;
-        for b in self.data.by_ref() {
+        for b in self.data.by_ref().skip_while(|&b| b == ';' as u16) {
             if b == '"' as u16 {
                 in_quote = !in_quote;
             } else if b == ';' as u16 && !in_quote {
diff --git a/library/std/tests/path.rs b/library/std/tests/path.rs
index 4094b7acd8749..3761b9fcb7d45 100644
--- a/library/std/tests/path.rs
+++ b/library/std/tests/path.rs
@@ -9,9 +9,9 @@ use std::ffi::OsStr;
 use std::hash::{DefaultHasher, Hash, Hasher};
 use std::mem::MaybeUninit;
 use std::path::*;
-use std::ptr;
 use std::rc::Rc;
 use std::sync::Arc;
+use std::{env, ptr};
 
 #[allow(unknown_lints, unused_macro_rules)]
 macro_rules! t (
@@ -2577,3 +2577,48 @@ fn test_trim_trailing_sep() {
         assert_eq!(Path::new("c:..\\\\").trim_trailing_sep().as_os_str(), OsStr::new("c:.."));
     }
 }
+
+// Test: Empty PATH paths
+// This test checks how `split_paths` handles empty segments.
+// On Unix it should be an empty `Path` and on Windows it should disregard the segment.
+#[test]
+fn test_only_separators() {
+    use std::env::split_paths;
+    #[cfg(unix)]
+    {
+        assert_eq!(split_paths("").collect::<Vec<_>>(), vec![PathBuf::new(); 1]);
+        assert_eq!(split_paths(":").collect::<Vec<_>>(), vec![PathBuf::new(); 2]);
+        assert_eq!(split_paths("::").collect::<Vec<_>>(), vec![PathBuf::new(); 3]);
+
+        assert_eq!(
+            split_paths("a::").collect::<Vec<_>>(),
+            vec![PathBuf::from("a"), PathBuf::from(""), PathBuf::from("")]
+        );
+        assert_eq!(
+            split_paths("a::b").collect::<Vec<_>>(),
+            vec![PathBuf::from("a"), PathBuf::from(""), PathBuf::from("b")]
+        );
+        assert_eq!(
+            split_paths("::b").collect::<Vec<_>>(),
+            vec![PathBuf::from(""), PathBuf::from(""), PathBuf::from("b")]
+        );
+        assert_eq!(
+            split_paths(":a:").collect::<Vec<_>>(),
+            vec![PathBuf::from(""), PathBuf::from("a"), PathBuf::from("")]
+        );
+    }
+    #[cfg(windows)]
+    {
+        assert_eq!(split_paths("").collect::<Vec<PathBuf>>(), vec![]);
+        assert_eq!(split_paths(";").collect::<Vec<PathBuf>>(), vec![]);
+        assert_eq!(split_paths(";;").collect::<Vec<PathBuf>>(), vec![]);
+
+        assert_eq!(split_paths("a;;").collect::<Vec<_>>(), vec![PathBuf::from("a")]);
+        assert_eq!(
+            split_paths("a;;b").collect::<Vec<_>>(),
+            vec![PathBuf::from("a"), PathBuf::from("b")]
+        );
+        assert_eq!(split_paths(";;b").collect::<Vec<_>>(), vec![PathBuf::from("b")]);
+        assert_eq!(split_paths(";a;").collect::<Vec<_>>(), vec![PathBuf::from("a")]);
+    }
+}

From 8243b591fc870fe0702446889505ac75cebebda2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=B0rem=20=C3=9Cnl=C3=BC?= <betulunlu0018@gmail.com>
Date: Thu, 5 Feb 2026 00:03:04 +0300
Subject: [PATCH 2/2] fix warning

---
 library/std/tests/path.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/library/std/tests/path.rs b/library/std/tests/path.rs
index 3761b9fcb7d45..f9d3c448ec833 100644
--- a/library/std/tests/path.rs
+++ b/library/std/tests/path.rs
@@ -9,9 +9,9 @@ use std::ffi::OsStr;
 use std::hash::{DefaultHasher, Hash, Hasher};
 use std::mem::MaybeUninit;
 use std::path::*;
+use std::ptr;
 use std::rc::Rc;
 use std::sync::Arc;
-use std::{env, ptr};
 
 #[allow(unknown_lints, unused_macro_rules)]
 macro_rules! t (