Skip to content

Commit bc6d098

Browse files
Copilotkarthiknadig
andcommitted
Initial progress: Fix first set of clippy warnings
Co-authored-by: karthiknadig <3840081+karthiknadig@users.noreply.github.com>
1 parent afc1322 commit bc6d098

File tree

5 files changed

+41
-41
lines changed

5 files changed

+41
-41
lines changed

crates/pet-core/src/python_environment.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,7 @@ pub fn get_environment_key(env: &PythonEnvironment) -> Option<PathBuf> {
416416

417417
#[cfg(test)]
418418
mod tests {
419+
#[cfg(windows)]
419420
use super::*;
420421

421422
#[test]

crates/pet-poetry/tests/common.rs

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,25 +35,27 @@ pub struct TestEnvironment {
3535
home: Option<PathBuf>,
3636
root: Option<PathBuf>,
3737
}
38+
39+
impl Environment for TestEnvironment {
40+
fn get_env_var(&self, key: String) -> Option<String> {
41+
self.vars.get(&key).cloned()
42+
}
43+
fn get_root(&self) -> Option<PathBuf> {
44+
self.root.clone()
45+
}
46+
fn get_user_home(&self) -> Option<PathBuf> {
47+
self.home.clone()
48+
}
49+
fn get_know_global_search_locations(&self) -> Vec<PathBuf> {
50+
vec![]
51+
}
52+
}
53+
3854
#[allow(dead_code)]
3955
pub fn create_test_environment(
4056
vars: HashMap<String, String>,
4157
home: Option<PathBuf>,
4258
root: Option<PathBuf>,
4359
) -> TestEnvironment {
44-
impl Environment for TestEnvironment {
45-
fn get_env_var(&self, key: String) -> Option<String> {
46-
self.vars.get(&key).cloned()
47-
}
48-
fn get_root(&self) -> Option<PathBuf> {
49-
self.root.clone()
50-
}
51-
fn get_user_home(&self) -> Option<PathBuf> {
52-
self.home.clone()
53-
}
54-
fn get_know_global_search_locations(&self) -> Vec<PathBuf> {
55-
vec![]
56-
}
57-
}
5860
TestEnvironment { vars, home, root }
5961
}

crates/pet-poetry/tests/config_test.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ fn global_config_with_specific_values() {
8383
#[cfg(unix)]
8484
#[cfg_attr(any(feature = "ci",), test)]
8585
#[allow(dead_code)]
86-
8786
fn local_config_with_specific_values() {
8887
use std::path::PathBuf;
8988

crates/pet-pyenv/tests/common.rs

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -34,27 +34,29 @@ pub struct TestEnvironment {
3434
root: Option<PathBuf>,
3535
globals_locations: Vec<PathBuf>,
3636
}
37+
38+
impl Environment for TestEnvironment {
39+
fn get_env_var(&self, key: String) -> Option<String> {
40+
self.vars.get(&key).cloned()
41+
}
42+
fn get_root(&self) -> Option<PathBuf> {
43+
self.root.clone()
44+
}
45+
fn get_user_home(&self) -> Option<PathBuf> {
46+
self.home.clone()
47+
}
48+
fn get_know_global_search_locations(&self) -> Vec<PathBuf> {
49+
self.globals_locations.clone()
50+
}
51+
}
52+
3753
#[allow(dead_code)]
3854
pub fn create_test_environment(
3955
vars: HashMap<String, String>,
4056
home: Option<PathBuf>,
4157
globals_locations: Vec<PathBuf>,
4258
root: Option<PathBuf>,
4359
) -> TestEnvironment {
44-
impl Environment for TestEnvironment {
45-
fn get_env_var(&self, key: String) -> Option<String> {
46-
self.vars.get(&key).cloned()
47-
}
48-
fn get_root(&self) -> Option<PathBuf> {
49-
self.root.clone()
50-
}
51-
fn get_user_home(&self) -> Option<PathBuf> {
52-
self.home.clone()
53-
}
54-
fn get_know_global_search_locations(&self) -> Vec<PathBuf> {
55-
self.globals_locations.clone()
56-
}
57-
}
5860
TestEnvironment {
5961
vars,
6062
home,

crates/pet-pyenv/tests/pyenv_test.rs

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ fn find_pyenv_envs() {
164164
home.to_str().unwrap(),
165165
".pyenv/versions/3.9.9/bin/python",
166166
])]),
167-
..Default::default()
168167
};
169168
let expected_virtual_env = PythonEnvironment {
170169
display_name: None,
@@ -186,7 +185,6 @@ fn find_pyenv_envs() {
186185
home.to_str().unwrap(),
187186
".pyenv/versions/my-virtual-env/bin/python",
188187
])]),
189-
..Default::default()
190188
};
191189
let expected_3_12_1 = PythonEnvironment {
192190
display_name: None,
@@ -208,7 +206,6 @@ fn find_pyenv_envs() {
208206
home.to_str().unwrap(),
209207
".pyenv/versions/3.12.1/bin/python",
210208
])]),
211-
..Default::default()
212209
};
213210
let expected_3_13_dev = PythonEnvironment {
214211
display_name: None,
@@ -230,7 +227,6 @@ fn find_pyenv_envs() {
230227
home.to_str().unwrap(),
231228
".pyenv/versions/3.13-dev/bin/python",
232229
])]),
233-
..Default::default()
234230
};
235231
let expected_3_12_1a3 = PythonEnvironment {
236232
display_name: None,
@@ -252,7 +248,7 @@ fn find_pyenv_envs() {
252248
home.to_str().unwrap(),
253249
".pyenv/versions/3.12.1a3/bin/python",
254250
])]),
255-
..Default::default()
251+
256252
};
257253
let expected_no_gil = PythonEnvironment {
258254
display_name: None,
@@ -274,7 +270,7 @@ fn find_pyenv_envs() {
274270
home.to_str().unwrap(),
275271
".pyenv/versions/nogil-3.9.10-1/bin/python",
276272
])]),
277-
..Default::default()
273+
278274
};
279275
let expected_pypy = PythonEnvironment {
280276
display_name: None,
@@ -296,7 +292,7 @@ fn find_pyenv_envs() {
296292
home.to_str().unwrap(),
297293
".pyenv/versions/pypy3.9-7.3.15/bin/python",
298294
])]),
299-
..Default::default()
295+
300296
};
301297

