Skip to content

merge queue: embarking main (2e6cc36) and #662 together #663

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mergify wants to merge 2 commits into from
Closed

merge queue: embarking main (2e6cc36) and #662 together #663

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21ae4b0
rename enum variant missed in #659
figsoda Dec 30, 2025
8ed738d
Merge of #662
mergify[bot] Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ pub enum BuildType {
#[derive(Clone, Copy, Display)]
#[display(style = "camelCase")]
pub enum RustVendor {
FetchCargoTarball,
FetchCargoVendor,
ImportCargoLock,
}

Expand Down Expand Up @@ -51,7 +51,7 @@ impl Display for BuildType {
f,
"buildRustPackage - {}",
match vendor {
RustVendor::FetchCargoTarball => "cargoHash",
RustVendor::FetchCargoVendor => "cargoHash",
RustVendor::ImportCargoLock => "cargoLock",
}
)?;
Expand Down
10 changes: 5 additions & 5 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,9 +357,9 @@ async fn run() -> Result<()> {
.map_while(Result::ok)
.any(|line| line.starts_with(r#"source = "git+"#))
}) {
&[RustVendor::ImportCargoLock, RustVendor::FetchCargoTarball]
&[RustVendor::ImportCargoLock, RustVendor::FetchCargoVendor]
} else {
&[RustVendor::FetchCargoTarball, RustVendor::ImportCargoLock]
&[RustVendor::FetchCargoVendor, RustVendor::ImportCargoLock]
}
} else {
&[] as &[_]
Expand Down Expand Up @@ -579,7 +579,7 @@ async fn run() -> Result<()> {
None,
}
let rust = match rust {
Some(RustVendor::FetchCargoTarball) => RustVendorData::Hash(
Some(RustVendor::FetchCargoVendor) => RustVendorData::Hash(
cargo_deps_hash(
&mut inputs,
&pname,
Expand Down Expand Up @@ -678,7 +678,7 @@ async fn run() -> Result<()> {
}

BuildType::BuildRustPackage {
vendor: RustVendor::FetchCargoTarball,
vendor: RustVendor::FetchCargoVendor,
} => {
let hash = cargo_deps_hash(
&mut inputs,
Expand Down Expand Up @@ -750,7 +750,7 @@ async fn run() -> Result<()> {
}

BuildType::MkDerivation {
rust: Some(RustVendor::FetchCargoTarball),
rust: Some(RustVendor::FetchCargoVendor),
} => {
let hash = cargo_deps_hash(
&mut inputs,
Expand Down