diff options
author | Andrew Gallant <jamslam@gmail.com> | 2020-01-09 20:58:28 -0500 |
---|---|---|
committer | Andrew Gallant <jamslam@gmail.com> | 2020-01-10 15:07:47 -0500 |
commit | cb2f6ddc61b79b7acf59bb00a6be9f1740aa55b8 (patch) | |
tree | 0cb0fcde892ee041c0c56d0ad77e507342069edc /ignore/src | |
parent | bd7a42602f090efaea228c79fce045642b1414a4 (diff) |
deps: update to thread_local 1.0
We also update the pcre2 and regex dependencies, which removes any other
lingering uses of thread_local 0.3.
Diffstat (limited to 'ignore/src')
-rw-r--r-- | ignore/src/gitignore.rs | 2 | ||||
-rw-r--r-- | ignore/src/types.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ignore/src/gitignore.rs b/ignore/src/gitignore.rs index 01bcda3b..e9510dd0 100644 --- a/ignore/src/gitignore.rs +++ b/ignore/src/gitignore.rs @@ -249,7 +249,7 @@ impl Gitignore { return Match::None; } let path = path.as_ref(); - let _matches = self.matches.as_ref().unwrap().get_default(); + let _matches = self.matches.as_ref().unwrap().get_or_default(); let mut matches = _matches.borrow_mut(); let candidate = Candidate::new(path); self.set.matches_candidate_into(&candidate, &mut *matches); diff --git a/ignore/src/types.rs b/ignore/src/types.rs index 07d68e15..1ff31289 100644 --- a/ignore/src/types.rs +++ b/ignore/src/types.rs @@ -515,7 +515,7 @@ impl Types { return Match::None; } }; - let mut matches = self.matches.get_default().borrow_mut(); + let mut matches = self.matches.get_or_default().borrow_mut(); self.set.matches_into(name, &mut *matches); // The highest precedent match is the last one. if let Some(&i) = matches.last() { |