302298
let expected_conda_root = PythonEnvironment {
@@ -310,7 +306,7 @@ fn find_pyenv_envs() {
310306
manager: Some(expected_conda_manager.clone()),
311307
arch: Some(Architecture::X64),
312308
symlinks: Some(vec![conda_dir.join("bin").join("python")]),
313-
..Default::default()
309+
314310
};
315311
let expected_conda_one = PythonEnvironment {
316312
display_name: None,
@@ -323,7 +319,7 @@ fn find_pyenv_envs() {
323319
manager: Some(expected_conda_manager.clone()),
324320
arch: None,
325321
symlinks: Some(vec![conda_dir.join("envs").join("one").join("python")]),
326-
..Default::default()
322+
327323
};
328324
let expected_conda_two = PythonEnvironment {
329325
display_name: None,
@@ -336,7 +332,7 @@ fn find_pyenv_envs() {
336332
manager: Some(expected_conda_manager.clone()),
337333
symlinks: Some(vec![conda_dir.join("envs").join("two").join("python")]),
338334
arch: None,
339-
..Default::default()
335+
340336
};
341337

342338
let mut expected_envs = vec![
@@ -406,7 +402,7 @@ fn resolve_pyenv_environment() {
406402
manager: Some(expected_manager.clone()),
407403
arch: None,
408404
symlinks: Some(vec![executable]),
409-
..Default::default()
405+
410406
};
411407
let expected_virtual_env = PythonEnvironment {
412408
display_name: None,
@@ -428,7 +424,7 @@ fn resolve_pyenv_environment() {
428424
home.to_str().unwrap(),
429425
".pyenv/versions/my-virtual-env/bin/python",
430426
])]),
431-
..Default::default()
427+
432428
};
433429

434430
// Resolve regular Python installs in Pyenv

0 commit comments

Comments
 (0)