Skip to content

Commit 0fefb27

Browse files
chore(deps): update dependency prettier to v3.5.2 (1.x) (#12781)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: FabianLars <[email protected]>
1 parent 4d0a6f7 commit 0fefb27

File tree

13 files changed

+21
-28
lines changed

13 files changed

+21
-28
lines changed

core/tauri-build/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
530530

531531
if let Some(version_str) = &config.package.version {
532532
if let Ok(v) = Version::parse(version_str) {
533-
let version = v.major << 48 | v.minor << 32 | v.patch << 16;
533+
let version = (v.major << 48) | (v.minor << 32) | (v.patch << 16);
534534
res.set_version_info(VersionInfo::FILEVERSION, version);
535535
res.set_version_info(VersionInfo::PRODUCTVERSION, version);
536536
}

core/tauri-utils/src/pattern/isolation.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,7 @@ pub struct Keys {
8585
impl Keys {
8686
/// Securely generate required keys for Isolation encryption.
8787
pub fn new() -> Result<Self, Error> {
88-
AesGcmPair::new()
89-
.map(|aes_gcm| Self { aes_gcm })
90-
.map_err(Into::into)
88+
AesGcmPair::new().map(|aes_gcm| Self { aes_gcm })
9189
}
9290

9391
/// The AES-GCM data (and raw data).

core/tauri/src/endpoints/cli.rs

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// SPDX-License-Identifier: MIT
44

55
#![allow(unused_imports)]
6+
#![allow(clippy::useless_conversion)]
67

78
use super::{InvokeContext, InvokeResponse};
89
use crate::Runtime;
@@ -26,6 +27,7 @@ impl Cmd {
2627
.map(Into::into)
2728
.map_err(Into::into)
2829
} else {
30+
#[allow(clippy::useless_conversion)]
2931
Ok(crate::api::cli::Matches::default().into())
3032
}
3133
}

core/tauri/src/endpoints/dialog.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
// SPDX-License-Identifier: MIT
44

55
#![allow(unused_imports)]
6+
#![allow(clippy::useless_conversion)]
67

78
use super::{InvokeContext, InvokeResponse};
89
use crate::Runtime;

core/tauri/src/endpoints/file_system.rs

+2-8
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,7 @@ impl Cmd {
141141
path,
142142
options.and_then(|o| o.dir),
143143
)?;
144-
file::read_binary(&resolved_path)
145-
.with_context(|| format!("path: {}", resolved_path.display()))
146-
.map_err(Into::into)
144+
file::read_binary(&resolved_path).with_context(|| format!("path: {}", resolved_path.display()))
147145
}
148146

149147
#[module_command_handler(fs_read_file)]
@@ -159,9 +157,7 @@ impl Cmd {
159157
path,
160158
options.and_then(|o| o.dir),
161159
)?;
162-
file::read_string(&resolved_path)
163-
.with_context(|| format!("path: {}", resolved_path.display()))
164-
.map_err(Into::into)
160+
file::read_string(&resolved_path).with_context(|| format!("path: {}", resolved_path.display()))
165161
}
166162

167163
#[module_command_handler(fs_write_file)]
@@ -191,7 +187,6 @@ impl Cmd {
191187
.truncate(!append)
192188
.open(&resolved_path)
193189
.with_context(|| format!("path: {}", resolved_path.display()))
194-
.map_err(Into::into)
195190
.and_then(|mut f| f.write_all(&contents).map_err(|err| err.into()))
196191
}
197192

@@ -358,7 +353,6 @@ impl Cmd {
358353
};
359354
fs::rename(&old, &new)
360355
.with_context(|| format!("old: {}, new: {}", old.display(), new.display()))
361-
.map_err(Into::into)
362356
}
363357

364358
#[module_command_handler(fs_exists)]

tooling/api/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"eslint-plugin-promise": "6.6.0",
5757
"eslint-plugin-security": "1.7.1",
5858
"fast-glob": "3.3.3",
59-
"prettier": "3.5.1",
59+
"prettier": "3.5.2",
6060
"rollup": "3.29.5",
6161
"typescript": "5.7.3"
6262
},

