diff --git a/compiler-cli/src/add.rs b/compiler-cli/src/add.rs index e999ab481fc..69dea7d2e73 100644 --- a/compiler-cli/src/add.rs +++ b/compiler-cli/src/add.rs @@ -1,6 +1,7 @@ use camino::{Utf8Path, Utf8PathBuf}; use gleam_core::{ + build::Mode, error::{FileIoAction, FileKind}, Error, Result, }; @@ -27,8 +28,9 @@ pub fn command(packages_to_add: Vec, 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, }, )?; diff --git a/compiler-cli/src/build.rs b/compiler-cli/src/build.rs index 82584b095b7..9fac36c1c18 100644 --- a/compiler-cli/src/build.rs +++ b/compiler-cli/src/build.rs @@ -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, @@ -22,8 +22,9 @@ pub fn download_dependencies(telemetry: impl Telemetry) -> Result { None, Vec::new(), dependencies::DependencyManagerConfig { + mode: Mode::Dev, use_manifest: dependencies::UseManifest::Yes, - ..Default::default() + check_major_versions: dependencies::CheckMajorVersions::No, }, ) } diff --git a/compiler-cli/src/dependencies.rs b/compiler-cli/src/dependencies.rs index 59ccb459fb1..2cb949f1f22 100644 --- a/compiler-cli/src/dependencies.rs +++ b/compiler-cli/src/dependencies.rs @@ -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(), @@ -95,9 +96,9 @@ pub fn update(packages: Vec) -> Result<()> { None, packages.into_iter().map(EcoString::from).collect(), DependencyManagerConfig { + mode: Mode::Dev, use_manifest, check_major_versions: CheckMajorVersions::Yes, - ..Default::default() }, )?; @@ -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( self, diff --git a/compiler-cli/src/fs.rs b/compiler-cli/src/fs.rs index c1fcd9dd13a..471c7a0a8db 100644 --- a/compiler-cli/src/fs.rs +++ b/compiler-cli/src/fs.rs @@ -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, @@ -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, }, ) } diff --git a/compiler-cli/src/main.rs b/compiler-cli/src/main.rs index 97c9c0ca6bc..a08a7a10a8f 100644 --- a/compiler-cli/src/main.rs +++ b/compiler-cli/src/main.rs @@ -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(())