Skip to content

Commit d0ea7fa

Browse files
committed
Convert baseURL to snake_case first
1 parent 5958709 commit d0ea7fa

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

src/lib.rs

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,9 @@ impl UrlPattern {
2020
baseURL: Option<&Bound<'_, PyAny>>,
2121
options: Option<&Bound<'_, PyDict>>,
2222
) -> PyResult<Self> {
23-
let (base_url, options) = match baseURL {
23+
let base_url = baseURL;
24+
25+
let (base_url, options) = match base_url {
2426
Some(value) => {
2527
if let Ok(options_dict) = value.cast::<PyDict>() {
2628
(None, Some(options_dict))
@@ -134,9 +136,11 @@ impl UrlPattern {
134136

135137
#[pyo3(signature = (input=None, baseURL=None))]
136138
fn test(&self, input: Option<UrlPatternInput>, baseURL: Option<&str>) -> PyResult<bool> {
139+
let base_url = baseURL;
140+
137141
let input: ::urlpattern::UrlPatternMatchInput = match input {
138142
Some(input) => match input {
139-
UrlPatternInput::String(input) => match baseURL {
143+
UrlPatternInput::String(input) => match base_url {
140144
Some(base_url) => {
141145
let base_url = match url::Url::parse(base_url) {
142146
Ok(url) => url,
@@ -160,7 +164,7 @@ impl UrlPattern {
160164
}
161165
},
162166
UrlPatternInput::Init(init) => {
163-
if baseURL.is_some() {
167+
if base_url.is_some() {
164168
return Err(PyTypeError::new_err("cannot use dict input with baseURL"));
165169
}
166170

@@ -222,10 +226,12 @@ impl UrlPattern {
222226
input: Option<&Bound<'py, PyAny>>,
223227
baseURL: Option<&Bound<'py, PyString>>,
224228
) -> PyResult<Option<UrlPatternResult<'py>>> {
229+
let base_url = baseURL;
230+
225231
let urlpattern_input: Option<UrlPatternInput> = input.map(|i| i.extract()).transpose()?;
226232
let input: ::urlpattern::UrlPatternMatchInput = match &urlpattern_input {
227233
Some(input) => match input {
228-
UrlPatternInput::String(input) => match baseURL {
234+
UrlPatternInput::String(input) => match base_url {
229235
Some(base_url) => {
230236
let base_url = match url::Url::parse(base_url.to_str()?) {
231237
Ok(url) => url,
@@ -312,7 +318,7 @@ impl UrlPattern {
312318
vec.push(
313319
urlpattern_input.unwrap_or(UrlPatternInput::Init(PyDict::new(py).into_bound())),
314320
);
315-
if let Some(base_url) = baseURL {
321+
if let Some(base_url) = base_url {
316322
vec.push(UrlPatternInput::String(base_url.to_string()));
317323
}
318324
vec

0 commit comments

Comments
 (0)