Skip to content

Commit d6ac98b

Browse files
committed
Merge branch 'main' into idna-v1x
2 parents b235b56 + 22b8237 commit d6ac98b

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

idna/src/punycode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ fn value_to_digit(value: u32) -> char {
469469
fn huge_encode() {
470470
let mut buf = String::new();
471471
assert!(encode_into::<_, _, ExternalCaller>(
472-
std::iter::repeat('ß').take(u32::MAX as usize + 1),
472+
core::iter::repeat('ß').take(u32::MAX as usize + 1),
473473
&mut buf
474474
)
475475
.is_err());

url/src/lib.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,9 @@ url = { version = "2", features = ["debugger_visualizer"] }
139139
feature = "debugger_visualizer",
140140
debugger_visualizer(natvis_file = "../../debug_metadata/url.natvis")
141141
)]
142+
// We use std::os::wasi::prelude::OsStrExt, and that is conditionally feature gated
143+
// to be unstable on wasm32-wasip2. https://github.com/rust-lang/rust/issues/130323
144+
#![cfg_attr(all(target_os = "wasi", target_env = "p2"), feature(wasip2))]
142145

143146
pub use form_urlencoded;
144147

0 commit comments

Comments
 (0)