Skip to content

Commit

Permalink
Merge pull request #1017 from axodotdev/rust_1_78
Browse files Browse the repository at this point in the history
chore: update to rust 1.78
  • Loading branch information
Gankra authored May 7, 2024
2 parents 90c2034 + 1081fdb commit c1526bc
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
2 changes: 1 addition & 1 deletion cargo-dist/src/announce.rs
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ pub(crate) fn select_tag(
// like `init` or `generate` which just wants us to hand it everything
// and doesn't care about coherent announcements. So use a fake tag
// and hand it the fully unconstrained list of rust_releases.
announcing.tag = "v1.0.0-FAKEVER".to_owned();
"v1.0.0-FAKEVER".clone_into(&mut announcing.tag);
announcing.prerelease = true;
announcing.release = ReleaseType::Version("1.0.0-FAKEVER".parse().unwrap());
}
Expand Down
26 changes: 13 additions & 13 deletions cargo-dist/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -564,10 +564,10 @@ impl DistMetadata {

// Merge non-global settings
if installers.is_none() {
*installers = workspace_config.installers.clone();
installers.clone_from(&workspace_config.installers);
}
if targets.is_none() {
*targets = workspace_config.targets.clone();
targets.clone_from(&workspace_config.targets);
}
if dist.is_none() {
*dist = workspace_config.dist;
Expand All @@ -582,19 +582,19 @@ impl DistMetadata {
*unix_archive = workspace_config.unix_archive;
}
if npm_package.is_none() {
*npm_package = workspace_config.npm_package.clone();
npm_package.clone_from(&workspace_config.npm_package);
}
if npm_scope.is_none() {
*npm_scope = workspace_config.npm_scope.clone();
npm_scope.clone_from(&workspace_config.npm_scope);
}
if checksum.is_none() {
*checksum = workspace_config.checksum;
}
if install_path.is_none() {
*install_path = workspace_config.install_path.clone();
install_path.clone_from(&workspace_config.install_path);
}
if features.is_none() {
*features = workspace_config.features.clone();
features.clone_from(&workspace_config.features);
}
if default_features.is_none() {
*default_features = workspace_config.default_features;
Expand All @@ -603,22 +603,22 @@ impl DistMetadata {
*all_features = workspace_config.all_features;
}
if tap.is_none() {
*tap = workspace_config.tap.clone();
tap.clone_from(&workspace_config.tap);
}
if formula.is_none() {
*formula = workspace_config.formula.clone();
formula.clone_from(&workspace_config.formula);
}
if system_dependencies.is_none() {
*system_dependencies = workspace_config.system_dependencies.clone();
system_dependencies.clone_from(&workspace_config.system_dependencies);
}
if extra_artifacts.is_none() {
*extra_artifacts = workspace_config.extra_artifacts.clone();
extra_artifacts.clone_from(&workspace_config.extra_artifacts);
}
if github_custom_runners.is_none() {
*github_custom_runners = workspace_config.github_custom_runners.clone();
github_custom_runners.clone_from(&workspace_config.github_custom_runners);
}
if bin_aliases.is_none() {
*bin_aliases = workspace_config.bin_aliases.clone();
bin_aliases.clone_from(&workspace_config.bin_aliases);
}
if install_updater.is_none() {
*install_updater = workspace_config.install_updater;
Expand All @@ -631,7 +631,7 @@ impl DistMetadata {
include.extend(workspace_include.iter().cloned());
}
} else {
*include = workspace_config.include.clone();
include.clone_from(&workspace_config.include);
}
}
}
Expand Down
9 changes: 5 additions & 4 deletions cargo-dist/src/tasks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1777,12 +1777,13 @@ impl<'pkg_graph> DistGraphBuilder<'pkg_graph> {
let artifact_path = self.inner.dist_dir.join(&artifact_name);

// If tap is specified, include that in the `brew install` message
let mut install_target = formula.clone();
if let Some(tap) = &self.inner.tap {
let install_target = if let Some(tap) = &self.inner.tap {
// So that, for example, axodotdev/homebrew-tap becomes axodotdev/tap
let tap = tap.replace("/homebrew-", "/");
install_target = format!("{tap}/{install_target}").to_owned();
}
format!("{tap}/{formula}")
} else {
formula.clone()
};

let hint = format!("brew install {}", install_target);
let desc = "Install prebuilt binaries via Homebrew".to_owned();
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.77"
channel = "1.78"
components = ["rustc", "cargo", "rust-std", "clippy", "rustfmt"]

0 comments on commit c1526bc

Please sign in to comment.