Skip to content

Commit 1dc2884

Browse files
andholpil
authored andcommitted
refactor(dependencies): remove default impl for DependencyManagerConfig ♻️
1 parent 385a9f4 commit 1dc2884

File tree

5 files changed

+14
-19
lines changed

5 files changed

+14
-19
lines changed

compiler-cli/src/add.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use camino::{Utf8Path, Utf8PathBuf};
22

33
use gleam_core::{
4+
build::Mode,
45
Error, Result,
56
error::{FileIoAction, FileKind},
67
paths::ProjectPaths,
@@ -33,8 +34,9 @@ pub fn command(paths: &ProjectPaths, packages_to_add: Vec<String>, dev: bool) ->
3334
Some((new_package_requirements.clone(), dev)),
3435
Vec::new(),
3536
dependencies::DependencyManagerConfig {
37+
mode: Mode::Dev,
3638
use_manifest: dependencies::UseManifest::Yes,
37-
..Default::default()
39+
check_major_versions: dependencies::CheckMajorVersions::No,
3840
},
3941
)?;
4042

compiler-cli/src/build.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::{rc::Rc, time::Instant};
22

33
use gleam_core::{
44
Result,
5-
build::{Built, Codegen, NullTelemetry, Options, ProjectCompiler, Telemetry},
5+
build::{Built, Codegen, Mode, NullTelemetry, Options, ProjectCompiler, Telemetry},
66
manifest::Manifest,
77
paths::ProjectPaths,
88
warning::WarningEmitterIO,
@@ -21,8 +21,9 @@ pub fn download_dependencies(paths: &ProjectPaths, telemetry: impl Telemetry) ->
2121
None,
2222
Vec::new(),
2323
dependencies::DependencyManagerConfig {
24+
mode: Mode::Dev,
2425
use_manifest: dependencies::UseManifest::Yes,
25-
..Default::default()
26+
check_major_versions: dependencies::CheckMajorVersions::No,
2627
},
2728
)
2829
}

compiler-cli/src/dependencies.rs

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ fn get_manifest_details(paths: &ProjectPaths) -> Result<(PackageConfig, Manifest
9292
let config = crate::config::root_config(paths)?;
9393
let package_fetcher = PackageFetcher::new(runtime.handle().clone());
9494
let dependency_manager = DependencyManagerConfig {
95+
mode: Mode::Dev,
9596
use_manifest: UseManifest::Yes,
96-
..Default::default()
97+
check_major_versions: CheckMajorVersions::No,
9798
}
9899
.into_dependency_manager(
99100
runtime.handle().clone(),
@@ -228,9 +229,9 @@ pub fn update(paths: &ProjectPaths, packages: Vec<String>) -> Result<()> {
228229
None,
229230
packages.into_iter().map(EcoString::from).collect(),
230231
DependencyManagerConfig {
232+
mode: Mode::Dev,
231233
use_manifest,
232234
check_major_versions: CheckMajorVersions::Yes,
233-
..Default::default()
234235
},
235236
)?;
236237

@@ -650,16 +651,6 @@ pub struct DependencyManagerConfig {
650651
pub check_major_versions: CheckMajorVersions,
651652
}
652653

653-
impl Default for DependencyManagerConfig {
654-
fn default() -> Self {
655-
Self {
656-
mode: Mode::Dev,
657-
use_manifest: UseManifest::No,
658-
check_major_versions: CheckMajorVersions::No,
659-
}
660-
}
661-
}
662-
663654
impl DependencyManagerConfig {
664655
pub fn into_dependency_manager<Telem: Telemetry, P: dependency::PackageFetcher>(
665656
self,

compiler-cli/src/fs.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use gleam_core::{
22
Result, Warning,
3-
build::{NullTelemetry, Target},
3+
build::{Mode, NullTelemetry, Target},
44
error::{Error, FileIoAction, FileKind, OS, ShellCommandFailureReason, parse_os},
55
io::{
66
BeamCompiler, Command, CommandExecutor, Content, DirEntry, FileSystemReader,
@@ -252,8 +252,9 @@ impl DownloadDependencies for ProjectIO {
252252
None,
253253
Vec::new(),
254254
dependencies::DependencyManagerConfig {
255+
mode: Mode::Dev,
255256
use_manifest: dependencies::UseManifest::Yes,
256-
..Default::default()
257+
check_major_versions: dependencies::CheckMajorVersions::No,
257258
},
258259
)
259260
}

compiler-cli/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -781,9 +781,9 @@ fn download_dependencies(paths: &ProjectPaths) -> Result<()> {
781781
None,
782782
Vec::new(),
783783
dependencies::DependencyManagerConfig {
784+
mode: Mode::Dev,
784785
use_manifest: dependencies::UseManifest::Yes,
785-
check_major_versions: dependencies::CheckMajorVersions::Yes,
786-
..Default::default()
786+
check_major_versions: dependencies::CheckMajorVersions::No,
787787
},
788788
)?;
789789
Ok(())

0 commit comments

Comments
 (0)