Skip to content

Commit

Permalink
refactor(dependencies): remove default impl for DependencyManagerConf…
Browse files Browse the repository at this point in the history
…ig ♻️
  • Loading branch information
andho committed Jan 23, 2025
1 parent f328dc9 commit 4a66951
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 19 deletions.
4 changes: 3 additions & 1 deletion compiler-cli/src/add.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use camino::{Utf8Path, Utf8PathBuf};

use gleam_core::{
build::Mode,
error::{FileIoAction, FileKind},
Error, Result,
};
Expand All @@ -27,8 +28,9 @@ pub fn command(packages_to_add: Vec<String>, dev: bool) -> Result<()> {
Some((new_package_requirements.clone(), dev)),
Vec::new(),
dependencies::DependencyManagerConfig {
mode: Mode::Dev,
use_manifest: dependencies::UseManifest::Yes,
..Default::default()
check_major_versions: dependencies::CheckMajorVersions::No,
},
)?;

Expand Down
5 changes: 3 additions & 2 deletions compiler-cli/src/build.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::{rc::Rc, time::Instant};

use gleam_core::{
build::{Built, Codegen, NullTelemetry, Options, ProjectCompiler, Telemetry},
build::{Built, Codegen, Mode, NullTelemetry, Options, ProjectCompiler, Telemetry},
manifest::Manifest,
paths::ProjectPaths,
warning::WarningEmitterIO,
Expand All @@ -22,8 +22,9 @@ pub fn download_dependencies(telemetry: impl Telemetry) -> Result<Manifest> {
None,
Vec::new(),
dependencies::DependencyManagerConfig {
mode: Mode::Dev,
use_manifest: dependencies::UseManifest::Yes,
..Default::default()
check_major_versions: dependencies::CheckMajorVersions::No,
},
)
}
Expand Down
15 changes: 3 additions & 12 deletions compiler-cli/src/dependencies.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,9 @@ pub fn list() -> Result<()> {
let paths = ProjectPaths::new(project);
let config = crate::config::root_config()?;
let dependency_manager = DependencyManagerConfig {
mode: Mode::Dev,
use_manifest: UseManifest::Yes,
..Default::default()
check_major_versions: CheckMajorVersions::No,
}
.into_dependency_manager(
runtime.handle().clone(),
Expand Down Expand Up @@ -95,9 +96,9 @@ pub fn update(packages: Vec<String>) -> Result<()> {
None,
packages.into_iter().map(EcoString::from).collect(),
DependencyManagerConfig {
mode: Mode::Dev,
use_manifest,
check_major_versions: CheckMajorVersions::Yes,
..Default::default()
},
)?;

Expand Down Expand Up @@ -500,16 +501,6 @@ pub struct DependencyManagerConfig {
pub check_major_versions: CheckMajorVersions,
}

impl Default for DependencyManagerConfig {
fn default() -> Self {
Self {
mode: Mode::Dev,
use_manifest: UseManifest::No,
check_major_versions: CheckMajorVersions::No,
}
}
}

impl DependencyManagerConfig {
pub fn into_dependency_manager<Telem: Telemetry, P: dependency::PackageFetcher>(
self,
Expand Down
5 changes: 3 additions & 2 deletions compiler-cli/src/fs.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use gleam_core::{
build::{NullTelemetry, Target},
build::{Mode, NullTelemetry, Target},
error::{parse_os, Error, FileIoAction, FileKind, OS},
io::{
BeamCompiler, CommandExecutor, Content, DirEntry, FileSystemReader, FileSystemWriter,
Expand Down Expand Up @@ -252,8 +252,9 @@ impl DownloadDependencies for ProjectIO {
None,
Vec::new(),
dependencies::DependencyManagerConfig {
mode: Mode::Dev,
use_manifest: dependencies::UseManifest::Yes,
..Default::default()
check_major_versions: dependencies::CheckMajorVersions::No,
},
)
}
Expand Down
4 changes: 2 additions & 2 deletions compiler-cli/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -643,9 +643,9 @@ fn download_dependencies() -> Result<()> {
None,
Vec::new(),
dependencies::DependencyManagerConfig {
mode: Mode::Dev,
use_manifest: dependencies::UseManifest::Yes,
check_major_versions: dependencies::CheckMajorVersions::Yes,
..Default::default()
check_major_versions: dependencies::CheckMajorVersions::No,
},
)?;
Ok(())
Expand Down

0 comments on commit 4a66951

Please sign in to comment.