Skip to content

Commit 96087ad

Browse files
bangseongbeombangseongbeom
committed
Replace deno_urlpattern with ::urlpattern 
1 parent cd04565 commit 96087ad

File tree

2 files changed

+29
-29
lines changed

2 files changed

+29
-29
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ categories = ["web-programming"]
1414
crate-type = ["cdylib"]
1515

1616
[dependencies]
17-
deno-urlpattern = { version = "0.6.0", package = "urlpattern" }
1817
pyo3 = "0.28.2"
1918
regex = "1.12.3"
2019
url = "2.5.8"
20+
urlpattern = "0.6.0"

‎src/lib.rs‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use pyo3::{
99
use std::collections::HashMap;
1010

1111
#[pyclass(name = "URLPattern")]
12-
struct UrlPattern(deno_urlpattern::UrlPattern);
12+
struct UrlPattern(::urlpattern::UrlPattern);
1313

1414
#[pymethods]
1515
impl UrlPattern {
@@ -32,7 +32,7 @@ impl UrlPattern {
3232
value
3333
.extract::<String>()?
3434
.parse::<url::Url>()
35-
.map_err(deno_urlpattern::Error::Url)
35+
.map_err(::urlpattern::Error::Url)
3636
.map_err(Error)?,
3737
),
3838
options,
@@ -48,16 +48,16 @@ impl UrlPattern {
4848
}
4949
}
5050

51-
let init: deno_urlpattern::UrlPatternInit = match input {
51+
let init: ::urlpattern::UrlPatternInit = match input {
5252
Some(input) => match input {
5353
UrlPatternInput::String(input) => {
54-
deno_urlpattern::UrlPatternInit::parse_constructor_string::<regex::Regex>(
54+
::urlpattern::UrlPatternInit::parse_constructor_string::<regex::Regex>(
5555
input.as_str(),
5656
base_url,
5757
)
5858
.map_err(Error)?
5959
}
60-
UrlPatternInput::Init(init) => deno_urlpattern::UrlPatternInit {
60+
UrlPatternInput::Init(init) => ::urlpattern::UrlPatternInit {
6161
protocol: init
6262
.get_item("protocol")?
6363
.map(|v| v.extract::<String>())
@@ -96,26 +96,26 @@ impl UrlPattern {
9696
.transpose()?
9797
.map(|v| v.parse::<url::Url>())
9898
.transpose()
99-
.map_err(deno_urlpattern::Error::Url)
99+
.map_err(::urlpattern::Error::Url)
100100
.map_err(Error)?,
101101
},
102102
},
103-
None => deno_urlpattern::UrlPatternInit::default(),
103+
None => ::urlpattern::UrlPatternInit::default(),
104104
};
105105
let options = if let Some(options) = options {
106-
deno_urlpattern::UrlPatternOptions {
106+
::urlpattern::UrlPatternOptions {
107107
ignore_case: options
108108
.get_item("ignoreCase")?
109109
.map(|v| v.extract::<bool>())
110110
.transpose()?
111111
.unwrap_or(false),
112-
..deno_urlpattern::UrlPatternOptions::default()
112+
..::urlpattern::UrlPatternOptions::default()
113113
}
114114
} else {
115-
deno_urlpattern::UrlPatternOptions::default()
115+
::urlpattern::UrlPatternOptions::default()
116116
};
117117
Ok(Self(
118-
deno_urlpattern::UrlPattern::parse(init, options).map_err(Error)?,
118+
::urlpattern::UrlPattern::parse(init, options).map_err(Error)?,
119119
))
120120
}
121121

@@ -136,15 +136,15 @@ impl UrlPattern {
136136

137137
#[pyo3(signature = (input=None, baseURL=None))]
138138
fn test(&self, input: Option<UrlPatternInput>, baseURL: Option<&str>) -> PyResult<bool> {
139-
let input: deno_urlpattern::UrlPatternMatchInput = match input {
139+
let input: ::urlpattern::UrlPatternMatchInput = match input {
140140
Some(input) => match input {
141141
UrlPatternInput::String(input) => match baseURL {
142142
Some(base_url) => {
143143
let base_url = match url::Url::parse(base_url) {
144144
Ok(url) => url,
145145
Err(_) => return Ok(false),
146146
};
147-
deno_urlpattern::UrlPatternMatchInput::Url(
147+
::urlpattern::UrlPatternMatchInput::Url(
148148
match url::Url::options()
149149
.base_url(Some(&base_url))
150150
.parse(input.as_ref())
@@ -154,7 +154,7 @@ impl UrlPattern {
154154
},
155155
)
156156
}
157-
None => deno_urlpattern::UrlPatternMatchInput::Url(
157+
None => ::urlpattern::UrlPatternMatchInput::Url(
158158
match input.parse::<url::Url>() {
159159
Ok(url) => url,
160160
Err(_) => return Ok(false),
@@ -166,7 +166,7 @@ impl UrlPattern {
166166
return Err(PyTypeError::new_err("cannot use dict input with baseURL"));
167167
}
168168

169-
deno_urlpattern::UrlPatternMatchInput::Init(deno_urlpattern::UrlPatternInit {
169+
::urlpattern::UrlPatternMatchInput::Init(::urlpattern::UrlPatternInit {
170170
protocol: init
171171
.get_item("protocol")?
172172
.map(|v| v.extract::<String>())
@@ -205,13 +205,13 @@ impl UrlPattern {
205205
.transpose()?
206206
.map(|v| v.parse::<url::Url>())
207207
.transpose()
208-
.map_err(deno_urlpattern::Error::Url)
208+
.map_err(::urlpattern::Error::Url)
209209
.map_err(Error)?,
210210
})
211211
}
212212
},
213-
None => deno_urlpattern::UrlPatternMatchInput::Init(
214-
deno_urlpattern::UrlPatternInit::default(),
213+
None => ::urlpattern::UrlPatternMatchInput::Init(
214+
::urlpattern::UrlPatternInit::default(),
215215
),
216216
};
217217
Ok(self.0.test(input).map_err(Error)?)
@@ -225,15 +225,15 @@ impl UrlPattern {
225225
baseURL: Option<&Bound<'py, PyString>>,
226226
) -> PyResult<Option<UrlPatternResult<'py>>> {
227227
let urlpattern_input: Option<UrlPatternInput> = input.map(|i| i.extract()).transpose()?;
228-
let input: deno_urlpattern::UrlPatternMatchInput = match &urlpattern_input {
228+
let input: ::urlpattern::UrlPatternMatchInput = match &urlpattern_input {
229229
Some(input) => match input {
230230
UrlPatternInput::String(input) => match baseURL {
231231
Some(base_url) => {
232232
let base_url = match url::Url::parse(base_url.to_str()?) {
233233
Ok(url) => url,
234234
Err(_) => return Ok(None),
235235
};
236-
deno_urlpattern::UrlPatternMatchInput::Url(
236+
::urlpattern::UrlPatternMatchInput::Url(
237237
match url::Url::options()
238238
.base_url(Some(&base_url))
239239
.parse(input.as_ref())
@@ -243,7 +243,7 @@ impl UrlPattern {
243243
},
244244
)
245245
}
246-
None => deno_urlpattern::UrlPatternMatchInput::Url(
246+
None => ::urlpattern::UrlPatternMatchInput::Url(
247247
match input.parse::<url::Url>() {
248248
Ok(url) => url,
249249
Err(_) => return Ok(None),
@@ -255,7 +255,7 @@ impl UrlPattern {
255255
return Err(PyTypeError::new_err("cannot use dict input with baseURL"));
256256
}
257257

258-
deno_urlpattern::UrlPatternMatchInput::Init(deno_urlpattern::UrlPatternInit {
258+
::urlpattern::UrlPatternMatchInput::Init(::urlpattern::UrlPatternInit {
259259
protocol: init
260260
.get_item("protocol")?
261261
.map(|v| v.extract::<String>())
@@ -294,13 +294,13 @@ impl UrlPattern {
294294
.transpose()?
295295
.map(|v| v.parse::<url::Url>())
296296
.transpose()
297-
.map_err(deno_urlpattern::Error::Url)
297+
.map_err(::urlpattern::Error::Url)
298298
.map_err(Error)?,
299299
})
300300
}
301301
},
302-
None => deno_urlpattern::UrlPatternMatchInput::Init(
303-
deno_urlpattern::UrlPatternInit::default(),
302+
None => ::urlpattern::UrlPatternMatchInput::Init(
303+
::urlpattern::UrlPatternInit::default(),
304304
),
305305
};
306306

@@ -457,16 +457,16 @@ struct UrlPatternComponentResult {
457457
groups: HashMap<String, Option<String>>,
458458
}
459459

460-
struct Error(deno_urlpattern::Error);
460+
struct Error(::urlpattern::Error);
461461

462462
impl From<Error> for PyErr {
463463
fn from(error: Error) -> Self {
464464
PyValueError::new_err(error.0.to_string())
465465
}
466466
}
467467

468-
impl From<deno_urlpattern::Error> for Error {
469-
fn from(other: deno_urlpattern::Error) -> Self {
468+
impl From<::urlpattern::Error> for Error {
469+
fn from(other: ::urlpattern::Error) -> Self {
470470
Self(other)
471471
}
472472
}

0 commit comments

Comments
 (0)