From 30e62589c78214c344d7844b62c8d9b557475a78 Mon Sep 17 00:00:00 2001
From: Brooks Townsend <brooksmtownsend@gmail.com>
Date: Mon, 28 Oct 2024 09:01:15 -0400
Subject: [PATCH] fix: support wasm32-wasip2 on stable channel (#983)

Signed-off-by: Brooks Townsend <brooksmtownsend@gmail.com>
---
 url/src/lib.rs | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/url/src/lib.rs b/url/src/lib.rs
index 6e4de1d5..c40a9ea3 100644
--- a/url/src/lib.rs
+++ b/url/src/lib.rs
@@ -148,9 +148,6 @@ url = { version = "2", features = ["debugger_visualizer"] }
     feature = "debugger_visualizer",
     debugger_visualizer(natvis_file = "../../debug_metadata/url.natvis")
 )]
-// We use std::os::wasi::prelude::OsStrExt, and that is conditionally feature gated
-// to be unstable on wasm32-wasip2. https://github.com/rust-lang/rust/issues/130323
-#![cfg_attr(all(target_os = "wasi", target_env = "p2"), feature(wasip2))]
 
 pub use form_urlencoded;
 
@@ -2985,8 +2982,6 @@ fn path_to_file_url_segments(
     use std::os::hermit::ffi::OsStrExt;
     #[cfg(any(unix, target_os = "redox"))]
     use std::os::unix::prelude::OsStrExt;
-    #[cfg(target_os = "wasi")]
-    use std::os::wasi::prelude::OsStrExt;
     if !path.is_absolute() {
         return Err(());
     }
@@ -2996,10 +2991,16 @@ fn path_to_file_url_segments(
     for component in path.components().skip(1) {
         empty = false;
         serialization.push('/');
+        #[cfg(not(target_os = "wasi"))]
         serialization.extend(percent_encode(
             component.as_os_str().as_bytes(),
             SPECIAL_PATH_SEGMENT,
         ));
+        #[cfg(target_os = "wasi")]
+        serialization.extend(percent_encode(
+            component.as_os_str().to_string_lossy().as_bytes(),
+            SPECIAL_PATH_SEGMENT,
+        ));
     }
     if empty {
         // An URL’s path must not be empty.
@@ -3093,13 +3094,12 @@ fn file_url_segments_to_pathbuf(
 ) -> Result<PathBuf, ()> {
     use alloc::vec::Vec;
     use percent_encoding::percent_decode;
+    #[cfg(not(target_os = "wasi"))]
     use std::ffi::OsStr;
     #[cfg(target_os = "hermit")]
     use std::os::hermit::ffi::OsStrExt;
     #[cfg(any(unix, target_os = "redox"))]
     use std::os::unix::prelude::OsStrExt;
-    #[cfg(target_os = "wasi")]
-    use std::os::wasi::prelude::OsStrExt;
     use std::path::PathBuf;
 
     if host.is_some() {
@@ -3125,8 +3125,12 @@ fn file_url_segments_to_pathbuf(
         bytes.push(b'/');
     }
 
-    let os_str = OsStr::from_bytes(&bytes);
-    let path = PathBuf::from(os_str);
+    #[cfg(not(target_os = "wasi"))]
+    let path = PathBuf::from(OsStr::from_bytes(&bytes));
+    #[cfg(target_os = "wasi")]
+    let path = String::from_utf8(bytes)
+        .map(|path| PathBuf::from(path))
+        .map_err(|_| ())?;
 
     debug_assert!(
         path.is_absolute(),