mirror of
https://github.com/tauri-apps/tauri.git
synced 2024-08-17 03:40:23 +03:00
fix(cli): clippy warnings on macOS (#9456)
This commit is contained in:
parent
8f4b1050c4
commit
cd23bb2ca2
@ -16,7 +16,7 @@
|
||||
use crate::{bundle::common, Settings};
|
||||
|
||||
use anyhow::Context;
|
||||
use image::{self, codecs::png::PngDecoder, GenericImageView, ImageDecoder};
|
||||
use image::{codecs::png::PngDecoder, GenericImageView, ImageDecoder};
|
||||
|
||||
use std::{
|
||||
collections::BTreeSet,
|
||||
|
@ -19,7 +19,7 @@ use tauri_utils::display_path;
|
||||
|
||||
use std::{
|
||||
fs::{self, File},
|
||||
io::{prelude::*, Write},
|
||||
io::prelude::*,
|
||||
path::{Path, PathBuf},
|
||||
};
|
||||
|
||||
|
@ -208,7 +208,7 @@ pub fn setup(
|
||||
}
|
||||
|
||||
if options.runner.is_none() {
|
||||
options.runner = config_.build.runner.clone();
|
||||
options.runner.clone_from(&config_.build.runner);
|
||||
}
|
||||
|
||||
options
|
||||
|
@ -288,14 +288,9 @@ pub fn setup(
|
||||
}
|
||||
|
||||
if options.runner.is_none() {
|
||||
options.runner = config
|
||||
.lock()
|
||||
.unwrap()
|
||||
.as_ref()
|
||||
.unwrap()
|
||||
.build
|
||||
options
|
||||
.runner
|
||||
.clone();
|
||||
.clone_from(&config.lock().unwrap().as_ref().unwrap().build.runner);
|
||||
}
|
||||
|
||||
let mut cargo_features = config
|
||||
|
@ -63,13 +63,13 @@ pub fn install_one(options: CargoInstallOptions) -> crate::Result<()> {
|
||||
|
||||
match (options.tag, options.rev, options.branch) {
|
||||
(Some(tag), None, None) => {
|
||||
cargo.args(["--tag", &tag]);
|
||||
cargo.args(["--tag", tag]);
|
||||
}
|
||||
(None, Some(rev), None) => {
|
||||
cargo.args(["--rev", &rev]);
|
||||
cargo.args(["--rev", rev]);
|
||||
}
|
||||
(None, None, Some(branch)) => {
|
||||
cargo.args(["--branch", &branch]);
|
||||
cargo.args(["--branch", branch]);
|
||||
}
|
||||
(None, None, None) => {}
|
||||
_ => anyhow::bail!("Only one of --tag, --rev and --branch can be specified"),
|
||||
|
@ -15,7 +15,6 @@ use std::{
|
||||
collections::{HashMap, HashSet},
|
||||
fs::File,
|
||||
io::{Read, Write},
|
||||
iter::FromIterator,
|
||||
path::Path,
|
||||
};
|
||||
|
||||
|
@ -293,7 +293,7 @@ pub fn get_app(config: &TauriConfig, interface: &AppInterface) -> App {
|
||||
domain.push('.');
|
||||
}
|
||||
if domain.is_empty() {
|
||||
domain = config.identifier.clone();
|
||||
domain.clone_from(&config.identifier);
|
||||
if domain.is_empty() {
|
||||
log::error!("Bundle identifier set in `tauri.conf.json > identifier` cannot be empty");
|
||||
exit(1);
|
||||
|
Loading…
Reference in New Issue
Block a user