Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: rust-lang/regex
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 1.10.5
Choose a base ref
...
head repository: rust-lang/regex
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 1.10.6
Choose a head ref
  • 7 commits
  • 6 files changed
  • 2 contributors

Commits on Jun 9, 2024

  1. regex-lite-0.1.6

    @BurntSushi
    BurntSushi committed Jun 9, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    1288b83 View commit details

  2. regex-test: bump toml dependency

    @BurntSushi
    BurntSushi committed Jun 9, 2024
    Copy the full SHA
    c2f9ca4 View commit details

  3. regex-test-0.1.1

    @BurntSushi
    BurntSushi committed Jun 9, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    c4c76a1 View commit details

  4. regex-cli-0.2.1

    @BurntSushi
    BurntSushi committed Jun 9, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    8856fe3 View commit details

Commits on Aug 2, 2024

  1. unstable: fit Pattern trait implementation 

    This is an update from a change made to the trait:
rust-lang/rust#127481

There shouldn't be any behavior changes here.

PR #1219
    @mischnic
    mischnic authored Aug 2, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    2970d29 View commit details

  2. changelog: 1.10.6

    @BurntSushi
    BurntSushi committed Aug 2, 2024
    Copy the full SHA
    76f2d30 View commit details

  3. 1.10.6

    @BurntSushi
    BurntSushi committed Aug 2, 2024
    Loading
    Loading status checks…
    Copy the full SHA
    ab88aa5 View commit details
Showing with 19 additions and 8 deletions.
  1. +11 −0 CHANGELOG.md
  2. +1 −1 Cargo.toml
  3. +1 −1 regex-cli/Cargo.toml
  4. +1 −1 regex-lite/Cargo.toml
  5. +2 −2 regex-test/Cargo.toml
  6. +3 −3 src/pattern.rs
11 changes: 11 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
1.10.6 (2024-08-02)
===================
This is a new patch release with a fix for the `unstable` crate feature that
enables `std::str::Pattern` trait integration.

Bug fixes:

* [BUG #1219](https://github.com/rust-lang/regex/pull/1219):
Fix the `Pattern` trait implementation as a result of nightly API breakage.


1.10.5 (2024-06-09)
===================
This is a new patch release with some minor fixes.
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "regex"
version = "1.10.5" #:version
version = "1.10.6" #:version
authors = ["The Rust Project Developers", "Andrew Gallant <jamslam@gmail.com>"]
license = "MIT OR Apache-2.0"
readme = "README.md"
2 changes: 1 addition & 1 deletion regex-cli/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "regex-cli"
version = "0.2.0" #:version
version = "0.2.1" #:version
authors = ["The Rust Project Developers", "Andrew Gallant <jamslam@gmail.com>"]
description = """
A command line tool for debugging, ad hoc benchmarking and generating regular
2 changes: 1 addition & 1 deletion regex-lite/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "regex-lite"
version = "0.1.5" #:version
version = "0.1.6" #:version
authors = ["The Rust Project Developers", "Andrew Gallant <jamslam@gmail.com>"]
license = "MIT OR Apache-2.0"
repository = "https://github.com/rust-lang/regex/tree/master/regex-lite"
4 changes: 2 additions & 2 deletions regex-test/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "regex-test"
version = "0.1.0" #:version
version = "0.1.1" #:version
authors = ["The Rust Project Developers", "Andrew Gallant <jamslam@gmail.com>"]
description = """
Infrastructure for testing regexes.
@@ -24,4 +24,4 @@ path = "lib.rs"
anyhow = "1.0.27"
bstr = { version = "1.3.0", default-features = false, features = ["std", "serde"] }
serde = { version = "1.0.105", features = ["derive"] }
toml = { version = "0.7.3", default-features = false, features = ["parse"] }
toml = { version = "0.8.14", default-features = false, features = ["parse"] }
6 changes: 3 additions & 3 deletions src/pattern.rs
View file
Original file line number Diff line number Diff line change
@@ -10,10 +10,10 @@ pub struct RegexSearcher<'r, 't> {
next_match: Option<(usize, usize)>,
}

impl<'r, 't> Pattern<'t> for &'r Regex {
type Searcher = RegexSearcher<'r, 't>;
impl<'r> Pattern for &'r Regex {
type Searcher<'t> = RegexSearcher<'r, 't>;

fn into_searcher(self, haystack: &'t str) -> RegexSearcher<'r, 't> {
fn into_searcher<'t>(self, haystack: &'t str) -> RegexSearcher<'r, 't> {
RegexSearcher {
haystack,
it: self.find_iter(haystack),