updated to rust 1.64.0 (#7)

Author: lmapii

.github/workflows/ci.yml

@@ -59,9 +59,9 @@ jobs:
         # alternatively matrix could be shared and specified via .json
         # see https://github.community/t/how-to-share-matrix-between-jobs/128595/8
         # ---
-          - { build: 'linux-x86_64-pinned',   os: 'ubuntu-18.04',   target: 'x86_64-unknown-linux-gnu',      cross: false, rust: 1.62.0 }
-          - { build: 'windows-x86_64-pinned', os: 'windows-2019',   target: 'x86_64-pc-windows-msvc',        cross: false, rust: 1.62.0 }
-          - { build: 'macos-x86_64-pinned',   os: 'macos-latest',   target: 'x86_64-apple-darwin',           cross: false, rust: 1.62.0 }
+          - { build: 'linux-x86_64-pinned',   os: 'ubuntu-18.04',   target: 'x86_64-unknown-linux-gnu',      cross: false, rust: 1.64.0 }
+          - { build: 'windows-x86_64-pinned', os: 'windows-2019',   target: 'x86_64-pc-windows-msvc',        cross: false, rust: 1.64.0 }
+          - { build: 'macos-x86_64-pinned',   os: 'macos-latest',   target: 'x86_64-apple-darwin',           cross: false, rust: 1.64.0 }
           - { build: 'linux-x86_64',          os: 'ubuntu-latest',  target: 'x86_64-unknown-linux-gnu',      cross: false, rust: stable }
           - { build: 'linux-i686',            os: 'ubuntu-latest',  target: 'i686-unknown-linux-gnu',        cross: true,  rust: stable }
           - { build: 'linux-arm',             os: 'ubuntu-latest',  target: 'aarch64-unknown-linux-gnu',     cross: true,  rust: stable } # aarch64

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "run-clang-tidy"
-version = "0.1.2"
+version = "0.1.3"
 authors = ["Martin Lampacher <[email protected]>"]
 description = """
 Cross platform CLI wrapper for executing clang-tidy based paths or globs specified

Cargo.toml

@@ -51,12 +51,17 @@ pub struct JsonModel {
     pub name: String,
 }
 
+// goal: have compatible .json configuration files for clang-format and clang-tidy
+// it should be possible to specify all command line options and non-unit relative paths
+// using the command line, such that they can be set using ENV variables
+
 #[derive(Debug)]
 pub struct Data {
     /// Json input data
     pub json: JsonModel,
     /// Command-line override for the tidy file
     pub tidy_file: Option<path::PathBuf>,
+    // TODO: add tidy_root override
     /// Command-line override for the build root folder
     pub build_root: Option<path::PathBuf>,
     /// Command-line override for the clang-tidy executable

src/cli/mod.rs

@@ -148,7 +148,7 @@ where
     let is_file = path
         .as_ref()
         .file_name()
-        .and_then(|file_name| (path.as_ref().as_os_str() == file_name).then(|| true))
+        .and_then(|file_name| (path.as_ref().as_os_str() == file_name).then_some(true))
         .is_some();
 
     if is_file {

src/cli/utils.rs

@@ -48,9 +48,9 @@ pub fn build_glob_set_from<'a>(
 }
 
 pub fn match_paths<P>(
-    candidates: Vec<globmatch::Matcher<P>>,
-    filter: Option<Vec<globmatch::GlobSet>>,
-    filter_post: Option<Vec<globmatch::GlobSet>>,
+    candidates: Vec<globmatch::Matcher<'_, P>>,
+    filter: Option<Vec<globmatch::GlobSet<'_>>>,
+    filter_post: Option<Vec<globmatch::GlobSet<'_>>>,
 ) -> (Vec<path::PathBuf>, Vec<path::PathBuf>)
 where
     P: AsRef<path::Path>,

src/lib/globs.rs

@@ -269,7 +269,7 @@ mod tests {
                 let is_file = path
                     .path
                     .file_name()
-                    .and_then(|file_name| (path.path.as_os_str() == file_name).then(|| file_name))
+                    .and_then(|file_name| (path.path.as_os_str() == file_name).then_some(file_name))
                     .is_some();
 
                 assert_eq!(path.is_file, is_file);

src/lib/resolve.rs

@@ -1,3 +1,5 @@
+#![warn(rust_2018_idioms)]
+
 pub mod cli;
 pub mod cmd;
 mod lib;