From 4b620c1a26fd519453ad7a4617814e8b475c047a Mon Sep 17 00:00:00 2001 From: Lucas <24826124+Luro02@users.noreply.github.com> Date: Wed, 5 May 2021 09:17:24 +0200 Subject: [PATCH 1/4] tests: test pattern feature --- test | 1 + 1 file changed, 1 insertion(+) diff --git a/test b/test index b10564f12..59d57eede 100755 --- a/test +++ b/test @@ -21,6 +21,7 @@ features=( "std perf-dfa" "std perf-inline" "std perf-literal" + "std pattern" ) for f in "${features[@]}"; do echo "===== FEATURE: $f (default) ===" From 65aa5e9bdc279fd083adf2dc7e86c59557cd8674 Mon Sep 17 00:00:00 2001 From: Lucas <24826124+Luro02@users.noreply.github.com> Date: Wed, 5 May 2021 09:19:41 +0200 Subject: [PATCH 2/4] fix compilation with pattern feature --- src/pattern.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pattern.rs b/src/pattern.rs index e94266709..739747a76 100644 --- a/src/pattern.rs +++ b/src/pattern.rs @@ -1,6 +1,6 @@ use std::str::pattern::{Pattern, SearchStep, Searcher}; -use re_unicode::{Matches, Regex}; +use crate::re_unicode::{Matches, Regex}; pub struct RegexSearcher<'r, 't> { haystack: &'t str, From 9958f849dbcd0cbe67888745d09645dd80416407 Mon Sep 17 00:00:00 2001 From: Lucas <24826124+Luro02@users.noreply.github.com> Date: Wed, 5 May 2021 09:20:49 +0200 Subject: [PATCH 3/4] derive Debug for RegexSearcher --- src/pattern.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pattern.rs b/src/pattern.rs index 739747a76..b4ffd8e16 100644 --- a/src/pattern.rs +++ b/src/pattern.rs @@ -2,6 +2,7 @@ use std::str::pattern::{Pattern, SearchStep, Searcher}; use crate::re_unicode::{Matches, Regex}; +#[derive(Debug)] pub struct RegexSearcher<'r, 't> { haystack: &'t str, it: Matches<'r, 't>, From b6c763603af644ee1d5c8336061a1570b76ca148 Mon Sep 17 00:00:00 2001 From: Lucas <24826124+Luro02@users.noreply.github.com> Date: Wed, 5 May 2021 17:57:08 +0200 Subject: [PATCH 4/4] ci: test pattern feature with nightly --- .github/workflows/ci.yml | 5 +++++ test | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 48fffb52d..659cfce65 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -151,6 +151,11 @@ jobs: cd bench ./run rust --no-run --verbose + - if: matrix.build == 'nightly' + name: Run tests with pattern feature + run: | + cargo test --test default --no-default-features --features 'std pattern unicode-perl' + rustfmt: name: rustfmt runs-on: ubuntu-18.04 diff --git a/test b/test index 59d57eede..b10564f12 100755 --- a/test +++ b/test @@ -21,7 +21,6 @@ features=( "std perf-dfa" "std perf-inline" "std perf-literal" - "std pattern" ) for f in "${features[@]}"; do echo "===== FEATURE: $f (default) ==="