You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
36 lines
1.4 KiB
36 lines
1.4 KiB
6 years ago
|
From 7a6a33fc6290dbb712f6c2682f6054ec467d718d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||
|
|
Date: Tue, 7 May 2019 14:06:40 +0200
|
||
|
|
Subject: [PATCH] chore: Update glob to 0.3
|
||
|
|
|
||
|
|
Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
|
||
|
|
---
|
||
|
|
build/common.rs | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/build/common.rs b/build/common.rs
|
||
|
|
index 44e58e0..ed69d4b 100644
|
||
|
|
--- a/build/common.rs
|
||
|
|
+++ b/build/common.rs
|
||
|
|
@@ -77,7 +77,7 @@ fn search_directory(directory: &Path, filenames: &[String]) -> Vec<(PathBuf, Str
|
||
|
|
options.require_literal_separator = true;
|
||
|
|
|
||
|
|
paths.flat_map(|p| {
|
||
|
|
- if let Ok(paths) = glob::glob_with(&p, &options) {
|
||
|
|
+ if let Ok(paths) = glob::glob_with(&p, options) {
|
||
|
|
paths.filter_map(Result::ok).collect()
|
||
|
|
} else {
|
||
|
|
vec![]
|
||
|
|
@@ -155,7 +155,7 @@ pub fn search_libclang_directories(files: &[String], variable: &str) -> Vec<(Pat
|
||
|
|
options.case_sensitive = false;
|
||
|
|
options.require_literal_separator = true;
|
||
|
|
for directory in directories.iter().rev() {
|
||
|
|
- if let Ok(directories) = glob::glob_with(directory, &options) {
|
||
|
|
+ if let Ok(directories) = glob::glob_with(directory, options) {
|
||
|
|
for directory in directories.filter_map(Result::ok).filter(|p| p.is_dir()) {
|
||
|
|
found.extend(search_directories(&directory, files));
|
||
|
|
}
|
||
|
|
--
|
||
|
|
2.21.0
|
||
|
|
|