Skip to content

minor improvements #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
imnotpoz wants to merge 3 commits into
base: main
Choose a base branch
from
Open

minor improvements #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f801011
derive `Copy` and `Clone` for `ErrorKind`
imnotpoz Aug 16, 2025
a9fea82
derive `Clone` for `RegexError`
imnotpoz Aug 16, 2025
ab3dfc5
fix char casts in ffi calls
imnotpoz Aug 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/approx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// See LICENSE file in the project root for full license text.

use std::borrow::Cow;
use std::ffi::c_int;
use std::ffi::{c_char, c_int};
use std::hint::unreachable_unchecked;

use crate::{
Expand Down Expand Up @@ -372,7 +372,7 @@ impl Regex {
let result = unsafe {
tre::tre_reganexec(
compiled_reg_obj,
data.as_ptr().cast::<i8>(),
data.as_ptr().cast::<c_char>(),
data.len(),
&mut amatch,
*params.get(),
Expand Down
4 changes: 2 additions & 2 deletions src/err.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ impl BindingErrorCode {
/// Type of error: `Binding` (see [`BindingErrorCode`]), or `Tre`
///
/// See the TRE documentation for more information on valid error codes for `Tre`.
#[derive(Debug, PartialEq, Eq)]
#[derive(Debug, Copy, Clone, PartialEq, Eq)]
pub enum ErrorKind {
/// Binding-specific error
Binding(BindingErrorCode),
Expand All @@ -39,7 +39,7 @@ pub enum ErrorKind {
}

/// Error type returned in results
#[derive(Debug, PartialEq, Eq)]
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct RegexError {
/// Kind of error
pub kind: ErrorKind,
Expand Down
3 changes: 2 additions & 1 deletion src/exec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
// See LICENSE file in the project root for full license text.

use std::borrow::Cow;
use std::ffi::c_char;
use std::hint::unreachable_unchecked;

use crate::{err::{BindingErrorCode, ErrorKind, RegexError, Result}, flags::RegexecFlags, tre, Regex};
Expand Down Expand Up @@ -169,7 +170,7 @@ impl Regex {
let result = unsafe {
tre::tre_regnexec(
compiled_reg_obj,
data.as_ptr().cast::<i8>(),
data.as_ptr().cast::<c_char>(),
data.len(),
nmatches,
match_vec.as_mut_ptr(),
Expand Down