Skip to content

Commit 752910a

Browse files
authored
Merge pull request #490 from sanders41/generate
Simplify justfile generator calls
2 parents 96d4d9e + bed8d4b commit 752910a

File tree

2 files changed

+6
-24
lines changed

2 files changed

+6
-24
lines changed

src/project_generator.rs

Lines changed: 5 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -842,21 +842,16 @@ pub fn generate_project(project_info: &ProjectInfo) -> Result<()> {
842842
bail!("Error creating pyproject.toml file");
843843
}
844844

845+
if save_justfile(project_info).is_err() {
846+
bail!("Error creating justfile");
847+
}
848+
845849
match &project_info.project_manager {
846-
ProjectManager::Poetry => {
847-
if save_justfile(project_info).is_err() {
848-
bail!("Error creating justfile");
849-
}
850-
}
851850
ProjectManager::Maturin => {
852851
if save_dev_requirements(project_info).is_err() {
853852
bail!("Error creating requirements-dev.txt file");
854853
}
855854

856-
if save_justfile(project_info).is_err() {
857-
bail!("Error creating justfile");
858-
}
859-
860855
if save_lib_file(project_info).is_err() {
861856
bail!("Error creating Rust lib.rs file");
862857
}
@@ -869,21 +864,8 @@ pub fn generate_project(project_info: &ProjectInfo) -> Result<()> {
869864
if save_dev_requirements(project_info).is_err() {
870865
bail!("Error creating requirements-dev.txt file");
871866
}
872-
873-
if save_justfile(project_info).is_err() {
874-
bail!("Error creating justfile");
875-
}
876-
}
877-
ProjectManager::Uv => {
878-
if save_justfile(project_info).is_err() {
879-
bail!("Error creating justfile");
880-
}
881-
}
882-
ProjectManager::Pixi => {
883-
if save_justfile(project_info).is_err() {
884-
bail!("Error creating justfile");
885-
}
886867
}
868+
_ => {}
887869
}
888870

889871
if project_info.use_continuous_deployment && save_pypi_publish_file(project_info).is_err() {

src/project_info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@ pub fn get_project_info(use_defaults: bool) -> Result<ProjectInfo> {
410410
string_prompt("Creator Email".to_string(), config.creator_email)?
411411
};
412412

413-
let license = if use_defaults && config.license.is_some() {
413+
let license = if use_defaults {
414414
if let Some(l) = config.license {
415415
l
416416
} else {

0 commit comments

Comments
 (0)