Skip to content

Commit aa32257

Browse files
andholpil
authored andcommitted
fix(dependencies): fix rebase
1 parent 1ca7e0d commit aa32257

File tree

6 files changed

+22
-8
lines changed

6 files changed

+22
-8
lines changed

compiler-cli/src/add.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use gleam_core::{
88

99
use crate::{
1010
cli,
11-
dependencies::{self, UseManifest, parse_gleam_add_specifier},
11+
dependencies::{self, parse_gleam_add_specifier},
1212
fs,
1313
};
1414

compiler-cli/src/build.rs

Lines changed: 2 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, Mode, NullTelemetry, Options, ProjectCompiler, Telemetry},
5+
build::{Built, Codegen, NullTelemetry, Options, ProjectCompiler, Telemetry},
66
manifest::Manifest,
77
paths::ProjectPaths,
88
warning::WarningEmitterIO,
@@ -15,7 +15,7 @@ use crate::{
1515
};
1616

1717
pub fn download_dependencies(paths: &ProjectPaths, telemetry: impl Telemetry) -> Result<Manifest> {
18-
crate::dependencies::download(
18+
dependencies::download(
1919
paths,
2020
telemetry,
2121
None,

compiler-cli/src/dependencies.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ fn get_manifest_details(paths: &ProjectPaths) -> Result<(PackageConfig, Manifest
104104
cli::Reporter::new(),
105105
Mode::Dev,
106106
);
107-
let (_, manifest) = dependency_manager.get_manifest(&paths, &config, Vec::new())?;
107+
let (_, manifest) = dependency_manager.get_manifest(paths, &config, Vec::new())?;
108108
Ok((config, manifest))
109109
}
110110

compiler-cli/src/dependencies/dependency_manager.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,9 +218,14 @@ where
218218
&mut provided_packages,
219219
&mut vec![],
220220
)?,
221-
Requirement::Git { git } => {
222-
provide_git_package(name.clone(), &git, project_paths, &mut provided_packages)?
223-
}
221+
Requirement::Git { git, ref_ } => provide_git_package(
222+
name.clone(),
223+
&git,
224+
&ref_,
225+
project_paths,
226+
&mut provided_packages,
227+
&mut Vec::new(),
228+
)?,
224229
};
225230
let _ = root_requirements.insert(name, version);
226231
}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
source: compiler-cli/src/dependencies/tests.rs
3+
expression: output
4+
---
5+
The following dependencies have new major versions available:
6+
7+
gleam_stdlib 0.45.0 -> 1.0.0
8+
short_name 1.0.0 -> 2.0.0
9+
very_long_package_name 18.382.43 -> 19.0.38

compiler-cli/src/fs.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use gleam_core::{
22
Result, Warning,
3-
build::{Mode, NullTelemetry, Target},
3+
build::{NullTelemetry, Target},
44
error::{Error, FileIoAction, FileKind, OS, ShellCommandFailureReason, parse_os},
55
io::{
66
BeamCompiler, Command, CommandExecutor, Content, DirEntry, FileSystemReader,

0 commit comments

Comments
 (0)