Skip to content

Commit 00842cf

Browse files
andholpil
authored andcommitted
refactor(dependencies): remove mode from public interface ♻️
1 parent 54b0e45 commit 00842cf

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

compiler-cli/src/add.rs

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

33
use gleam_core::{
4-
build::Mode,
54
Error, Result,
65
error::{FileIoAction, FileKind},
76
paths::ProjectPaths,
@@ -34,7 +33,6 @@ pub fn command(paths: &ProjectPaths, packages_to_add: Vec<String>, dev: bool) ->
3433
Some((new_package_requirements.clone(), dev)),
3534
Vec::new(),
3635
dependencies::DependencyManagerConfig {
37-
mode: Mode::Dev,
3836
use_manifest: dependencies::UseManifest::Yes,
3937
check_major_versions: dependencies::CheckMajorVersions::No,
4038
},

compiler-cli/src/build.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ pub fn download_dependencies(paths: &ProjectPaths, telemetry: impl Telemetry) ->
2121
None,
2222
Vec::new(),
2323
dependencies::DependencyManagerConfig {
24-
mode: Mode::Dev,
2524
use_manifest: dependencies::UseManifest::Yes,
2625
check_major_versions: dependencies::CheckMajorVersions::No,
2726
},

compiler-cli/src/dependencies.rs

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,14 @@ 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,
9695
use_manifest: UseManifest::Yes,
9796
check_major_versions: CheckMajorVersions::No,
9897
}
9998
.into_dependency_manager(
10099
runtime.handle().clone(),
101100
package_fetcher,
102101
cli::Reporter::new(),
102+
Mode::Dev,
103103
);
104104
let (_, manifest) = dependency_manager.get_manifest(&paths, &config, Vec::new())?;
105105
Ok((config, manifest))
@@ -229,7 +229,6 @@ pub fn update(paths: &ProjectPaths, packages: Vec<String>) -> Result<()> {
229229
None,
230230
packages.into_iter().map(EcoString::from).collect(),
231231
DependencyManagerConfig {
232-
mode: Mode::Dev,
233232
use_manifest,
234233
check_major_versions: CheckMajorVersions::Yes,
235234
},
@@ -371,8 +370,12 @@ pub fn download<Telem: Telemetry>(
371370
let runtime = tokio::runtime::Runtime::new().expect("Unable to start Tokio async runtime");
372371
let package_fetcher = PackageFetcher::new(runtime.handle().clone());
373372

374-
let dependency_manager =
375-
config.into_dependency_manager(runtime.handle().clone(), package_fetcher, telemetry);
373+
let dependency_manager = config.into_dependency_manager(
374+
runtime.handle().clone(),
375+
package_fetcher,
376+
telemetry,
377+
Mode::Dev,
378+
);
376379

377380
dependency_manager.download(paths, new_package, packages_to_update)
378381
}
@@ -646,9 +649,6 @@ fn same_requirements(
646649
}
647650

648651
pub struct DependencyManagerConfig {
649-
/// In `Prod` mode, dev dependencies are not considered during the executed operation.
650-
/// Otherwise (`Dev` or `Lsp`), all dependencies are considered
651-
pub mode: Mode,
652652
// If `Yes` we read the manifest from disc. If not set then we ignore any
653653
// manifest which will result in the latest versions of the dependency
654654
// packages being resolved (not the locked ones).
@@ -664,13 +664,14 @@ impl DependencyManagerConfig {
664664
runtime: tokio::runtime::Handle,
665665
package_fetcher: P,
666666
telemetry: Telem,
667+
mode: Mode,
667668
) -> DependencyManager<Telem, P> {
668669
DependencyManager {
669670
runtime,
670671
package_fetcher,
671672
telemetry,
672673

673-
mode: self.mode,
674+
mode,
674675
use_manifest: self.use_manifest,
675676
check_major_versions: self.check_major_versions,
676677
}

compiler-cli/src/fs.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,6 @@ impl DownloadDependencies for ProjectIO {
252252
None,
253253
Vec::new(),
254254
dependencies::DependencyManagerConfig {
255-
mode: Mode::Dev,
256255
use_manifest: dependencies::UseManifest::Yes,
257256
check_major_versions: dependencies::CheckMajorVersions::No,
258257
},

compiler-cli/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -781,7 +781,6 @@ fn download_dependencies(paths: &ProjectPaths) -> Result<()> {
781781
None,
782782
Vec::new(),
783783
dependencies::DependencyManagerConfig {
784-
mode: Mode::Dev,
785784
use_manifest: dependencies::UseManifest::Yes,
786785
check_major_versions: dependencies::CheckMajorVersions::No,
787786
},

0 commit comments

Comments
 (0)