Skip to content
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

Jump to bottom

Update to syntect 4.1, fancy-regex support #900

Merged
merged 2 commits into from
Apr 11, 2020
Merged

Update to syntect 4.1, fancy-regex support #900

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
9b5e86e
Update to syntect 4.1, fancy-regex support
sharkdp Mar 31, 2020
914958a
Add regex-onig feature to 'cargo check' tests
sharkdp Mar 31, 2020
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
69 changes: 55 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,12 @@ application = [
"liquid",
"paging",
"wild",
"regex-onig",
]
git = ["git2"] # Support indicating git modifications
paging = ["shell-words"] # Support applying a pager on the output
regex-onig = ["syntect/regex-onig"] # Use the "oniguruma" regex engine
regex-fancy = ["syntect/regex-fancy"] # Use the rust-only "fancy-regex" engine

[dependencies]
atty = { version = "0.2.14", optional = true }
Expand All @@ -52,7 +55,7 @@ optional = true
default-features = false

[dependencies.syntect]
version = "3.2.0"
version = "4.1.0"
default-features = false
features = ["parsing", "yaml-load", "dump-load", "dump-create"]

Expand Down
8 changes: 4 additions & 4 deletions ci/script.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ if [[ $TARGET != arm-unknown-linux-gnueabihf ]] && [[ $TARGET != aarch64-unknown
fi

# Check bat-as-a-library, which has a smaller set of dependencies
cargo check --target "$TARGET" --verbose --lib --no-default-features
cargo check --target "$TARGET" --verbose --lib --no-default-features --features git
cargo check --target "$TARGET" --verbose --lib --no-default-features --features paging
cargo check --target "$TARGET" --verbose --lib --no-default-features --features git,paging
cargo check --target "$TARGET" --verbose --lib --no-default-features --features regex-onig
cargo check --target "$TARGET" --verbose --lib --no-default-features --features regex-onig,git
cargo check --target "$TARGET" --verbose --lib --no-default-features --features regex-onig,paging
cargo check --target "$TARGET" --verbose --lib --no-default-features --features regex-onig,git,paging