Skip to content

Remove unnecessary clones #1361

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
FranciscoTGouveia wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove unnecessary clones #1361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb5cf30
Remove unnecessary clones on `regex-automata`
FranciscoTGouveia Jun 5, 2026
3634126
Remove unnecessary clones on `regex-cli` and `src/builders.rs`
FranciscoTGouveia Jun 5, 2026
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 regex-automata/src/dfa/dense.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3659,7 +3659,7 @@ impl<T: AsRef<[u32]>> TransitionTable<T> {
fn as_ref(&self) -> TransitionTable<&'_ [u32]> {
TransitionTable {
table: self.table.as_ref(),
classes: self.classes.clone(),
classes: self.classes,
stride2: self.stride2,
}
}
Expand All @@ -3669,7 +3669,7 @@ impl<T: AsRef<[u32]>> TransitionTable<T> {
fn to_owned(&self) -> TransitionTable<alloc::vec::Vec<u32>> {
TransitionTable {
table: self.table.as_ref().to_vec(),
classes: self.classes.clone(),
classes: self.classes,
stride2: self.stride2,
}
}
Expand Down
2 changes: 1 addition & 1 deletion regex-automata/src/dfa/onepass.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,7 +553,7 @@ impl<'a> InternalBuilder<'a> {
// than it. In the case of a one-pass DFA with no match states, the
// min_match_id will keep this sentinel value.
min_match_id: StateID::MAX,
classes: classes.clone(),
classes: classes,
alphabet_len,
stride2,
pateps_offset: alphabet_len,
Expand Down
4 changes: 2 additions & 2 deletions regex-automata/src/dfa/sparse.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1483,7 +1483,7 @@ impl<T: AsRef<[u8]>> Transitions<T> {
fn as_ref(&self) -> Transitions<&'_ [u8]> {
Transitions {
sparse: self.sparse(),
classes: self.classes.clone(),
classes: self.classes,
state_len: self.state_len,
pattern_len: self.pattern_len,
}
Expand All @@ -1494,7 +1494,7 @@ impl<T: AsRef<[u8]>> Transitions<T> {
fn to_owned(&self) -> Transitions<alloc::vec::Vec<u8>> {
Transitions {
sparse: self.sparse().to_vec(),
classes: self.classes.clone(),
classes: self.classes,
state_len: self.state_len,
pattern_len: self.pattern_len,
}
Expand Down
3 changes: 1 addition & 2 deletions regex-automata/src/meta/strategy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ pub(super) fn new(
debug!("skipping literal extraction since prefilters were disabled");
None
};
let mut core = Core::new(info.clone(), pre.clone(), hirs)?;
let mut core = Core::new(info.clone(), pre, hirs)?;
// Now that we have our core regex engines built, there are a few cases
// where we can do a little bit better than just a normal "search forward
// and maybe use a prefilter when in a start state." However, these cases
Expand Down Expand Up @@ -512,7 +512,6 @@ impl Core {
// the lazy DFA ignores capturing groups in all cases.
.configure(
thompson_config
.clone()
.which_captures(WhichCaptures::None)
.reverse(true),
)
Expand Down
2 changes: 0 additions & 2 deletions regex-automata/src/meta/wrappers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,6 @@ impl HybridEngine {
let result = hybrid::dfa::Builder::new()
.configure(
dfa_config
.clone()
.match_kind(MatchKind::All)
.prefilter(None)
.specialize_start_states(false),
Expand Down Expand Up @@ -892,7 +891,6 @@ impl DFAEngine {
let result = dfa::dense::Builder::new()
.configure(
dfa_config
.clone()
// We never need unanchored reverse searches, so
// there's no point in building it into the DFA, which
// WILL take more space. (This isn't done for the lazy
Expand Down
2 changes: 1 addition & 1 deletion regex-cli/args/syntax.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pub struct Config {
impl Config {
/// Return a `syntax::Config` object from this configuration.
pub fn syntax(&self) -> anyhow::Result<syntax::Config> {
Ok(self.syntax.clone())
Ok(self.syntax)
}

/// Parses the given pattern into an `Ast`.
Expand Down
8 changes: 4 additions & 4 deletions src/builders.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ impl Builder {
.clone()
.match_kind(MatchKind::LeftmostFirst)
.utf8_empty(true);
let syntaxc = self.syntaxc.clone().utf8(true);
let syntaxc = self.syntaxc.utf8(true);
let pattern = Arc::from(self.pats[0].as_str());
meta::Builder::new()
.configure(metac)
Expand All @@ -91,7 +91,7 @@ impl Builder {
.clone()
.match_kind(MatchKind::LeftmostFirst)
.utf8_empty(false);
let syntaxc = self.syntaxc.clone().utf8(false);
let syntaxc = self.syntaxc.utf8(false);
let pattern = Arc::from(self.pats[0].as_str());
meta::Builder::new()
.configure(metac)
Expand All @@ -108,7 +108,7 @@ impl Builder {
.match_kind(MatchKind::All)
.utf8_empty(true)
.which_captures(WhichCaptures::None);
let syntaxc = self.syntaxc.clone().utf8(true);
let syntaxc = self.syntaxc.utf8(true);
let patterns = Arc::from(self.pats.as_slice());
meta::Builder::new()
.configure(metac)
Expand All @@ -125,7 +125,7 @@ impl Builder {
.match_kind(MatchKind::All)
.utf8_empty(false)
.which_captures(WhichCaptures::None);
let syntaxc = self.syntaxc.clone().utf8(false);
let syntaxc = self.syntaxc.utf8(false);
let patterns = Arc::from(self.pats.as_slice());
meta::Builder::new()
.configure(metac)
Expand Down
Loading