Skip to content

Commit be7b181

Browse files
committed
Fix clippy warning
1 parent 1c4206c commit be7b181

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

src/file_manager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pub fn save_file_with_content(file_path: &PathBuf, file_content: &str) -> Result
1414
}
1515

1616
pub fn save_empty_src_file(project_info: &ProjectInfo, file_name: &str) -> Result<()> {
17-
let module = project_info.source_dir.replace('-', "_");
17+
let module = project_info.source_dir.replace([' ', '-'], "_");
1818
let file_path = project_info
1919
.base_dir()
2020
.join(format!("{}/{}", &module, file_name));

src/project_generator.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ use crate::python_files::generate_python_files;
1818
use crate::rust_files::{save_cargo_toml_file, save_lib_file};
1919

2020
fn create_directories(project_info: &ProjectInfo) -> Result<()> {
21-
let module = project_info.source_dir.replace('-', "_");
21+
let module = project_info.source_dir.replace([' ', '-'], "_");
2222
let base = project_info.base_dir();
23-
let src = base.join(&module);
23+
let src = base.join(module);
2424
create_dir_all(src)?;
2525

2626
let github_dir = base.join(".github/workflows");
@@ -331,7 +331,7 @@ fn build_latest_dev_dependencies(
331331
}
332332

333333
fn create_pyproject_toml(project_info: &ProjectInfo) -> String {
334-
let module = project_info.source_dir.replace('-', "_");
334+
let module = project_info.source_dir.replace([' ', '-'], "_");
335335
let pyupgrade_version = &project_info.min_python_version.replace(['.', '^'], "");
336336
let license_text = license_str(&project_info.license);
337337
let mut pyproject = match &project_info.project_manager {
@@ -538,7 +538,7 @@ fn create_pyo3_justfile(module: &str) -> String {
538538
}
539539

540540
fn save_pyo3_justfile(project_info: &ProjectInfo) -> Result<()> {
541-
let module = project_info.source_dir.replace('-', "_");
541+
let module = project_info.source_dir.replace([' ', '-'], "_");
542542
let file_path = project_info.base_dir().join("justfile");
543543
let content = create_pyo3_justfile(&module);
544544

src/project_info.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -322,10 +322,7 @@ pub fn get_project_info(use_defaults: bool) -> Result<ProjectInfo> {
322322
bail!(format!("The {project_slug} directory already exists"));
323323
}
324324

325-
let source_dir_default = project_name
326-
.replace(' ', "_")
327-
.replace('-', "_")
328-
.to_lowercase();
325+
let source_dir_default = project_name.replace([' ', '-'], "_").to_lowercase();
329326
let source_dir = if use_defaults {
330327
source_dir_default
331328
} else {

src/python_files.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ if __name__ == "__main__":
2929
}
3030

3131
fn save_main_files(project_info: &ProjectInfo) -> Result<()> {
32-
let module = project_info.source_dir.replace('-', "_");
32+
let module = project_info.source_dir.replace([' ', '-'], "_");
3333
let src = project_info.base_dir().join(&module);
3434
let main = src.join("main.py");
3535
let main_content = create_main_file();
@@ -56,7 +56,7 @@ def test_main():
5656
}
5757

5858
fn save_main_test_file(project_info: &ProjectInfo) -> Result<()> {
59-
let module = project_info.source_dir.replace('-', "_");
59+
let module = project_info.source_dir.replace([' ', '-'], "_");
6060
let file_path = project_info.base_dir().join("tests/test_main.py");
6161
let content = create_main_test_file(&module);
6262

@@ -77,7 +77,7 @@ def test_sum_as_string():
7777
}
7878

7979
fn save_pyo3_test_file(project_info: &ProjectInfo) -> Result<()> {
80-
let module = project_info.source_dir.replace('-', "_");
80+
let module = project_info.source_dir.replace([' ', '-'], "_");
8181
let file_path = project_info
8282
.base_dir()
8383
.join(format!("tests/test_{}.py", &module));
@@ -148,7 +148,7 @@ fn save_test_init_file(project_info: &ProjectInfo) -> Result<()> {
148148
}
149149

150150
fn save_project_init_file(project_info: &ProjectInfo) -> Result<()> {
151-
let module = project_info.source_dir.replace('-', "_");
151+
let module = project_info.source_dir.replace([' ', '-'], "_");
152152
let file_path = project_info
153153
.base_dir()
154154
.join(format!("{}/__init__.py", &module));
@@ -168,7 +168,7 @@ def sum_as_string(a: int, b: int) -> str: ...
168168
}
169169

170170
pub fn save_pyi_file(project_info: &ProjectInfo) -> Result<()> {
171-
let module = project_info.source_dir.replace('-', "_");
171+
let module = project_info.source_dir.replace([' ', '-'], "_");
172172
let file_path = project_info
173173
.base_dir()
174174
.join(format!("{}/_{}.pyi", &module, &module));
@@ -184,7 +184,7 @@ fn create_version_file(version: &str) -> String {
184184
}
185185

186186
fn save_version_file(project_info: &ProjectInfo) -> Result<()> {
187-
let module = project_info.source_dir.replace('-', "_");
187+
let module = project_info.source_dir.replace([' ', '-'], "_");
188188
let file_path = project_info
189189
.base_dir()
190190
.join(format!("{}/_version.py", &module));
@@ -244,7 +244,7 @@ else:
244244
}
245245

246246
fn save_version_test_file(project_info: &ProjectInfo) -> Result<()> {
247-
let module = project_info.source_dir.replace('-', "_");
247+
let module = project_info.source_dir.replace([' ', '-'], "_");
248248
let file_path = project_info.base_dir().join("tests/test_version.py");
249249
let content = create_version_test_file(&module, &project_info.project_manager);
250250
save_file_with_content(&file_path, &content)?;

src/rust_files.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ fn create_cargo_toml_file(
5858
) -> String {
5959
let versions = build_latest_dependencies(min_python_version, download_latest_packages);
6060
let license = license_str(license_type);
61-
let name = source_dir.replace('-', "_");
61+
let name = source_dir.replace([' ', '-'], "_");
6262

6363
format!(
6464
r#"[package]
@@ -96,7 +96,7 @@ pub fn save_cargo_toml_file(project_info: &ProjectInfo) -> Result<()> {
9696
}
9797

9898
fn create_lib_file(source_dir: &str) -> String {
99-
let module = source_dir.replace('-', "_");
99+
let module = source_dir.replace([' ', '-'], "_");
100100
format!(
101101
r#"use pyo3::prelude::*;
102102

0 commit comments

Comments
 (0)