Skip to content

Commit 098d5b9

Browse files
0323pin0323pin
committed
textproc/hgrep: update to 0.3.0
v0.3.0 - 21 Jan 2023 - Update syntect dependency to v5.0.0. Thanks to lazy loading, this change makes loading assets at startup about 70% faster. The small benchmark showed hgrep command was 1.7x faster when searching a small file with -p syntect compared to v0.2.8. - Update bat dependency from 0.20 to 0.22. This introduces several improvements and fixes which were recently added to bat when using -p bat. - Add --generate-man-page flag to generate a manual page file. Save the output to your man directory to show the help with man command. If you install hgrep with Homebrew, it will be automatically generated. - Add several syntax highlighting for configuration files (Git configs, Fish history, SSH config, Nginx config, ...). - Wrapp the --help output looking at the terminal width. The output is more compact than v0.2.8. - Improve error handling when failing to enable ANSI color sequences support on Windows. v0.2.8 - 10 Jan 2023 - Fix some command line boolean flags wrongly took an argument. (thanks @Ryooooooga, #15) v0.2.7 - 04 Jan 2023 - Fix crash when reading from rg --vimgrep. Note that --vimgrep flag is not assumed by hgrep. Please use rg -nH. (#13) - Fix errors are not reported when they are caused by the second match or later. - Update dependencies to the latest. Especially migrating to clap v4 improved the --help output. - Migrate to Rust 2021 edition.
1 parent c236ac2 commit 098d5b9

3 files changed

Lines changed: 495 additions & 419 deletions

File tree

‎textproc/hgrep/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# $NetBSD: Makefile,v 1.12 2022/09/18 13:37:18 he Exp $
1+
# $NetBSD: Makefile,v 1.13 2023/01/22 08:57:08 pin Exp $
22

3-
DISTNAME= hgrep-0.2.6
3+
DISTNAME= hgrep-0.3.0
44
CATEGORIES= textproc
55
MASTER_SITES= ${MASTER_SITE_GITHUB:=rhysd/}
66
GITHUB_TAG= v${PKGVERSION_NOREV}

‎textproc/hgrep/cargo-depends.mk‎

Lines changed: 123 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,49 @@
1-
# $NetBSD: cargo-depends.mk,v 1.10 2022/05/27 18:21:50 pin Exp $
1+
# $NetBSD: cargo-depends.mk,v 1.11 2023/01/22 08:57:08 pin Exp $
22

33
CARGO_CRATE_DEPENDS+= adler-1.0.2
4-
CARGO_CRATE_DEPENDS+= aho-corasick-0.7.18
5-
CARGO_CRATE_DEPENDS+= ansi_colours-1.1.1
4+
CARGO_CRATE_DEPENDS+= aho-corasick-0.7.20
5+
CARGO_CRATE_DEPENDS+= anes-0.1.6
6+
CARGO_CRATE_DEPENDS+= ansi_colours-1.2.1
67
CARGO_CRATE_DEPENDS+= ansi_term-0.12.1
7-
CARGO_CRATE_DEPENDS+= anyhow-1.0.56
8+
CARGO_CRATE_DEPENDS+= anyhow-1.0.68
89
CARGO_CRATE_DEPENDS+= atty-0.2.14
910
CARGO_CRATE_DEPENDS+= autocfg-1.1.0
10-
CARGO_CRATE_DEPENDS+= base64-0.13.0
11-
CARGO_CRATE_DEPENDS+= bat-0.20.0
11+
CARGO_CRATE_DEPENDS+= base64-0.13.1
12+
CARGO_CRATE_DEPENDS+= bat-0.22.1
1213
CARGO_CRATE_DEPENDS+= bincode-1.3.3
1314
CARGO_CRATE_DEPENDS+= bitflags-1.3.2
14-
CARGO_CRATE_DEPENDS+= bstr-0.2.17
15-
CARGO_CRATE_DEPENDS+= bumpalo-3.9.1
16-
CARGO_CRATE_DEPENDS+= bytecount-0.6.2
17-
CARGO_CRATE_DEPENDS+= bytemuck-1.9.1
15+
CARGO_CRATE_DEPENDS+= bstr-1.1.0
16+
CARGO_CRATE_DEPENDS+= bumpalo-3.12.0
17+
CARGO_CRATE_DEPENDS+= bytecount-0.6.3
18+
CARGO_CRATE_DEPENDS+= bytemuck-1.13.0
1819
CARGO_CRATE_DEPENDS+= bytesize-1.1.0
19-
CARGO_CRATE_DEPENDS+= cast-0.2.7
20-
CARGO_CRATE_DEPENDS+= cc-1.0.73
20+
CARGO_CRATE_DEPENDS+= cast-0.3.0
21+
CARGO_CRATE_DEPENDS+= cc-1.0.78
2122
CARGO_CRATE_DEPENDS+= cfg-if-1.0.0
22-
CARGO_CRATE_DEPENDS+= clap-2.34.0
23-
CARGO_CRATE_DEPENDS+= clap-3.1.9
24-
CARGO_CRATE_DEPENDS+= clap_complete-3.1.1
25-
CARGO_CRATE_DEPENDS+= clap_lex-0.1.1
23+
CARGO_CRATE_DEPENDS+= ciborium-0.2.0
24+
CARGO_CRATE_DEPENDS+= ciborium-io-0.2.0
25+
CARGO_CRATE_DEPENDS+= ciborium-ll-0.2.0
26+
CARGO_CRATE_DEPENDS+= clap-3.2.23
27+
CARGO_CRATE_DEPENDS+= clap-4.1.1
28+
CARGO_CRATE_DEPENDS+= clap_complete-4.1.0
29+
CARGO_CRATE_DEPENDS+= clap_lex-0.2.4
30+
CARGO_CRATE_DEPENDS+= clap_lex-0.3.1
31+
CARGO_CRATE_DEPENDS+= clap_mangen-0.2.7
2632
CARGO_CRATE_DEPENDS+= clircle-0.3.0
27-
CARGO_CRATE_DEPENDS+= console-0.15.0
33+
CARGO_CRATE_DEPENDS+= console-0.15.5
2834
CARGO_CRATE_DEPENDS+= content_inspector-0.2.4
2935
CARGO_CRATE_DEPENDS+= crc32fast-1.3.2
30-
CARGO_CRATE_DEPENDS+= criterion-0.3.5
31-
CARGO_CRATE_DEPENDS+= criterion-plot-0.4.4
32-
CARGO_CRATE_DEPENDS+= crossbeam-channel-0.5.4
33-
CARGO_CRATE_DEPENDS+= crossbeam-deque-0.8.1
34-
CARGO_CRATE_DEPENDS+= crossbeam-epoch-0.9.8
35-
CARGO_CRATE_DEPENDS+= crossbeam-utils-0.8.8
36-
CARGO_CRATE_DEPENDS+= csv-1.1.6
37-
CARGO_CRATE_DEPENDS+= csv-core-0.1.10
38-
CARGO_CRATE_DEPENDS+= ctor-0.1.22
39-
CARGO_CRATE_DEPENDS+= diff-0.1.12
36+
CARGO_CRATE_DEPENDS+= criterion-0.4.0
37+
CARGO_CRATE_DEPENDS+= criterion-plot-0.5.0
38+
CARGO_CRATE_DEPENDS+= crossbeam-channel-0.5.6
39+
CARGO_CRATE_DEPENDS+= crossbeam-deque-0.8.2
40+
CARGO_CRATE_DEPENDS+= crossbeam-epoch-0.9.13
41+
CARGO_CRATE_DEPENDS+= crossbeam-utils-0.8.14
42+
CARGO_CRATE_DEPENDS+= ctor-0.1.26
43+
CARGO_CRATE_DEPENDS+= diff-0.1.13
4044
CARGO_CRATE_DEPENDS+= dirs-next-2.0.0
4145
CARGO_CRATE_DEPENDS+= dirs-sys-next-0.1.2
42-
CARGO_CRATE_DEPENDS+= either-1.6.1
46+
CARGO_CRATE_DEPENDS+= either-1.8.0
4347
CARGO_CRATE_DEPENDS+= encode_unicode-0.3.6
4448
CARGO_CRATE_DEPENDS+= encoding-0.2.33
4549
CARGO_CRATE_DEPENDS+= encoding-index-japanese-1.20141219.5
@@ -50,111 +54,126 @@ CARGO_CRATE_DEPENDS+= encoding-index-tradchinese-1.20141219.5
5054
CARGO_CRATE_DEPENDS+= encoding_index_tests-0.1.4
5155
CARGO_CRATE_DEPENDS+= encoding_rs-0.8.31
5256
CARGO_CRATE_DEPENDS+= encoding_rs_io-0.1.7
53-
CARGO_CRATE_DEPENDS+= fastrand-1.7.0
57+
CARGO_CRATE_DEPENDS+= errno-0.2.8
58+
CARGO_CRATE_DEPENDS+= errno-dragonfly-0.1.2
59+
CARGO_CRATE_DEPENDS+= fastrand-1.8.0
5460
CARGO_CRATE_DEPENDS+= filedescriptor-0.8.2
55-
CARGO_CRATE_DEPENDS+= flate2-1.0.23
61+
CARGO_CRATE_DEPENDS+= flate2-1.0.25
5662
CARGO_CRATE_DEPENDS+= fnv-1.0.7
5763
CARGO_CRATE_DEPENDS+= gag-1.0.0
58-
CARGO_CRATE_DEPENDS+= getrandom-0.2.6
59-
CARGO_CRATE_DEPENDS+= globset-0.4.8
60-
CARGO_CRATE_DEPENDS+= grep-matcher-0.1.5
61-
CARGO_CRATE_DEPENDS+= grep-pcre2-0.1.5
62-
CARGO_CRATE_DEPENDS+= grep-regex-0.1.9
63-
CARGO_CRATE_DEPENDS+= grep-searcher-0.1.8
64+
CARGO_CRATE_DEPENDS+= getrandom-0.2.8
65+
CARGO_CRATE_DEPENDS+= globset-0.4.10
66+
CARGO_CRATE_DEPENDS+= grep-matcher-0.1.6
67+
CARGO_CRATE_DEPENDS+= grep-pcre2-0.1.6
68+
CARGO_CRATE_DEPENDS+= grep-regex-0.1.11
69+
CARGO_CRATE_DEPENDS+= grep-searcher-0.1.11
6470
CARGO_CRATE_DEPENDS+= half-1.8.2
65-
CARGO_CRATE_DEPENDS+= hashbrown-0.11.2
71+
CARGO_CRATE_DEPENDS+= hashbrown-0.12.3
6672
CARGO_CRATE_DEPENDS+= hermit-abi-0.1.19
67-
CARGO_CRATE_DEPENDS+= ignore-0.4.18
68-
CARGO_CRATE_DEPENDS+= indexmap-1.8.1
73+
CARGO_CRATE_DEPENDS+= hermit-abi-0.2.6
74+
CARGO_CRATE_DEPENDS+= ignore-0.4.20
75+
CARGO_CRATE_DEPENDS+= indexmap-1.9.2
76+
CARGO_CRATE_DEPENDS+= insta-1.26.0
6977
CARGO_CRATE_DEPENDS+= instant-0.1.12
70-
CARGO_CRATE_DEPENDS+= itertools-0.10.3
71-
CARGO_CRATE_DEPENDS+= itoa-0.4.8
72-
CARGO_CRATE_DEPENDS+= itoa-1.0.1
73-
CARGO_CRATE_DEPENDS+= jobserver-0.1.24
74-
CARGO_CRATE_DEPENDS+= js-sys-0.3.57
78+
CARGO_CRATE_DEPENDS+= io-lifetimes-1.0.4
79+
CARGO_CRATE_DEPENDS+= is-terminal-0.4.2
80+
CARGO_CRATE_DEPENDS+= itertools-0.10.5
81+
CARGO_CRATE_DEPENDS+= itoa-1.0.5
82+
CARGO_CRATE_DEPENDS+= jobserver-0.1.25
83+
CARGO_CRATE_DEPENDS+= js-sys-0.3.60
7584
CARGO_CRATE_DEPENDS+= lazy_static-1.4.0
76-
CARGO_CRATE_DEPENDS+= lazycell-1.3.0
77-
CARGO_CRATE_DEPENDS+= libc-0.2.123
78-
CARGO_CRATE_DEPENDS+= libmimalloc-sys-0.1.24
85+
CARGO_CRATE_DEPENDS+= libc-0.2.139
86+
CARGO_CRATE_DEPENDS+= libmimalloc-sys-0.1.30
7987
CARGO_CRATE_DEPENDS+= line-wrap-0.1.1
80-
CARGO_CRATE_DEPENDS+= linked-hash-map-0.5.4
81-
CARGO_CRATE_DEPENDS+= log-0.4.16
82-
CARGO_CRATE_DEPENDS+= memchr-2.4.1
83-
CARGO_CRATE_DEPENDS+= memmap2-0.3.1
84-
CARGO_CRATE_DEPENDS+= memoffset-0.6.5
85-
CARGO_CRATE_DEPENDS+= mimalloc-0.1.28
86-
CARGO_CRATE_DEPENDS+= miniz_oxide-0.5.1
87-
CARGO_CRATE_DEPENDS+= num-traits-0.2.14
88-
CARGO_CRATE_DEPENDS+= num_cpus-1.13.1
89-
CARGO_CRATE_DEPENDS+= num_threads-0.1.5
90-
CARGO_CRATE_DEPENDS+= once_cell-1.10.0
91-
CARGO_CRATE_DEPENDS+= onig-6.3.1
92-
CARGO_CRATE_DEPENDS+= onig_sys-69.7.1
88+
CARGO_CRATE_DEPENDS+= linked-hash-map-0.5.6
89+
CARGO_CRATE_DEPENDS+= linux-raw-sys-0.1.4
90+
CARGO_CRATE_DEPENDS+= log-0.4.17
91+
CARGO_CRATE_DEPENDS+= memchr-2.5.0
92+
CARGO_CRATE_DEPENDS+= memmap2-0.5.8
93+
CARGO_CRATE_DEPENDS+= memoffset-0.7.1
94+
CARGO_CRATE_DEPENDS+= mimalloc-0.1.34
95+
CARGO_CRATE_DEPENDS+= miniz_oxide-0.6.2
96+
CARGO_CRATE_DEPENDS+= num-traits-0.2.15
97+
CARGO_CRATE_DEPENDS+= num_cpus-1.15.0
98+
CARGO_CRATE_DEPENDS+= once_cell-1.17.0
99+
CARGO_CRATE_DEPENDS+= onig-6.4.0
100+
CARGO_CRATE_DEPENDS+= onig_sys-69.8.1
93101
CARGO_CRATE_DEPENDS+= oorandom-11.1.3
94-
CARGO_CRATE_DEPENDS+= os_str_bytes-6.0.0
102+
CARGO_CRATE_DEPENDS+= os_str_bytes-6.4.1
95103
CARGO_CRATE_DEPENDS+= output_vt100-0.1.3
96-
CARGO_CRATE_DEPENDS+= path-slash-0.1.4
104+
CARGO_CRATE_DEPENDS+= path-slash-0.2.1
97105
CARGO_CRATE_DEPENDS+= path_abs-0.5.1
98106
CARGO_CRATE_DEPENDS+= pathdiff-0.2.1
99107
CARGO_CRATE_DEPENDS+= pcre2-0.2.3
100108
CARGO_CRATE_DEPENDS+= pcre2-sys-0.2.5
101-
CARGO_CRATE_DEPENDS+= pkg-config-0.3.25
102-
CARGO_CRATE_DEPENDS+= plist-1.3.1
103-
CARGO_CRATE_DEPENDS+= plotters-0.3.1
104-
CARGO_CRATE_DEPENDS+= plotters-backend-0.3.2
105-
CARGO_CRATE_DEPENDS+= plotters-svg-0.3.1
106-
CARGO_CRATE_DEPENDS+= pretty_assertions-1.2.1
107-
CARGO_CRATE_DEPENDS+= proc-macro2-1.0.37
108-
CARGO_CRATE_DEPENDS+= quote-1.0.18
109-
CARGO_CRATE_DEPENDS+= rayon-1.5.2
110-
CARGO_CRATE_DEPENDS+= rayon-core-1.9.2
111-
CARGO_CRATE_DEPENDS+= redox_syscall-0.2.13
109+
CARGO_CRATE_DEPENDS+= pkg-config-0.3.26
110+
CARGO_CRATE_DEPENDS+= plist-1.4.0
111+
CARGO_CRATE_DEPENDS+= plotters-0.3.4
112+
CARGO_CRATE_DEPENDS+= plotters-backend-0.3.4
113+
CARGO_CRATE_DEPENDS+= plotters-svg-0.3.3
114+
CARGO_CRATE_DEPENDS+= pretty_assertions-1.3.0
115+
CARGO_CRATE_DEPENDS+= proc-macro2-1.0.50
116+
CARGO_CRATE_DEPENDS+= quick-xml-0.26.0
117+
CARGO_CRATE_DEPENDS+= quote-1.0.23
118+
CARGO_CRATE_DEPENDS+= rayon-1.6.1
119+
CARGO_CRATE_DEPENDS+= rayon-core-1.10.1
120+
CARGO_CRATE_DEPENDS+= redox_syscall-0.2.16
112121
CARGO_CRATE_DEPENDS+= redox_users-0.4.3
113-
CARGO_CRATE_DEPENDS+= regex-1.5.5
122+
CARGO_CRATE_DEPENDS+= regex-1.7.1
114123
CARGO_CRATE_DEPENDS+= regex-automata-0.1.10
115-
CARGO_CRATE_DEPENDS+= regex-syntax-0.6.25
124+
CARGO_CRATE_DEPENDS+= regex-syntax-0.6.28
116125
CARGO_CRATE_DEPENDS+= remove_dir_all-0.5.3
117-
CARGO_CRATE_DEPENDS+= rgb-0.8.32
118-
CARGO_CRATE_DEPENDS+= rustc_version-0.4.0
119-
CARGO_CRATE_DEPENDS+= rustversion-1.0.6
120-
CARGO_CRATE_DEPENDS+= ryu-1.0.9
126+
CARGO_CRATE_DEPENDS+= rgb-0.8.34
127+
CARGO_CRATE_DEPENDS+= roff-0.2.1
128+
CARGO_CRATE_DEPENDS+= rustix-0.36.7
129+
CARGO_CRATE_DEPENDS+= rustversion-1.0.11
130+
CARGO_CRATE_DEPENDS+= ryu-1.0.12
121131
CARGO_CRATE_DEPENDS+= safemem-0.3.3
122132
CARGO_CRATE_DEPENDS+= same-file-1.0.6
123133
CARGO_CRATE_DEPENDS+= scopeguard-1.1.0
124-
CARGO_CRATE_DEPENDS+= semver-1.0.7
125-
CARGO_CRATE_DEPENDS+= serde-1.0.136
126-
CARGO_CRATE_DEPENDS+= serde_cbor-0.11.2
127-
CARGO_CRATE_DEPENDS+= serde_derive-1.0.136
128-
CARGO_CRATE_DEPENDS+= serde_json-1.0.79
129-
CARGO_CRATE_DEPENDS+= serde_yaml-0.8.23
134+
CARGO_CRATE_DEPENDS+= semver-1.0.16
135+
CARGO_CRATE_DEPENDS+= serde-1.0.152
136+
CARGO_CRATE_DEPENDS+= serde_derive-1.0.152
137+
CARGO_CRATE_DEPENDS+= serde_json-1.0.91
138+
CARGO_CRATE_DEPENDS+= serde_yaml-0.8.26
139+
CARGO_CRATE_DEPENDS+= similar-2.2.1
130140
CARGO_CRATE_DEPENDS+= std_prelude-0.2.12
131141
CARGO_CRATE_DEPENDS+= strsim-0.10.0
132-
CARGO_CRATE_DEPENDS+= syn-1.0.91
133-
CARGO_CRATE_DEPENDS+= syntect-4.6.0
142+
CARGO_CRATE_DEPENDS+= syn-1.0.107
143+
CARGO_CRATE_DEPENDS+= syntect-5.0.0
134144
CARGO_CRATE_DEPENDS+= tempfile-3.3.0
135145
CARGO_CRATE_DEPENDS+= term-0.7.0
136-
CARGO_CRATE_DEPENDS+= termcolor-1.1.3
137-
CARGO_CRATE_DEPENDS+= terminal_size-0.1.17
138-
CARGO_CRATE_DEPENDS+= textwrap-0.11.0
139-
CARGO_CRATE_DEPENDS+= textwrap-0.15.0
140-
CARGO_CRATE_DEPENDS+= thiserror-1.0.30
141-
CARGO_CRATE_DEPENDS+= thiserror-impl-1.0.30
146+
CARGO_CRATE_DEPENDS+= termcolor-1.2.0
147+
CARGO_CRATE_DEPENDS+= terminal_size-0.2.3
148+
CARGO_CRATE_DEPENDS+= textwrap-0.16.0
149+
CARGO_CRATE_DEPENDS+= thiserror-1.0.38
150+
CARGO_CRATE_DEPENDS+= thiserror-impl-1.0.38
142151
CARGO_CRATE_DEPENDS+= thread_local-1.1.4
143-
CARGO_CRATE_DEPENDS+= time-0.3.9
152+
CARGO_CRATE_DEPENDS+= time-0.3.17
153+
CARGO_CRATE_DEPENDS+= time-core-0.1.0
154+
CARGO_CRATE_DEPENDS+= time-macros-0.2.6
144155
CARGO_CRATE_DEPENDS+= tinytemplate-1.2.1
145-
CARGO_CRATE_DEPENDS+= unicode-width-0.1.9
146-
CARGO_CRATE_DEPENDS+= unicode-xid-0.2.2
156+
CARGO_CRATE_DEPENDS+= unicode-ident-1.0.6
157+
CARGO_CRATE_DEPENDS+= unicode-width-0.1.10
147158
CARGO_CRATE_DEPENDS+= walkdir-2.3.2
148-
CARGO_CRATE_DEPENDS+= wasi-0.10.2+wasi-snapshot-preview1
149-
CARGO_CRATE_DEPENDS+= wasm-bindgen-0.2.80
150-
CARGO_CRATE_DEPENDS+= wasm-bindgen-backend-0.2.80
151-
CARGO_CRATE_DEPENDS+= wasm-bindgen-macro-0.2.80
152-
CARGO_CRATE_DEPENDS+= wasm-bindgen-macro-support-0.2.80
153-
CARGO_CRATE_DEPENDS+= wasm-bindgen-shared-0.2.80
154-
CARGO_CRATE_DEPENDS+= web-sys-0.3.57
159+
CARGO_CRATE_DEPENDS+= wasi-0.11.0+wasi-snapshot-preview1
160+
CARGO_CRATE_DEPENDS+= wasm-bindgen-0.2.83
161+
CARGO_CRATE_DEPENDS+= wasm-bindgen-backend-0.2.83
162+
CARGO_CRATE_DEPENDS+= wasm-bindgen-macro-0.2.83
163+
CARGO_CRATE_DEPENDS+= wasm-bindgen-macro-support-0.2.83
164+
CARGO_CRATE_DEPENDS+= wasm-bindgen-shared-0.2.83
165+
CARGO_CRATE_DEPENDS+= web-sys-0.3.60
155166
CARGO_CRATE_DEPENDS+= winapi-0.3.9
156167
CARGO_CRATE_DEPENDS+= winapi-i686-pc-windows-gnu-0.4.0
157168
CARGO_CRATE_DEPENDS+= winapi-util-0.1.5
158169
CARGO_CRATE_DEPENDS+= winapi-x86_64-pc-windows-gnu-0.4.0
159-
CARGO_CRATE_DEPENDS+= xml-rs-0.8.4
170+
CARGO_CRATE_DEPENDS+= windows-sys-0.42.0
171+
CARGO_CRATE_DEPENDS+= windows_aarch64_gnullvm-0.42.1
172+
CARGO_CRATE_DEPENDS+= windows_aarch64_msvc-0.42.1
173+
CARGO_CRATE_DEPENDS+= windows_i686_gnu-0.42.1
174+
CARGO_CRATE_DEPENDS+= windows_i686_msvc-0.42.1
175+
CARGO_CRATE_DEPENDS+= windows_x86_64_gnu-0.42.1
176+
CARGO_CRATE_DEPENDS+= windows_x86_64_gnullvm-0.42.1
177+
CARGO_CRATE_DEPENDS+= windows_x86_64_msvc-0.42.1
160178
CARGO_CRATE_DEPENDS+= yaml-rust-0.4.5
179+
CARGO_CRATE_DEPENDS+= yansi-0.5.1

0 commit comments

Comments
 (0)