feat: update to edition 2021 and set minimum rust to 1.56 (#2789)

This commit is contained in:
Lucas Fernandes Nogueira 2021-10-22 10:04:42 -03:00 committed by GitHub
parent 80ffa87edb
commit a9dfc01550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
71 changed files with 229 additions and 132 deletions

14
.changes/rust-1.56.0.md Normal file
View File

@ -0,0 +1,14 @@
---
"tauri": patch
"cli.rs": patch
"tauri-bundler": patch
"tauri-utils": patch
"tauri-macros": patch
"tauri-codegen": patch
"tauri-runtime": patch
"tauri-runtime-wry": patch
"tauri-driver": patch
"tauri-build": patch
---
The minimum Rust version is now `1.56`.

View File

@ -158,6 +158,11 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: install stable
uses: actions-rs/toolchain@v1
with:
toolchain: stable
override: true
- name: install webkit2gtk (ubuntu only)
if: matrix.platform == 'ubuntu-latest'
run: |

View File

@ -7,7 +7,8 @@ license = "Apache-2.0 OR MIT"
homepage = "https://tauri.studio"
repository = "https://github.com/tauri-apps/tauri/tree/dev/core/tauri-build"
description = "build time code to pair with https://crates.io/crates/tauri"
edition = "2018"
edition = "2021"
rust-version = "1.56"
exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
readme = "README.md"

View File

@ -7,7 +7,8 @@ license = "Apache-2.0 OR MIT"
homepage = "https://tauri.studio"
repository = "https://github.com/tauri-apps/tauri/tree/dev/core/tauri-codegen"
description = "code generation meant to be consumed inside of `tauri` through `tauri-build` or `tauri-macros`"
edition = "2018"
edition = "2021"
rust-version = "1.56"
exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
readme = "README.md"

View File

@ -7,7 +7,8 @@ license = "Apache-2.0 OR MIT"
homepage = "https://tauri.studio"
repository = "https://github.com/tauri-apps/tauri"
description = "Macros for the tauri crate."
edition = "2018"
edition = "2021"
rust-version = "1.56"
exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
readme = "README.md"

View File

@ -16,7 +16,7 @@ pub struct Handler {
}
impl Parse for Handler {
fn parse(input: &ParseBuffer) -> syn::Result<Self> {
fn parse(input: &ParseBuffer<'_>) -> syn::Result<Self> {
let paths = input.parse_terminated::<Path, Token![,]>(Path::parse)?;
// parse the command names and wrappers from the passed paths

View File

@ -19,7 +19,7 @@ enum ExecutionContext {
}
impl Parse for ExecutionContext {
fn parse(input: &ParseBuffer) -> syn::Result<Self> {
fn parse(input: &ParseBuffer<'_>) -> syn::Result<Self> {
if input.is_empty() {
return Ok(Self::Blocking);
}

View File

@ -18,7 +18,7 @@ pub(crate) struct ContextItems {
}
impl Parse for ContextItems {
fn parse(input: &ParseBuffer) -> syn::parse::Result<Self> {
fn parse(input: &ParseBuffer<'_>) -> syn::parse::Result<Self> {
let config_file = if input.is_empty() {
std::env::var("CARGO_MANIFEST_DIR").map(|m| PathBuf::from(m).join("tauri.conf.json"))
} else {

View File

@ -2,7 +2,6 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
extern crate proc_macro;
use crate::context::ContextItems;
use proc_macro::TokenStream;
use syn::{parse_macro_input, DeriveInput};

View File

@ -14,7 +14,7 @@ pub(crate) struct Attributes {
}
impl Parse for Attributes {
fn parse(input: ParseStream) -> syn::Result<Self> {
fn parse(input: ParseStream<'_>) -> syn::Result<Self> {
let default_type = input.parse()?;
input.parse::<Token![,]>()?;
Ok(Attributes {

View File

@ -7,7 +7,8 @@ license = "Apache-2.0 OR MIT"
homepage = "https://tauri.studio"
repository = "https://github.com/tauri-apps/tauri"
description = "Wry bindings to the Tauri runtime"
edition = "2018"
edition = "2021"
rust-version = "1.56"
exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
readme = "README.md"

View File

@ -89,7 +89,6 @@ use std::{
hash_map::Entry::{Occupied, Vacant},
HashMap,
},
convert::TryFrom,
fmt,
fs::read,
ops::Deref,
@ -534,7 +533,7 @@ impl TryFrom<Icon> for WryIcon {
struct WindowEventWrapper(Option<WindowEvent>);
impl WindowEventWrapper {
fn parse(webview: &WindowHandle, event: &WryWindowEvent) -> Self {
fn parse(webview: &WindowHandle, event: &WryWindowEvent<'_>) -> Self {
match event {
// resized event from tao doesn't include a reliable size on macOS
// because wry replaces the NSView
@ -2214,7 +2213,7 @@ fn handle_user_message(
}
fn handle_event_loop(
event: Event<Message>,
event: Event<'_, Message>,
event_loop: &EventLoopWindowTarget<Message>,
control_flow: &mut ControlFlow,
context: EventLoopIterationContext<'_>,

View File

@ -7,7 +7,8 @@ license = "Apache-2.0 OR MIT"
homepage = "https://tauri.studio"
repository = "https://github.com/tauri-apps/tauri"
description = "Runtime for Tauri applications"
edition = "2018"
edition = "2021"
rust-version = "1.56"
exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
readme = "README.md"

View File

@ -22,7 +22,7 @@ pub enum MimeType {
}
impl std::fmt::Display for MimeType {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mime = match self {
MimeType::Css => "text/css",
MimeType::Csv => "text/csv",

View File

@ -7,7 +7,7 @@ use super::{
status::StatusCode,
version::Version,
};
use std::{convert::TryFrom, fmt};
use std::fmt;
type Result<T> = core::result::Result<T, Box<dyn std::error::Error>>;

View File

@ -6,7 +6,8 @@ license = "Apache-2.0 OR MIT"
homepage = "https://tauri.studio"
repository = "https://github.com/tauri-apps/tauri"
description = "Utilities for Tauri"
edition = "2018"
edition = "2021"
rust-version = "1.56"
exclude = [ ".license_template", "CHANGELOG.md", "/target" ]
readme = "README.md"

View File

@ -7,7 +7,8 @@ license = "Apache-2.0 OR MIT"
homepage = "https://tauri.studio"
repository = "https://github.com/tauri-apps/tauri"
description = "Make tiny, secure apps for all desktop platforms with Tauri"
edition = "2018"
edition = "2021"
rust-version = "1.56"
exclude = [
"/test",
"/.scripts",

View File

@ -71,7 +71,8 @@ to the Cargo Manifest (`Cargo.toml`) so that Cargo knows to pull in our dependen
[package]
name = "hello-tauri-webdriver"
version = "0.1.0"
edition = "2018"
edition = "2021"
rust-version = "1.56"
# Needed to set up some things for Tauri at build time
[build-dependencies]

View File

@ -102,9 +102,9 @@ dependencies = [
[[package]]
name = "attohttpc"
version = "0.17.0"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a8bda305457262b339322106c776e3fd21df860018e566eb6a5b1aa4b6ae02d"
checksum = "e69e13a99a7e6e070bb114f7ff381e58c7ccc188630121fc4c2fe4bcf24cd072"
dependencies = [
"flate2",
"http",
@ -300,6 +300,15 @@ dependencies = [
"smallvec",
]
[[package]]
name = "cfg-expr"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edae0b9625d1fce32f7d64b71784d9b1bf8469ec1a9c417e44aaf16a9cbd7571"
dependencies = [
"smallvec",
]
[[package]]
name = "cfg-if"
version = "0.1.10"
@ -333,9 +342,9 @@ dependencies = [
[[package]]
name = "clap"
version = "3.0.0-beta.4"
version = "3.0.0-beta.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcd70aa5597dbc42f7217a543f9ef2768b2ef823ba29036072d30e1d88e98406"
checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63"
dependencies = [
"atty",
"bitflags 1.3.2",
@ -346,14 +355,14 @@ dependencies = [
"strsim 0.10.0",
"termcolor",
"textwrap",
"vec_map",
"unicase",
]
[[package]]
name = "clap_derive"
version = "3.0.0-beta.4"
version = "3.0.0-beta.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b5bb0d655624a0b8770d1c178fb8ffcb1f91cc722cb08f451e3dc72465421ac"
checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3"
dependencies = [
"heck",
"proc-macro-error",
@ -1403,21 +1412,25 @@ checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4"
[[package]]
name = "javascriptcore-rs"
version = "0.14.0"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5ca9c7d1445bba2889672fbadc16c3d5007bfdcf0a15a18a3a50fe9fab2c7427"
checksum = "a9644bfae308588f4e57616bd8402b982dbcd68d1934c0848e2869ffcc03b562"
dependencies = [
"bitflags 1.3.2",
"glib",
"javascriptcore-rs-sys",
]
[[package]]
name = "javascriptcore-rs-sys"
version = "0.2.0"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f46ada8a08dcd75a10afae872fbfb51275df4a8ae0d46b8cc7c708f08dd2998"
checksum = "6c75261f65a87f3903856651c1c0a847e06e1fc55a2d78879f3fb570c4bacaf2"
dependencies = [
"glib-sys 0.14.0",
"gobject-sys 0.14.0",
"libc",
"system-deps 5.0.0",
]
[[package]]
@ -1563,9 +1576,9 @@ dependencies = [
[[package]]
name = "minisign-verify"
version = "0.1.8"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "db0507fe8e3c68cd62961cf9f87f6c2b21d884d3515a7150a4a3fa9d014e5c12"
checksum = "95ccf091884470c4b3a80ad6daadbb2e7736611d631cbf0c9e603bb7dbcfdfd9"
[[package]]
name = "miniz_oxide"
@ -1862,9 +1875,12 @@ dependencies = [
[[package]]
name = "os_str_bytes"
version = "3.1.0"
version = "4.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6acbef58a60fe69ab50510a55bc8cdd4d6cf2283d27ad338f54cb52747a9cf2d"
checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799"
dependencies = [
"memchr",
]
[[package]]
name = "pango"
@ -2376,9 +2392,9 @@ dependencies = [
[[package]]
name = "rfd"
version = "0.5.0"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84b4745feef3bc92e709042c78d205e9a566ec46e18c58d4fac458e6fc12627e"
checksum = "2acac5884e3a23b02ebd6ce50fd2729732cdbdb16ea944fbbfbfa638a67992aa"
dependencies = [
"block",
"dispatch",
@ -2572,14 +2588,14 @@ dependencies = [
[[package]]
name = "serde_urlencoded"
version = "0.6.1"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97"
checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9"
dependencies = [
"dtoa",
"form_urlencoded",
"itoa",
"ryu",
"serde",
"url",
]
[[package]]
@ -2808,7 +2824,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"
dependencies = [
"anyhow",
"cfg-expr",
"cfg-expr 0.8.1",
"heck",
"itertools",
"pkg-config",
@ -2819,6 +2835,19 @@ dependencies = [
"version-compare 0.0.11",
]
[[package]]
name = "system-deps"
version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "18db855554db7bd0e73e06cf7ba3df39f97812cb11d3f75e71c39bf45171797e"
dependencies = [
"cfg-expr 0.9.0",
"heck",
"pkg-config",
"toml",
"version-compare 0.0.11",
]
[[package]]
name = "tao"
version = "0.5.2"
@ -3077,18 +3106,18 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c"
[[package]]
name = "thiserror"
version = "1.0.29"
version = "1.0.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "602eca064b2d83369e2b2f34b09c70b605402801927c65c11071ac911d299b88"
checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417"
dependencies = [
"thiserror-impl",
]
[[package]]
name = "thiserror-impl"
version = "1.0.29"
version = "1.0.30"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bad553cc2c78e8de258400763a647e80e6d1b31ee237275d756f6836d204494c"
checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b"
dependencies = [
"proc-macro2",
"quote 1.0.9",
@ -3163,6 +3192,15 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
[[package]]
name = "unicase"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
dependencies = [
"version_check",
]
[[package]]
name = "unicode-bidi"
version = "0.3.6"
@ -3236,12 +3274,6 @@ version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
[[package]]
name = "vec_map"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
[[package]]
name = "version-compare"
version = "0.0.10"
@ -3373,9 +3405,9 @@ dependencies = [
[[package]]
name = "webkit2gtk"
version = "0.14.0"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e3e47b7f870883fc21612d2a51b74262f7f2cc5371f1621370817292a35300a9"
checksum = "525fc0e0f81e567293e9d2469a0cf1124c7a757437b934c2f9514cfd0264f676"
dependencies = [
"bitflags 1.3.2",
"cairo-rs",
@ -3396,9 +3428,9 @@ dependencies = [
[[package]]
name = "webkit2gtk-sys"
version = "0.14.0"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b66ccc9f0cb4de7c3b92376a5bf64e7ddffb33852f092721731a039ec38dda98"
checksum = "bfd518519f30f8596be1c3c26cd2032111641fd6f7c1f5ac5af0a0730a4d3f60"
dependencies = [
"atk-sys",
"bitflags 1.3.2",
@ -3414,7 +3446,7 @@ dependencies = [
"pango-sys",
"pkg-config",
"soup-sys",
"system-deps 3.2.0",
"system-deps 5.0.0",
]
[[package]]
@ -3463,9 +3495,9 @@ dependencies = [
[[package]]
name = "wildmatch"
version = "1.1.0"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a"
checksum = "d6c48bd20df7e4ced539c12f570f937c6b4884928a87fee70a479d72f031d4e0"
[[package]]
name = "winapi"
@ -3577,7 +3609,7 @@ dependencies = [
[[package]]
name = "wry"
version = "0.12.2"
source = "git+https://github.com/tauri-apps/wry?rev=e056fb2a15e29de1b8ed85a548cfeb1f85031357#e056fb2a15e29de1b8ed85a548cfeb1f85031357"
source = "git+https://github.com/tauri-apps/wry?rev=910cc1eb8ed08c66e9fb75df90e28635538d68ab#910cc1eb8ed08c66e9fb75df90e28635538d68ab"
dependencies = [
"cocoa",
"core-graphics 0.22.2",

View File

@ -2,7 +2,8 @@
name = "api"
version = "0.1.0"
description = "An example Tauri Application showcasing the api"
edition = "2018"
edition = "2021"
rust-version = "1.56"
license = "Apache-2.0 OR MIT"
[build-dependencies]

View File

@ -2,7 +2,8 @@
name = "commands"
version = "0.1.0"
description = "A simple Tauri Application showcasing the commands API"
edition = "2018"
edition = "2021"
rust-version = "1.56"
[build-dependencies]
tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] }

View File

@ -22,6 +22,6 @@ pub fn simple_command(argument: String) {
}
#[command]
pub fn stateful_command(argument: Option<String>, state: State<super::MyState>) {
pub fn stateful_command(argument: Option<String>, state: State<'_, super::MyState>) {
println!("{:?} {:?}", argument, state.inner());
}

View File

@ -134,7 +134,7 @@ struct Person<'a> {
}
#[command]
fn command_arguments_struct(Person { name, age }: Person) {
fn command_arguments_struct(Person { name, age }: Person<'_>) {
println!("received person struct with name: {} | age: {}", name, age)
}
@ -142,7 +142,7 @@ fn command_arguments_struct(Person { name, age }: Person) {
struct InlinePerson<'a>(&'a str, u8);
#[command]
fn command_arguments_tuple_struct(InlinePerson(name, age): InlinePerson) {
fn command_arguments_tuple_struct(InlinePerson(name, age): InlinePerson<'_>) {
println!("received person tuple with name: {} | age: {}", name, age)
}

View File

@ -2,7 +2,8 @@
name = "helloworld"
version = "0.1.0"
description = "A very simple Tauri Appplication"
edition = "2018"
edition = "2021"
rust-version = "1.56"
[build-dependencies]
tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] }

View File

@ -2,7 +2,8 @@
name = "multiwindow"
version = "0.1.0"
description = "An example Tauri Multi-Window Application"
edition = "2018"
edition = "2021"
rust-version = "1.56"
license = "Apache-2.0 OR MIT"
[build-dependencies]

View File

@ -2,7 +2,8 @@
name = "navigation"
version = "0.1.0"
description = "A very simple Tauri Appplication with navigation"
edition = "2018"
edition = "2021"
rust-version = "1.56"
[build-dependencies]
tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] }

View File

@ -2,7 +2,8 @@
name = "resources"
version = "0.1.0"
description = "A Tauri application that uses Node.js with app resources"
edition = "2018"
edition = "2021"
rust-version = "1.56"
[build-dependencies]
tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] }

View File

@ -2,7 +2,8 @@
name = "sidecar"
version = "0.1.0"
description = "A Tauri application with a sidecar binary"
edition = "2018"
edition = "2021"
rust-version = "1.56"
[build-dependencies]
tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] }

View File

@ -2,7 +2,8 @@
name = "splashscreen"
version = "0.1.0"
description = "An example Tauri Application with a splashscreen"
edition = "2018"
edition = "2021"
rust-version = "1.56"
license = "Apache-2.0 OR MIT"
[build-dependencies]

View File

@ -2,7 +2,8 @@
name = "state"
version = "0.1.0"
description = "A simple Tauri Appplication showcase the state functionality"
edition = "2018"
edition = "2021"
rust-version = "1.56"
[build-dependencies]
tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] }

View File

@ -32,18 +32,18 @@ impl Client {
struct Connection(Mutex<Option<Client>>);
#[tauri::command]
fn connect(connection: State<Connection>) {
fn connect(connection: State<'_, Connection>) {
*connection.0.lock().unwrap() = Some(Client {});
}
#[tauri::command]
fn disconnect(connection: State<Connection>) {
fn disconnect(connection: State<'_, Connection>) {
// drop the connection
*connection.0.lock().unwrap() = None;
}
#[tauri::command]
fn connection_send(connection: State<Connection>) {
fn connection_send(connection: State<'_, Connection>) {
connection
.0
.lock()
@ -54,17 +54,17 @@ fn connection_send(connection: State<Connection>) {
}
#[tauri::command]
fn increment_counter(counter: State<Counter>) -> usize {
fn increment_counter(counter: State<'_, Counter>) -> usize {
counter.0.fetch_add(1, Ordering::Relaxed) + 1
}
#[tauri::command]
fn db_insert(key: String, value: String, db: State<Database>) {
fn db_insert(key: String, value: String, db: State<'_, Database>) {
db.0.lock().unwrap().insert(key, value);
}
#[tauri::command]
fn db_read(key: String, db: State<Database>) -> Option<String> {
fn db_read(key: String, db: State<'_, Database>) -> Option<String> {
db.0.lock().unwrap().get(&key).cloned()
}

View File

@ -2,7 +2,8 @@
name = "streaming"
version = "0.1.0"
description = "A very simple Tauri Appplication"
edition = "2018"
edition = "2021"
rust-version = "1.56"
[build-dependencies]
tauri-build = { path = "../../../core/tauri-build", features = [ "codegen" ] }

View File

@ -2,7 +2,8 @@
name = "updater-example"
version = "0.1.0"
description = "A very simple Tauri Appplication"
edition = "2018"
edition = "2021"
rust-version = "1.56"
license = "Apache-2.0 OR MIT"
[build-dependencies]

View File

@ -1 +0,0 @@
1.54.0

View File

@ -6,7 +6,7 @@ use_small_heuristics = "Default"
reorder_imports = true
reorder_modules = true
remove_nested_parens = true
edition = "2018"
edition = "2021"
merge_derives = true
use_try_shorthand = false
use_field_init_shorthand = false

View File

@ -4,7 +4,8 @@ workspace = {}
name = "tauri_bench"
version = "0.1.0"
authors = [ "Tauri Programme within The Commons Conservancy" ]
edition = "2018"
edition = "2021"
rust-version = "1.56"
license = "Apache-2.0 OR MIT"
description = "Cross-platform WebView rendering library"
repository = "https://github.com/tauri-apps/wry"

View File

@ -2,7 +2,8 @@
name = "bench_cpu_intensive"
version = "0.1.0"
description = "A very simple Tauri Appplication"
edition = "2018"
edition = "2021"
rust-version = "1.56"
[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] }

View File

@ -2,7 +2,8 @@
name = "bench_files_transfer"
version = "0.1.0"
description = "A very simple Tauri Appplication"
edition = "2018"
edition = "2021"
rust-version = "1.56"
[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] }

View File

@ -2,7 +2,8 @@
name = "bench_helloworld"
version = "0.1.0"
description = "A very simple Tauri Appplication"
edition = "2018"
edition = "2021"
rust-version = "1.56"
[build-dependencies]
tauri-build = { path = "../../../../../core/tauri-build", features = [ "codegen" ] }

View File

@ -12,7 +12,8 @@ license = "Apache-2.0 OR MIT"
keywords = [ "bundle", "cargo", "tauri" ]
repository = "https://github.com/tauri-apps/tauri"
description = "Wrap rust executables in OS-specific app bundles for Tauri"
edition = "2018"
edition = "2021"
rust-version = "1.56"
exclude = [
".license_template",
"CHANGELOG.md",

View File

@ -1,14 +0,0 @@
max_width = 100
hard_tabs = false
tab_spaces = 2
newline_style = "Auto"
use_small_heuristics = "Default"
reorder_imports = true
reorder_modules = true
remove_nested_parens = true
edition = "2018"
merge_derives = true
use_try_shorthand = false
use_field_init_shorthand = false
force_explicit_abi = true
imports_granularity = "Crate"

View File

@ -1,3 +1,7 @@
// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
pub mod appimage;
pub mod debian;
pub mod rpm;

View File

@ -1,3 +1,7 @@
// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
pub mod app;
pub mod dmg;
pub mod icon;

View File

@ -1,3 +1,7 @@
// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
use std::{
fs::File,
io::prelude::*,

View File

@ -1,3 +1,7 @@
// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
use std::{io::Cursor, process::Command};
#[derive(Debug, serde::Deserialize)]

View File

@ -1,2 +1,6 @@
// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
pub mod msi;
pub mod sign;

View File

@ -1,3 +1,7 @@
// Copyright 2019-2021 Tauri Programme within The Commons Conservancy
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
use std::{
path::{Path, PathBuf},
process::Command,

View File

@ -7,7 +7,8 @@ description = "A Tauri App"
authors = [ "Tauri Programme within The Commons Conservancy" ]
license = ""
repository = ""
edition = "2018"
edition = "2021"
rust-version = "1.56"
[package.metadata.bundle]
identifier = "com.tauri.dev"

View File

@ -6,7 +6,7 @@ use_small_heuristics = "Default"
reorder_imports = true
reorder_modules = true
remove_nested_parens = true
edition = "2018"
edition = "2021"
merge_derives = true
use_try_shorthand = false
use_field_init_shorthand = false

View File

@ -37,9 +37,9 @@ checksum = "d67af77d68a931ecd5cbd8a3b5987d63a1d1d1278f7f6a60ae33db485cdebb69"
[[package]]
name = "attohttpc"
version = "0.17.0"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a8bda305457262b339322106c776e3fd21df860018e566eb6a5b1aa4b6ae02d"
checksum = "e69e13a99a7e6e070bb114f7ff381e58c7ccc188630121fc4c2fe4bcf24cd072"
dependencies = [
"flate2",
"http",
@ -2356,9 +2356,9 @@ checksum = "d8b77fdfd5a253be4ab714e4ffa3c49caf146b4de743e97510c0656cf90f1e8e"
[[package]]
name = "wildmatch"
version = "1.1.0"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f44b95f62d34113cf558c93511ac93027e03e9c29a60dd0fd70e6e025c7270a"
checksum = "d6c48bd20df7e4ced539c12f570f937c6b4884928a87fee70a479d72f031d4e0"
[[package]]
name = "winapi"

View File

@ -4,7 +4,8 @@ workspace = { }
name = "tauri-cli"
version = "1.0.0-beta.7"
authors = [ "Tauri Programme within The Commons Conservancy" ]
edition = "2018"
edition = "2021"
rust-version = "1.56"
categories = [ "gui", "web-programming" ]
license = "Apache-2.0 OR MIT"
homepage = "https://tauri.studio"

View File

@ -13,7 +13,7 @@ lazy_static::lazy_static! {
}
/// Helper function to strip ansi codes.
pub fn strip_ansi_codes(s: &str) -> Cow<str> {
pub fn strip_ansi_codes(s: &str) -> Cow<'_, str> {
STRIP_ANSI_RE.replace_all(s, "")
}

View File

@ -582,7 +582,7 @@ impl<D> StyledObject<D> {
macro_rules! impl_fmt {
($name:ident) => {
impl<D: fmt::$name> fmt::$name for StyledObject<D> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut reset = false;
if self
.style
@ -659,7 +659,7 @@ impl<'a, 'b> Emoji<'a, 'b> {
}
impl<'a, 'b> fmt::Display for Emoji<'a, 'b> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if wants_emoji() {
write!(f, "{}", self.0)
} else {

View File

@ -113,7 +113,11 @@ impl<'a> Password<'a> {
}
}
fn prompt_password(&self, render: &mut TermThemeRenderer, prompt: &str) -> io::Result<String> {
fn prompt_password(
&self,
render: &mut TermThemeRenderer<'_>,
prompt: &str,
) -> io::Result<String> {
loop {
render.password_prompt(prompt)?;
render.term().flush()?;

View File

@ -573,7 +573,9 @@ impl<'a> TermThemeRenderer<'a> {
self.height += 1;
}
fn write_formatted_str<F: FnOnce(&mut TermThemeRenderer, &mut dyn fmt::Write) -> fmt::Result>(
fn write_formatted_str<
F: FnOnce(&mut TermThemeRenderer<'_>, &mut dyn fmt::Write) -> fmt::Result,
>(
&mut self,
f: F,
) -> io::Result<()> {
@ -583,7 +585,9 @@ impl<'a> TermThemeRenderer<'a> {
self.term.write_str(&buf)
}
fn write_formatted_line<F: FnOnce(&mut TermThemeRenderer, &mut dyn fmt::Write) -> fmt::Result>(
fn write_formatted_line<
F: FnOnce(&mut TermThemeRenderer<'_>, &mut dyn fmt::Write) -> fmt::Result,
>(
&mut self,
f: F,
) -> io::Result<()> {
@ -594,7 +598,7 @@ impl<'a> TermThemeRenderer<'a> {
}
fn write_formatted_prompt<
F: FnOnce(&mut TermThemeRenderer, &mut dyn fmt::Write) -> fmt::Result,
F: FnOnce(&mut TermThemeRenderer<'_>, &mut dyn fmt::Write) -> fmt::Result,
>(
&mut self,
f: F,

View File

@ -13,9 +13,9 @@ use handlebars::Handlebars;
use include_dir::Dir;
pub fn render<P: AsRef<Path>>(
handlebars: &Handlebars,
handlebars: &Handlebars<'_>,
data: &BTreeMap<&str, serde_json::Value>,
dir: &Dir,
dir: &Dir<'_>,
out_dir: P,
) -> crate::Result<()> {
create_dir_all(out_dir.as_ref().join(dir.path()))?;

View File

@ -2,8 +2,6 @@
// SPDX-License-Identifier: Apache-2.0
// SPDX-License-Identifier: MIT
extern crate minisign;
use base64::{decode, encode};
use minisign::{sign, KeyPair as KP, SecretKeyBox};
use std::{

View File

@ -12,7 +12,7 @@ use anyhow::Context;
use handlebars::{to_json, Handlebars};
use include_dir::{include_dir, Dir};
const TEMPLATE_DIR: Dir = include_dir!("templates/app");
const TEMPLATE_DIR: Dir<'_> = include_dir!("templates/app");
pub struct Init {
force: bool,

View File

@ -13,8 +13,8 @@ use include_dir::{include_dir, Dir};
use std::{collections::BTreeMap, env::current_dir, fs::remove_dir_all, path::PathBuf};
const BACKEND_PLUGIN_DIR: Dir = include_dir!("templates/plugin/backend");
const API_PLUGIN_DIR: Dir = include_dir!("templates/plugin/with-api");
const BACKEND_PLUGIN_DIR: Dir<'_> = include_dir!("templates/plugin/backend");
const API_PLUGIN_DIR: Dir<'_> = include_dir!("templates/plugin/with-api");
pub struct Plugin {
plugin_name: String,

View File

@ -6,7 +6,8 @@ authors = ["you"]
license = ""
repository = ""
default-run = "app"
edition = "2018"
edition = "2021"
rust-version = "1.56"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

View File

@ -6,7 +6,7 @@ use_small_heuristics = "Default"
reorder_imports = true
reorder_modules = true
remove_nested_parens = true
edition = "2018"
edition = "2021"
merge_derives = true
use_try_shorthand = false
use_field_init_shorthand = false

View File

@ -3,7 +3,8 @@ name = "tauri-plugin-{{ plugin_name }}"
version = "0.0.0"
authors = [ "{{ author }}" ]
description = ""
edition = "2018"
edition = "2021"
rust-version = "1.56"
exclude = ["/examples"]
[dependencies]

View File

@ -4,7 +4,8 @@ version = "0.1.0"
description = "A Tauri App"
authors = [ "{{ author }}" ]
repository = ""
edition = "2018"
edition = "2021"
rust-version = "1.56"
[dependencies]
serde_json = "1.0"

View File

@ -6,7 +6,7 @@ use_small_heuristics = "Default"
reorder_imports = true
reorder_modules = true
remove_nested_parens = true
edition = "2018"
edition = "2021"
merge_derives = true
use_try_shorthand = false
use_field_init_shorthand = false

View File

@ -6,7 +6,7 @@ use_small_heuristics = "Default"
reorder_imports = true
reorder_modules = true
remove_nested_parens = true
edition = "2018"
edition = "2021"
merge_derives = true
use_try_shorthand = false
use_field_init_shorthand = false

View File

@ -3,7 +3,8 @@ name = "tauri-plugin-{{ plugin_name }}"
version = "0.0.0"
authors = [ "{{ author }}" ]
description = ""
edition = "2018"
edition = "2021"
rust-version = "1.56"
exclude = ["/examples", "/webview-dist", "/webview-src", "node_modules"]
[dependencies]

View File

@ -4,7 +4,8 @@ version = "0.1.0"
description = "A Tauri App"
authors = [ "{{ author }}" ]
repository = ""
edition = "2018"
edition = "2021"
rust-version = "1.56"
[dependencies]
serde_json = "1.0"

View File

@ -6,7 +6,7 @@ use_small_heuristics = "Default"
reorder_imports = true
reorder_modules = true
remove_nested_parens = true
edition = "2018"
edition = "2021"
merge_derives = true
use_try_shorthand = false
use_field_init_shorthand = false

View File

@ -6,7 +6,7 @@ use_small_heuristics = "Default"
reorder_imports = true
reorder_modules = true
remove_nested_parens = true
edition = "2018"
edition = "2021"
merge_derives = true
use_try_shorthand = false
use_field_init_shorthand = false

View File

@ -2,7 +2,8 @@
name = "<%= name %>"
version = "1.0.0"
categories = ["wasm"]
edition = "2018"
edition = "2021"
rust-version = "1.56"
description = ""
[profile.release]

View File

@ -11,7 +11,8 @@ repository = "https://github.com/tauri-apps/tauri"
description = "Webdriver server for Tauri applications"
readme = "README.md"
exclude = [ ".license_template", "/target" ]
edition = "2018"
edition = "2021"
rust-version = "1.56"
[dependencies]
anyhow = "1"