From 058c2daba1b81804d9f803e57c72f5702c124d9e Mon Sep 17 00:00:00 2001 From: Aleksey Kladov Date: Tue, 6 Aug 2019 13:27:00 +0200 Subject: push glob errors outwards --- crates/ra_vfs_glob/src/lib.rs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/crates/ra_vfs_glob/src/lib.rs b/crates/ra_vfs_glob/src/lib.rs index 3e54da5fe..12401d75a 100644 --- a/crates/ra_vfs_glob/src/lib.rs +++ b/crates/ra_vfs_glob/src/lib.rs @@ -5,9 +5,11 @@ //! //! It's also possible to add custom exclusion globs. -use globset::{Glob, GlobSet, GlobSetBuilder}; +use globset::{GlobSet, GlobSetBuilder}; use ra_vfs::{Filter, RelativePath}; +pub use globset::{Glob, GlobBuilder}; + const ALWAYS_IGNORED: &[&str] = &["target/**", "**/node_modules/**", "**/.git/**"]; const IGNORED_FOR_NON_MEMBERS: &[&str] = &["examples/**", "tests/**", "benches/**"]; @@ -27,9 +29,9 @@ impl RustPackageFilterBuilder { self.is_member = is_member; self } - pub fn exclude(mut self, glob: &str) -> Result { - self.exclude.add(Glob::new(glob)?); - Ok(self) + pub fn exclude(mut self, glob: Glob) -> RustPackageFilterBuilder { + self.exclude.add(glob); + self } pub fn into_vfs_filter(self) -> Box { let RustPackageFilterBuilder { is_member, mut exclude } = self; @@ -85,8 +87,7 @@ fn test_globs() { let filter = RustPackageFilterBuilder::default() .set_member(true) - .exclude("src/llvm-project/**") - .unwrap() + .exclude(Glob::new("src/llvm-project/**").unwrap()) .into_vfs_filter(); assert!(!filter.include_dir(RelativePath::new("src/llvm-project/clang"))); -- cgit v1.2.3