Incorporate UTF-32 changes

.github/workflows/ci.yml

@@ -0,0 +1,75 @@
+name: ci
+on:
+  pull_request:
+  push:
+    branches:
+    - master
+  schedule:
+  - cron: '00 01 * * *'
+jobs:
+  test:
+    name: test
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        build:
+        - pinned
+        - stable
+        - beta
+        - nightly
+        - macos
+        - win-msvc
+        - win-gnu
+        include:
+        - build: pinned
+          os: ubuntu-latest
+          rust: 1.70.0
+        - build: stable
+          os: ubuntu-latest
+          rust: stable
+        - build: beta
+          os: ubuntu-latest
+          rust: beta
+        - build: nightly
+          os: ubuntu-latest
+          rust: nightly
+        - build: macos
+          os: macos-latest
+          rust: stable
+        - build: win-msvc
+          os: windows-latest
+          rust: stable
+        - build: win-gnu
+          os: windows-latest
+          rust: stable-x86_64-gnu
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: ${{ matrix.rust }}
+    - name: Build
+      run: cargo build --verbose --all --features utf32
+    - name: Build docs
+      run: cargo doc --verbose --all --features utf32
+    - name: Run tests
+      run: cargo test --verbose --all --features utf32
+    - name: Run tests with static build
+      shell: bash
+      run: PCRE2_SYS_STATIC=1 cargo test --verbose --all  --features utf32
+
+  rustfmt:
+    name: rustfmt
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v3
+    - name: Install Rust
+      uses: dtolnay/rust-toolchain@master
+      with:
+        toolchain: stable
+        components: rustfmt
+    - name: Check formatting
+      run: |
+        cargo fmt --all -- --check

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "pcre2-sys/pcre2"]
-	path = pcre2-sys/pcre2
-  url = https://github.com/BurntSushi/pcre2-mirror
-	branch = release/10.32

Cargo.toml

@@ -1,28 +1,30 @@
 [package]
 name = "pcre2"
-version = "0.2.3"  #:version
-authors = ["Andrew Gallant <jamslam@gmail.com>"]
-description = "High level wrapper library for PCRE2."
+version = "0.2.9"                                       #:version
+authors = ["Andrew Gallant <jamslam@gmail.com>", "fish-shell contributors"]
+description = "High level wrapper library for PCRE2, with UTF-32 support."
 documentation = "https://docs.rs/pcre2"
-homepage = "https://github.com/BurntSushi/rust-pcre2"
-repository = "https://github.com/BurntSushi/rust-pcre2"
+homepage = "https://github.com/fish-shell/rust-pcre2"
+repository = "https://github.com/fish-shell/rust-pcre2"
 readme = "README.md"
 keywords = ["pcre", "pcre2", "regex", "jit", "perl"]
-license = "Unlicense/MIT"
+license = "Unlicense OR MIT"
 categories = ["text-processing"]
 edition = "2021"
 
 [workspace]
 members = ["pcre2-sys"]
 
+[dependencies]
+libc = "0.2.146"
+log = "0.4.19"
+pcre2-sys = { version = "0.2.9", path = "pcre2-sys" }
+
 [features]
-default = ["utf8"]
-utf8 = ["pcre2-sys/utf8"]
+default = ["jit"]
+
+# Enable matching on UTF-32 strings
 utf32 = ["pcre2-sys/utf32"]
-static-pcre2 = []
 
-[dependencies]
-libc = "0.2.46"
-log = "0.4.5"
-pcre2-sys = { version = "0.2.0", path = "pcre2-sys" }
-thread_local = "1"
+# Enable the PCRE2 JIT
+jit = ["pcre2-sys/jit"]

README.md

