From 921e8c7985b3633922e55deefdf824d3c1c5d138 Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Mon, 29 May 2023 14:46:02 +1000
Subject: [PATCH] percent-encoding -> percent-encoding-iri

Closes #2526
---
 Cargo.lock        | 18 +++++++++---------
 rslib/Cargo.toml  |  2 +-
 rslib/src/text.rs |  8 ++++----
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d96a3f774..cd0241fc1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -113,7 +113,7 @@ dependencies = [
  "num_cpus",
  "num_enum",
  "once_cell",
- "percent-encoding 2.2.0 (git+https://github.com/ankitects/rust-url.git?rev=06a87b6c31c7e9a856a3fb058cb30b204c05b650)",
+ "percent-encoding-iri",
  "pin-project",
  "prost",
  "prost-build",
@@ -372,7 +372,7 @@ dependencies = [
  "memchr",
  "mime",
  "multer",
- "percent-encoding 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding",
  "pin-project-lite",
  "rustversion",
  "serde",
@@ -1284,7 +1284,7 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8"
 dependencies = [
- "percent-encoding 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding",
 ]
 
 [[package]]
@@ -2689,9 +2689,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e"
 
 [[package]]
-name = "percent-encoding"
+name = "percent-encoding-iri"
 version = "2.2.0"
-source = "git+https://github.com/ankitects/rust-url.git?rev=06a87b6c31c7e9a856a3fb058cb30b204c05b650#06a87b6c31c7e9a856a3fb058cb30b204c05b650"
+source = "git+https://github.com/ankitects/rust-url.git?rev=bb930b8d089f4d30d7d19c12e54e66191de47b88#bb930b8d089f4d30d7d19c12e54e66191de47b88"
 
 [[package]]
 name = "pest"
@@ -3302,7 +3302,7 @@ dependencies = [
  "mime_guess",
  "native-tls",
  "once_cell",
- "percent-encoding 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding",
  "pin-project-lite",
  "rustls",
  "rustls-native-certs",
@@ -3595,7 +3595,7 @@ version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7715380eec75f029a4ef7de39a9200e0a63823176b759d055b613f5a87df6a6"
 dependencies = [
- "percent-encoding 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding",
  "serde",
  "thiserror",
 ]
@@ -4521,7 +4521,7 @@ checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643"
 dependencies = [
  "form_urlencoded",
  "idna",
- "percent-encoding 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding",
  "serde",
 ]
 
@@ -4606,7 +4606,7 @@ dependencies = [
  "log",
  "mime",
  "mime_guess",
- "percent-encoding 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "percent-encoding",
  "pin-project",
  "rustls-pemfile",
  "scoped-tls",
diff --git a/rslib/Cargo.toml b/rslib/Cargo.toml
index d0c5e835f..15e359dc4 100644
--- a/rslib/Cargo.toml
+++ b/rslib/Cargo.toml
@@ -44,7 +44,7 @@ features = ["json", "socks", "stream", "multipart"]
 anki_i18n = { path = "i18n" }
 
 csv = { git = "https://github.com/ankitects/rust-csv.git", rev = "1c9d3aab6f79a7d815c69f925a46a4590c115f90" }
-percent-encoding = { git = "https://github.com/ankitects/rust-url.git", rev = "06a87b6c31c7e9a856a3fb058cb30b204c05b650" }
+percent-encoding-iri = { git = "https://github.com/ankitects/rust-url.git", rev = "bb930b8d089f4d30d7d19c12e54e66191de47b88" }
 
 # pinned as any changes could invalidate sqlite indexes
 unicase = "=2.6.0"
diff --git a/rslib/src/text.rs b/rslib/src/text.rs
index 0ca951038..9c1f7a2fc 100644
--- a/rslib/src/text.rs
+++ b/rslib/src/text.rs
@@ -4,10 +4,10 @@
 use std::borrow::Cow;
 
 use lazy_static::lazy_static;
-use percent_encoding::percent_decode_str;
-use percent_encoding::utf8_percent_encode;
-use percent_encoding::AsciiSet;
-use percent_encoding::CONTROLS;
+use percent_encoding_iri::percent_decode_str;
+use percent_encoding_iri::utf8_percent_encode;
+use percent_encoding_iri::AsciiSet;
+use percent_encoding_iri::CONTROLS;
 use regex::Captures;
 use regex::Regex;
 use unicase::eq as uni_eq;