tooling/api/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -1656,10 +1656,10 @@ prelude-ls@^1.2.1:
16561656
resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
16571657
integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
16581658

1659-
1660-
version "3.5.1"
1661-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.1.tgz#22fac9d0b18c0b92055ac8fb619ac1c7bef02fb7"
1662-
integrity sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw==
1659+
1660+
version "3.5.2"
1661+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.2.tgz#d066c6053200da0234bf8fa1ef45168abed8b914"
1662+
integrity sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==
16631663

16641664
punycode@^2.1.0:
16651665
version "2.3.1"

tooling/bundler/src/bundle/common.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ impl CommandExt for Command {
149149
let program = self.get_program().to_string_lossy().into_owned();
150150
debug!(action = "Running"; "Command `{} {}`", program, self.get_args().map(|arg| arg.to_string_lossy()).fold(String::new(), |acc, arg| format!("{acc} {arg}")));
151151

152-
self.status().map_err(Into::into)
152+
self.status()
153153
}
154154

155155
fn output_ok(&mut self) -> crate::Result<Output> {

tooling/bundler/src/bundle/macos/ios.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
6262

6363
for bin in settings.binaries() {
6464
let bin_path = settings.binary_path(bin);
65-
common::copy_file(&bin_path, &app_bundle_path.join(bin.name()))
65+
common::copy_file(&bin_path, app_bundle_path.join(bin.name()))
6666
.with_context(|| format!("Failed to copy binary from {:?}", bin_path))?;
6767
}
6868

tooling/cli/node/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"fs-extra": "11.3.0",
4545
"jest": "29.7.0",
4646
"jest-transform-toml": "1.0.0",
47-
"prettier": "3.5.1"
47+
"prettier": "3.5.2"
4848
},
4949
"resolutions": {
5050
"semver": ">=7.5.2",

tooling/cli/node/yarn.lock

+4-4
Original file line numberDiff line numberDiff line change
@@ -1853,10 +1853,10 @@ pkg-dir@^4.2.0:
18531853
dependencies:
18541854
find-up "^4.0.0"
18551855

1856-
1857-
version "3.5.1"
1858-
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.1.tgz#22fac9d0b18c0b92055ac8fb619ac1c7bef02fb7"
1859-
integrity sha512-hPpFQvHwL3Qv5AdRvBFMhnKo4tYxp0ReXiPn2bxkiohEX6mBeBwEpBSQTkD458RaaDKQMYSp4hX4UtfUTA5wDw==
1856+
1857+
version "3.5.2"
1858+
resolved "https://registry.yarnpkg.com/prettier/-/prettier-3.5.2.tgz#d066c6053200da0234bf8fa1ef45168abed8b914"
1859+
integrity sha512-lc6npv5PH7hVqozBR7lkBNOGXV9vMwROAPlumdBkX0wTbbzPu/U1hk5yL8p2pt4Xoc+2mkT8t/sow2YrV/M5qg==
18601860

18611861
pretty-format@^29.7.0:
18621862
version "29.7.0"

tooling/cli/src/interface/rust.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -660,9 +660,7 @@ impl CargoSettings {
660660
toml_file
661661
.read_to_string(&mut toml_str)
662662
.with_context(|| "failed to read Cargo.toml")?;
663-
toml::from_str(&toml_str)
664-
.with_context(|| "failed to parse Cargo.toml")
665-
.map_err(Into::into)
663+
toml::from_str(&toml_str).with_context(|| "failed to parse Cargo.toml")
666664
}
667665
}
668666

tooling/cli/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ impl CommandExt for Command {
211211
let program = self.get_program().to_string_lossy().into_owned();
212212
debug!(action = "Running"; "Command `{} {}`", program, self.get_args().map(|arg| arg.to_string_lossy()).fold(String::new(), |acc, arg| format!("{acc} {arg}")));
213213

214-
self.status().map_err(Into::into)
214+
self.status()
215215
}
216216

217217
fn output_ok(&mut self) -> crate::Result<Output> {

0 commit comments

Comments
 (0)