@@ -1,7 +1,27 @@
-# pcre2
-
+pcre2
+=====
 A high level Rust wrapper library for [PCRE2](https://www.pcre.org/).
 
+[![Build status](https://github.com/BurntSushi/rust-pcre2/workflows/ci/badge.svg)](https://github.com/BurntSushi/rust-pcre2/actions)
+[![crates.io](https://img.shields.io/crates/v/pcre2.svg)](https://crates.io/crates/pcre2)
+
 Dual-licensed under MIT or the [UNLICENSE](https://unlicense.org/).
 
-This has been forked to support UTF-32 matching, for use in fish-shell.
+
+### Documentation
+
+https://docs.rs/pcre2
+
+
+### Usage
+
+Run `cargo add pcre2` to add this crate to your `Cargo.toml` file.
+
+
+### Notes
+
+Currently, this is a fairly light layer around PCRE2 itself and does not even
+come close to covering all of its functionality. There are no specific plans
+in place to build out the wrapper further, but PRs for making more of PCRE2
+available are welcome, although my bandwidth for maintenance is limited. If
+you're interested in sharing this maintenance burden, please reach out.

pcre2-sys/.gitignore

@@ -0,0 +1 @@
+/tmp

pcre2-sys/Cargo.toml

@@ -1,26 +1,24 @@
 [package]
 name = "pcre2-sys"
-version = "0.2.4"  #:version
-authors = ["Andrew Gallant <jamslam@gmail.com>"]
+version = "0.2.9"  #:version
+authors = ["Andrew Gallant <jamslam@gmail.com>", "fish-shell contributors"]
 description = "Low level bindings to PCRE2."
 documentation = "https://docs.rs/pcre2-sys"
-homepage = "https://github.com/BurntSushi/rust-pcre2"
-repository = "https://github.com/BurntSushi/rust-pcre2"
+homepage = "https://github.com/fish-shell/rust-pcre2"
+repository = "https://github.com/fish-shell/rust-pcre2"
 readme = "README.md"
 keywords = ["pcre", "pcre2", "regex", "jit"]
-license = "Unlicense/MIT"
+license = "Unlicense OR MIT"
 categories = ["external-ffi-bindings"]
-edition = "2018"
-
-[features]
-default = ["utf8"]
-utf8 = []
-utf32 = []
-
+edition = "2021"
 
 [dependencies]
-libc = "0.2"
+libc = "0.2.146"
 
 [build-dependencies]
-cc = { version = "1", features = ["parallel"] }
-pkg-config = "0.3.13"
+cc = { version = "1.0.73", features = ["parallel"] }
+pkg-config = "0.3.27"
+
+[features]
+utf32 = []
+jit = []

pcre2-sys/README.md

@@ -2,9 +2,8 @@ pcre2-sys
 =========
 Bindings for [PCRE2](https://www.pcre.org/).
 
-[![Linux build status](https://api.travis-ci.org/BurntSushi/rust-pcre2.png)](https://travis-ci.org/BurntSushi/rust-pcre2)
-[![Windows build status](https://ci.appveyor.com/api/projects/status/github/BurntSushi/rust-pcre2?svg=true)](https://ci.appveyor.com/project/BurntSushi/rust-pcre2)
-[![](https://meritbadge.herokuapp.com/pcre2-sys)](https://crates.io/crates/pcre2-sys)
+[![Build status](https://github.com/BurntSushi/rust-pcre2/workflows/ci/badge.svg)](https://github.com/BurntSushi/rust-pcre2/actions)
+[![crates.io](https://img.shields.io/crates/v/pcre2-sys.svg)](https://crates.io/crates/pcre2-sys)
 
 Dual-licensed under MIT or the [UNLICENSE](https://unlicense.org/).
 
@@ -16,18 +15,7 @@ https://docs.rs/pcre2-sys
 
 ### Usage
 
-Add this to your `Cargo.toml`:
-
-```toml
-[dependencies]
-pcre2-sys = "0.2"
-```
-
-and this to your crate root:
-
-```rust
-extern crate pcre2_sys;
-```
+Run `cargo add pcre2-sys` to add this crate to your `Cargo.toml` file.
 
 
 ### Notes
@@ -36,7 +24,7 @@ As a `-sys` crate, this exposes only the bindings to PCRE2 based on the header
 file. The PCRE2 documentation itself should be consulted in order to use this
 crate.
 
-The bindings for this crate were generated for PCRE **10.31**. This crate
+The bindings for this crate were generated for PCRE **10.42**. This crate
 intends to track the current release of PCRE2.
 
 The build script for this crate prefers dynamically linking with the host's
@@ -56,7 +44,7 @@ may work, and PRs to support them are welcome.
 
 If you're compiling this crate on Windows with the GNU toolchain, then you'll
 need to make sure you have a compatible C compiler installed, such as the one
-provided by the [mingw-w64](http://mingw-w64.org) project.
+provided by the [MinGW-w64](https://www.mingw-w64.org/) project.
 
 Set the `PCRE2_SYS_DEBUG` flag to forcefully enable debug symbols when doing a
 static build, even when compiling in release mode.