From d13dcd9fd8d30b1db147a78cecb878e924382274 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 17 Oct 2020 19:00:22 -0300
Subject: [PATCH] chore(deps) Update Tauri Bundler (#1045)

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
---
 .changes/rust-update.md                  |  5 ++++
 cli/tauri-bundler/Cargo.toml             |  4 +--
 cli/tauri-bundler/src/bundle/settings.rs | 34 +++++-------------------
 rust-toolchain                           |  2 +-
 4 files changed, 14 insertions(+), 31 deletions(-)
 create mode 100644 .changes/rust-update.md

diff --git a/.changes/rust-update.md b/.changes/rust-update.md
new file mode 100644
index 000000000..61556af50
--- /dev/null
+++ b/.changes/rust-update.md
@@ -0,0 +1,5 @@
+---
+"tauri": patch
+---
+
+Update minimum Rust version to 1.42.0 due to a dependency update.
diff --git a/cli/tauri-bundler/Cargo.toml b/cli/tauri-bundler/Cargo.toml
index a2e96d044..21396301b 100644
--- a/cli/tauri-bundler/Cargo.toml
+++ b/cli/tauri-bundler/Cargo.toml
@@ -35,14 +35,14 @@ strsim = "0.10.0"
 tar = "0.4"
 target_build_utils = "0.3"
 term = "0.6.1"
-toml = "0.5.6"
+toml = "0.5.7"
 uuid = { version = "0.8", features = [ "v5" ] }
 walkdir = "2"
 lazy_static = { version = "1.4" }
 handlebars = { version = "3.5" }
 
 [target."cfg(target_os = \"windows\")".dependencies]
-attohttpc = { version = "0.15.0" }
+attohttpc = { version = "0.16.0" }
 regex = { version = "1" }
 runas = "0.2"
 
diff --git a/cli/tauri-bundler/src/bundle/settings.rs b/cli/tauri-bundler/src/bundle/settings.rs
index 2cc85634c..8d12c1bfd 100644
--- a/cli/tauri-bundler/src/bundle/settings.rs
+++ b/cli/tauri-bundler/src/bundle/settings.rs
@@ -646,12 +646,7 @@ impl Settings {
 
   /// Returns the bundle's identifier
   pub fn bundle_identifier(&self) -> &str {
-    self
-      .bundle_settings
-      .identifier
-      .as_ref()
-      .map(String::as_str)
-      .unwrap_or("")
+    self.bundle_settings.identifier.as_deref().unwrap_or("")
   }
 
   /// Returns an iterator over the icon files to be used for this bundle.
@@ -720,7 +715,7 @@ impl Settings {
 
   /// Returns the copyright text.
   pub fn copyright_string(&self) -> Option<&str> {
-    self.bundle_settings.copyright.as_ref().map(String::as_str)
+    self.bundle_settings.copyright.as_deref()
   }
 
   /// Returns the list of authors name.
@@ -743,12 +738,7 @@ impl Settings {
 
   /// Returns the package's homepage URL, defaulting to "" if not defined.
   pub fn homepage_url(&self) -> &str {
-    &self
-      .package
-      .homepage
-      .as_ref()
-      .map(String::as_str)
-      .unwrap_or("")
+    &self.package.homepage.as_deref().unwrap_or("")
   }
 
   /// Returns the app's category.
@@ -767,11 +757,7 @@ impl Settings {
 
   /// Returns the app's long description.
   pub fn long_description(&self) -> Option<&str> {
-    self
-      .bundle_settings
-      .long_description
-      .as_ref()
-      .map(String::as_str)
+    self.bundle_settings.long_description.as_deref()
   }
 
   /// Returns the dependencies of the debian bundle.
@@ -797,20 +783,12 @@ impl Settings {
 
   /// Returns the minimum system version of the macOS bundle.
   pub fn osx_minimum_system_version(&self) -> Option<&str> {
-    self
-      .bundle_settings
-      .osx_minimum_system_version
-      .as_ref()
-      .map(String::as_str)
+    self.bundle_settings.osx_minimum_system_version.as_deref()
   }
 
   /// Returns the path to the DMG bundle license.
   pub fn osx_license(&self) -> Option<&str> {
-    self
-      .bundle_settings
-      .osx_license
-      .as_ref()
-      .map(String::as_str)
+    self.bundle_settings.osx_license.as_deref()
   }
 
   /// Returns whether the macOS .app bundle should use the bootstrap script or not.
diff --git a/rust-toolchain b/rust-toolchain
index 7d47e5998..a50908ca3 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.41.0
+1.42.0