Merge upstream cloudflare/master (supersedes #21)#22
Merged
Conversation
Bumps [rand](https://github.com/rust-random/rand) from 0.9.2 to 0.9.3. - [Release notes](https://github.com/rust-random/rand/releases) - [Changelog](https://github.com/rust-random/rand/blob/0.9.3/CHANGELOG.md) - [Commits](rust-random/rand@rand_core-0.9.2...0.9.3) --- updated-dependencies: - dependency-name: rand dependency-version: 0.9.3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>
# Conflicts: # Cargo.lock # Cargo.toml # engine/src/lib.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Merges upstream
cloudflare/wirefilter:masterinto the gen0sec fork, resolving the conflicts that block #21. Opened as a same-repo branch because #21's head lives incloudflare/wirefilterand can't be pushed to directly.Upstream commits pulled in:
CompiledFunctiontype alias_implfunctionsConflict resolution
Cargo.toml— kept the gen0secouter-regexdependency (required by the fork's custom regex functions).engine/src/lib.rs— merged thefunctionsexport lists: kept all gen0sec custom functions and added upstream'sCompiledFunction.Cargo.lock— regenerated.The fork's custom functions remain compatible since
CompiledFunctionis just an alias for thecompile()return type they already use.Test plan
cargo build(full workspace)cargo clippy --all-targets -- -D clippy::allcleancargo +nightly fmt --checkcleancargo test— all pass (253 tests, incl. upstream's new array tests)Once merged, close #21.