source to target, lint

core/tauri-build/src/lib.rs

@@ -71,7 +71,7 @@ fn copy_binaries(
 
 /// Copies resources to a path.
 fn copy_resources(resources: ResourcePaths<'_>, path: &Path) -> Result<()> {
-  for resource in resources.into_iter() {
+  for resource in resources.iter() {
     let resource = resource?;
     println!("cargo:rerun-if-changed={}", resource.path().display());
     copy_file(resource.path(), path.join(resource.target()))?;

core/tauri-config-schema/schema.json

@@ -1239,7 +1239,7 @@
       ]
     },
     "BundleResources": {
-      "description": "Definition for bundle resources. Can be either a list of paths to include or a map of target to source paths.",
+      "description": "Definition for bundle resources. Can be either a list of paths to include or a map of source to target paths.",
       "anyOf": [
         {
           "description": "A list of paths to include.",
@@ -1249,7 +1249,7 @@
           }
         },
         {
-          "description": "A map of target to source paths.",
+          "description": "A map of source to target paths.",
           "type": "object",
           "additionalProperties": {
             "type": "string"

core/tauri-utils/src/config.rs

@@ -621,14 +621,14 @@ impl Default for WindowsConfig {
 }
 
 /// Definition for bundle resources.
-/// Can be either a list of paths to include or a map of target to source paths.
+/// Can be either a list of paths to include or a map of source to target paths.
 #[derive(Debug, PartialEq, Eq, Clone, Deserialize, Serialize)]
 #[cfg_attr(feature = "schema", derive(JsonSchema))]
 #[serde(rename_all = "camelCase", deny_unknown_fields, untagged)]
 pub enum BundleResources {
   /// A list of paths to include.
   List(Vec<String>),
-  /// A map of target to source paths.
+  /// A map of source to target paths.
   Map(HashMap<String, String>),
 }
 

core/tauri-utils/src/resources.rs

@@ -85,7 +85,7 @@ impl<'a> ResourcePaths<'a> {
 
   /// Returns the resource iterator that yields the source and target paths.
   /// Needed when using [`Self::from_map`].
-  pub fn into_iter(self) -> ResourcePathsIter<'a> {
+  pub fn iter(self) -> ResourcePathsIter<'a> {
     self.iter
   }
 }
@@ -165,8 +165,10 @@ impl<'a> Iterator for ResourcePathsIter<'a> {
           }
           self.current_pattern_is_valid = true;
           return Some(Ok(Resource {
-            target: if let (Some(current_dest), Some(current_pattern)) = (&self.current_dest, &self.current_pattern) {
-              if current_pattern.0.contains("*") {
+            target: if let (Some(current_dest), Some(current_pattern)) =
+              (&self.current_dest, &self.current_pattern)
+            {
+              if current_pattern.0.contains('*') {
                 current_dest.join(path.file_name().unwrap())
               } else {
                 current_dest.join(path.strip_prefix(&current_pattern.1).unwrap())
@@ -215,7 +217,7 @@ impl<'a> Iterator for ResourcePathsIter<'a> {
       match &mut self.pattern_iter {
         PatternIter::Slice(iter) => {
           if let Some(pattern) = iter.next() {
-            self.current_pattern = Some((pattern.to_string(), normalize(&Path::new(pattern))));
+            self.current_pattern = Some((pattern.to_string(), normalize(Path::new(pattern))));
             self.current_pattern_is_valid = false;
             let glob = match glob::glob(pattern) {
               Ok(glob) => glob,
@@ -226,14 +228,16 @@ impl<'a> Iterator for ResourcePathsIter<'a> {
           }
         }
         PatternIter::Map(iter) => {
-          if let Some((dest, pattern)) = iter.next() {
-            self.current_pattern = Some((pattern.to_string(), normalize(&Path::new(pattern))));
+          if let Some((pattern, dest)) = iter.next() {
+            self.current_pattern = Some((pattern.to_string(), normalize(Path::new(pattern))));
             self.current_pattern_is_valid = false;
             let glob = match glob::glob(pattern) {
               Ok(glob) => glob,
               Err(error) => return Some(Err(error.into())),
             };
-            self.current_dest.replace(resource_relpath(&PathBuf::from(dest)));
+            self
+              .current_dest
+              .replace(resource_relpath(&PathBuf::from(dest)));
             self.glob_iter = Some(glob);
             continue;
           }

tooling/bundler/src/bundle/settings.rs

@@ -747,7 +747,7 @@ impl Settings {
 
   /// Copies resources to a path.
   pub fn copy_resources(&self, path: &Path) -> crate::Result<()> {
-    for resource in self.resource_files().into_iter() {
+    for resource in self.resource_files().iter() {
       let resource = resource?;
       let dest = path.join(resource.target());
       common::copy_file(resource.path(), dest)?;

tooling/bundler/src/bundle/windows/msi/wix.rs

@@ -909,7 +909,7 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
 
   let mut added_resources = Vec::new();
 
-  for resource in settings.resource_files().into_iter() {
+  for resource in settings.resource_files().iter() {
     let resource = resource?;
 
     let resource_path = cwd

tooling/cli/schema.json

@@ -1239,7 +1239,7 @@
       ]
     },
     "BundleResources": {
-      "description": "Definition for bundle resources. Can be either a list of paths to include or a map of target to source paths.",
+      "description": "Definition for bundle resources. Can be either a list of paths to include or a map of source to target paths.",
       "anyOf": [
         {
           "description": "A list of paths to include.",
@@ -1249,7 +1249,7 @@
           }
         },
         {
-          "description": "A map of target to source paths.",
+          "description": "A map of source to target paths.",
           "type": "object",
           "additionalProperties": {
             "type": "string"