##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

contrib: upgrade merge-lists from clap v3 to clap v4...
Martin von Zweigbergk -
r51699:337bc83c default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -1,560 +1,695 b''
1 # This file is automatically @generated by Cargo.
1 # This file is automatically @generated by Cargo.
2 # It is not intended for manual editing.
2 # It is not intended for manual editing.
3 version = 3
3 version = 3
4
4
5 [[package]]
5 [[package]]
6 name = "aho-corasick"
6 name = "aho-corasick"
7 version = "0.7.18"
7 version = "0.7.18"
8 source = "registry+https://github.com/rust-lang/crates.io-index"
8 source = "registry+https://github.com/rust-lang/crates.io-index"
9 checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
9 checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
10 dependencies = [
10 dependencies = [
11 "memchr",
11 "memchr",
12 ]
12 ]
13
13
14 [[package]]
14 [[package]]
15 name = "anstream"
16 version = "0.3.2"
17 source = "registry+https://github.com/rust-lang/crates.io-index"
18 checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163"
19 dependencies = [
20 "anstyle",
21 "anstyle-parse",
22 "anstyle-query",
23 "anstyle-wincon",
24 "colorchoice",
25 "is-terminal",
26 "utf8parse",
27 ]
28
29 [[package]]
30 name = "anstyle"
31 version = "1.0.1"
32 source = "registry+https://github.com/rust-lang/crates.io-index"
33 checksum = "3a30da5c5f2d5e72842e00bcb57657162cdabef0931f40e2deb9b4140440cecd"
34
35 [[package]]
36 name = "anstyle-parse"
37 version = "0.2.1"
38 source = "registry+https://github.com/rust-lang/crates.io-index"
39 checksum = "938874ff5980b03a87c5524b3ae5b59cf99b1d6bc836848df7bc5ada9643c333"
40 dependencies = [
41 "utf8parse",
42 ]
43
44 [[package]]
45 name = "anstyle-query"
46 version = "1.0.0"
47 source = "registry+https://github.com/rust-lang/crates.io-index"
48 checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
49 dependencies = [
50 "windows-sys",
51 ]
52
53 [[package]]
54 name = "anstyle-wincon"
55 version = "1.0.1"
56 source = "registry+https://github.com/rust-lang/crates.io-index"
57 checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
58 dependencies = [
59 "anstyle",
60 "windows-sys",
61 ]
62
63 [[package]]
15 name = "assert_cmd"
64 name = "assert_cmd"
16 version = "2.0.4"
65 version = "2.0.4"
17 source = "registry+https://github.com/rust-lang/crates.io-index"
66 source = "registry+https://github.com/rust-lang/crates.io-index"
18 checksum = "93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e"
67 checksum = "93ae1ddd39efd67689deb1979d80bad3bf7f2b09c6e6117c8d1f2443b5e2f83e"
19 dependencies = [
68 dependencies = [
20 "bstr",
69 "bstr",
21 "doc-comment",
70 "doc-comment",
22 "predicates",
71 "predicates",
23 "predicates-core",
72 "predicates-core",
24 "predicates-tree",
73 "predicates-tree",
25 "wait-timeout",
74 "wait-timeout",
26 ]
75 ]
27
76
28 [[package]]
77 [[package]]
29 name = "atty"
30 version = "0.2.14"
31 source = "registry+https://github.com/rust-lang/crates.io-index"
32 checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
33 dependencies = [
34 "hermit-abi",
35 "libc",
36 "winapi",
37 ]
38
39 [[package]]
40 name = "autocfg"
78 name = "autocfg"
41 version = "1.1.0"
79 version = "1.1.0"
42 source = "registry+https://github.com/rust-lang/crates.io-index"
80 source = "registry+https://github.com/rust-lang/crates.io-index"
43 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
81 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
44
82
45 [[package]]
83 [[package]]
46 name = "bitflags"
84 name = "bitflags"
47 version = "1.3.2"
85 version = "2.3.3"
48 source = "registry+https://github.com/rust-lang/crates.io-index"
86 source = "registry+https://github.com/rust-lang/crates.io-index"
49 checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
87 checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42"
50
88
51 [[package]]
89 [[package]]
52 name = "bstr"
90 name = "bstr"
53 version = "0.2.17"
91 version = "0.2.17"
54 source = "registry+https://github.com/rust-lang/crates.io-index"
92 source = "registry+https://github.com/rust-lang/crates.io-index"
55 checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
93 checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223"
56 dependencies = [
94 dependencies = [
57 "lazy_static",
95 "lazy_static",
58 "memchr",
96 "memchr",
59 "regex-automata",
97 "regex-automata",
60 ]
98 ]
61
99
62 [[package]]
100 [[package]]
101 name = "cc"
102 version = "1.0.79"
103 source = "registry+https://github.com/rust-lang/crates.io-index"
104 checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
105
106 [[package]]
63 name = "clap"
107 name = "clap"
64 version = "3.1.6"
108 version = "4.3.17"
65 source = "registry+https://github.com/rust-lang/crates.io-index"
109 source = "registry+https://github.com/rust-lang/crates.io-index"
66 checksum = "d8c93436c21e4698bacadf42917db28b23017027a4deccb35dbe47a7e7840123"
110 checksum = "5b0827b011f6f8ab38590295339817b0d26f344aa4932c3ced71b45b0c54b4a9"
67 dependencies = [
111 dependencies = [
68 "atty",
112 "clap_builder",
69 "bitflags",
70 "clap_derive",
113 "clap_derive",
71 "indexmap",
114 "once_cell",
72 "lazy_static",
115 ]
73 "os_str_bytes",
116
117 [[package]]
118 name = "clap_builder"
119 version = "4.3.17"
120 source = "registry+https://github.com/rust-lang/crates.io-index"
121 checksum = "9441b403be87be858db6a23edb493e7f694761acdc3343d5a0fcaafd304cbc9e"
122 dependencies = [
123 "anstream",
124 "anstyle",
125 "clap_lex",
74 "strsim",
126 "strsim",
75 "termcolor",
76 "textwrap",
77 ]
127 ]
78
128
79 [[package]]
129 [[package]]
80 name = "clap_derive"
130 name = "clap_derive"
81 version = "3.1.4"
131 version = "4.3.12"
82 source = "registry+https://github.com/rust-lang/crates.io-index"
132 source = "registry+https://github.com/rust-lang/crates.io-index"
83 checksum = "da95d038ede1a964ce99f49cbe27a7fb538d1da595e4b4f70b8c8f338d17bf16"
133 checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050"
84 dependencies = [
134 dependencies = [
85 "heck",
135 "heck",
86 "proc-macro-error",
87 "proc-macro2",
136 "proc-macro2",
88 "quote",
137 "quote",
89 "syn",
138 "syn 2.0.27",
90 ]
139 ]
91
140
92 [[package]]
141 [[package]]
142 name = "clap_lex"
143 version = "0.5.0"
144 source = "registry+https://github.com/rust-lang/crates.io-index"
145 checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
146
147 [[package]]
148 name = "colorchoice"
149 version = "1.0.0"
150 source = "registry+https://github.com/rust-lang/crates.io-index"
151 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
152
153 [[package]]
93 name = "console"
154 name = "console"
94 version = "0.15.0"
155 version = "0.15.0"
95 source = "registry+https://github.com/rust-lang/crates.io-index"
156 source = "registry+https://github.com/rust-lang/crates.io-index"
96 checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
157 checksum = "a28b32d32ca44b70c3e4acd7db1babf555fa026e385fb95f18028f88848b3c31"
97 dependencies = [
158 dependencies = [
98 "encode_unicode",
159 "encode_unicode",
99 "libc",
160 "libc",
100 "once_cell",
161 "once_cell",
101 "terminal_size",
162 "terminal_size",
102 "winapi",
163 "winapi",
103 ]
164 ]
104
165
105 [[package]]
166 [[package]]
106 name = "difflib"
167 name = "difflib"
107 version = "0.4.0"
168 version = "0.4.0"
108 source = "registry+https://github.com/rust-lang/crates.io-index"
169 source = "registry+https://github.com/rust-lang/crates.io-index"
109 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
170 checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
110
171
111 [[package]]
172 [[package]]
112 name = "doc-comment"
173 name = "doc-comment"
113 version = "0.3.3"
174 version = "0.3.3"
114 source = "registry+https://github.com/rust-lang/crates.io-index"
175 source = "registry+https://github.com/rust-lang/crates.io-index"
115 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
176 checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10"
116
177
117 [[package]]
178 [[package]]
118 name = "either"
179 name = "either"
119 version = "1.6.1"
180 version = "1.6.1"
120 source = "registry+https://github.com/rust-lang/crates.io-index"
181 source = "registry+https://github.com/rust-lang/crates.io-index"
121 checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
182 checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
122
183
123 [[package]]
184 [[package]]
124 name = "encode_unicode"
185 name = "encode_unicode"
125 version = "0.3.6"
186 version = "0.3.6"
126 source = "registry+https://github.com/rust-lang/crates.io-index"
187 source = "registry+https://github.com/rust-lang/crates.io-index"
127 checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
188 checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
128
189
129 [[package]]
190 [[package]]
191 name = "errno"
192 version = "0.3.1"
193 source = "registry+https://github.com/rust-lang/crates.io-index"
194 checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
195 dependencies = [
196 "errno-dragonfly",
197 "libc",
198 "windows-sys",
199 ]
200
201 [[package]]
202 name = "errno-dragonfly"
203 version = "0.1.2"
204 source = "registry+https://github.com/rust-lang/crates.io-index"
205 checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
206 dependencies = [
207 "cc",
208 "libc",
209 ]
210
211 [[package]]
130 name = "fuchsia-cprng"
212 name = "fuchsia-cprng"
131 version = "0.1.1"
213 version = "0.1.1"
132 source = "registry+https://github.com/rust-lang/crates.io-index"
214 source = "registry+https://github.com/rust-lang/crates.io-index"
133 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
215 checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
134
216
135 [[package]]
217 [[package]]
136 name = "hashbrown"
218 name = "hashbrown"
137 version = "0.11.2"
219 version = "0.11.2"
138 source = "registry+https://github.com/rust-lang/crates.io-index"
220 source = "registry+https://github.com/rust-lang/crates.io-index"
139 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
221 checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
140
222
141 [[package]]
223 [[package]]
142 name = "heck"
224 name = "heck"
143 version = "0.4.0"
225 version = "0.4.0"
144 source = "registry+https://github.com/rust-lang/crates.io-index"
226 source = "registry+https://github.com/rust-lang/crates.io-index"
145 checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
227 checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9"
146
228
147 [[package]]
229 [[package]]
148 name = "hermit-abi"
230 name = "hermit-abi"
149 version = "0.1.19"
231 version = "0.3.2"
150 source = "registry+https://github.com/rust-lang/crates.io-index"
232 source = "registry+https://github.com/rust-lang/crates.io-index"
151 checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
233 checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b"
152 dependencies = [
153 "libc",
154 ]
155
234
156 [[package]]
235 [[package]]
157 name = "indexmap"
236 name = "indexmap"
158 version = "1.8.0"
237 version = "1.8.0"
159 source = "registry+https://github.com/rust-lang/crates.io-index"
238 source = "registry+https://github.com/rust-lang/crates.io-index"
160 checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
239 checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223"
161 dependencies = [
240 dependencies = [
162 "autocfg",
241 "autocfg",
163 "hashbrown",
242 "hashbrown",
164 ]
243 ]
165
244
166 [[package]]
245 [[package]]
167 name = "insta"
246 name = "insta"
168 version = "1.13.0"
247 version = "1.13.0"
169 source = "registry+https://github.com/rust-lang/crates.io-index"
248 source = "registry+https://github.com/rust-lang/crates.io-index"
170 checksum = "30a7e1911532a662f6b08b68f884080850f2fd9544963c3ab23a5af42bda1eac"
249 checksum = "30a7e1911532a662f6b08b68f884080850f2fd9544963c3ab23a5af42bda1eac"
171 dependencies = [
250 dependencies = [
172 "console",
251 "console",
173 "once_cell",
252 "once_cell",
174 "serde",
253 "serde",
175 "serde_json",
254 "serde_json",
176 "serde_yaml",
255 "serde_yaml",
177 "similar",
256 "similar",
178 ]
257 ]
179
258
180 [[package]]
259 [[package]]
260 name = "is-terminal"
261 version = "0.4.9"
262 source = "registry+https://github.com/rust-lang/crates.io-index"
263 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
264 dependencies = [
265 "hermit-abi",
266 "rustix",
267 "windows-sys",
268 ]
269
270 [[package]]
181 name = "itertools"
271 name = "itertools"
182 version = "0.10.3"
272 version = "0.10.3"
183 source = "registry+https://github.com/rust-lang/crates.io-index"
273 source = "registry+https://github.com/rust-lang/crates.io-index"
184 checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
274 checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
185 dependencies = [
275 dependencies = [
186 "either",
276 "either",
187 ]
277 ]
188
278
189 [[package]]
279 [[package]]
190 name = "itoa"
280 name = "itoa"
191 version = "1.0.1"
281 version = "1.0.1"
192 source = "registry+https://github.com/rust-lang/crates.io-index"
282 source = "registry+https://github.com/rust-lang/crates.io-index"
193 checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
283 checksum = "1aab8fc367588b89dcee83ab0fd66b72b50b72fa1904d7095045ace2b0c81c35"
194
284
195 [[package]]
285 [[package]]
196 name = "lazy_static"
286 name = "lazy_static"
197 version = "1.4.0"
287 version = "1.4.0"
198 source = "registry+https://github.com/rust-lang/crates.io-index"
288 source = "registry+https://github.com/rust-lang/crates.io-index"
199 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
289 checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
200
290
201 [[package]]
291 [[package]]
202 name = "libc"
292 name = "libc"
203 version = "0.2.119"
293 version = "0.2.147"
204 source = "registry+https://github.com/rust-lang/crates.io-index"
294 source = "registry+https://github.com/rust-lang/crates.io-index"
205 checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4"
295 checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
206
296
207 [[package]]
297 [[package]]
208 name = "linked-hash-map"
298 name = "linked-hash-map"
209 version = "0.5.4"
299 version = "0.5.4"
210 source = "registry+https://github.com/rust-lang/crates.io-index"
300 source = "registry+https://github.com/rust-lang/crates.io-index"
211 checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
301 checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3"
212
302
213 [[package]]
303 [[package]]
304 name = "linux-raw-sys"
305 version = "0.4.3"
306 source = "registry+https://github.com/rust-lang/crates.io-index"
307 checksum = "09fc20d2ca12cb9f044c93e3bd6d32d523e6e2ec3db4f7b2939cd99026ecd3f0"
308
309 [[package]]
214 name = "memchr"
310 name = "memchr"
215 version = "2.4.1"
311 version = "2.4.1"
216 source = "registry+https://github.com/rust-lang/crates.io-index"
312 source = "registry+https://github.com/rust-lang/crates.io-index"
217 checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
313 checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
218
314
219 [[package]]
315 [[package]]
220 name = "merge-lists"
316 name = "merge-lists"
221 version = "0.1.0"
317 version = "0.1.0"
222 dependencies = [
318 dependencies = [
223 "assert_cmd",
319 "assert_cmd",
224 "clap",
320 "clap",
225 "insta",
321 "insta",
226 "itertools",
322 "itertools",
227 "regex",
323 "regex",
228 "similar",
324 "similar",
229 "tempdir",
325 "tempdir",
230 ]
326 ]
231
327
232 [[package]]
328 [[package]]
233 name = "once_cell"
329 name = "once_cell"
234 version = "1.10.0"
330 version = "1.18.0"
235 source = "registry+https://github.com/rust-lang/crates.io-index"
331 source = "registry+https://github.com/rust-lang/crates.io-index"
236 checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
332 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
237
238 [[package]]
239 name = "os_str_bytes"
240 version = "6.0.0"
241 source = "registry+https://github.com/rust-lang/crates.io-index"
242 checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
243 dependencies = [
244 "memchr",
245 ]
246
333
247 [[package]]
334 [[package]]
248 name = "predicates"
335 name = "predicates"
249 version = "2.1.1"
336 version = "2.1.1"
250 source = "registry+https://github.com/rust-lang/crates.io-index"
337 source = "registry+https://github.com/rust-lang/crates.io-index"
251 checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c"
338 checksum = "a5aab5be6e4732b473071984b3164dbbfb7a3674d30ea5ff44410b6bcd960c3c"
252 dependencies = [
339 dependencies = [
253 "difflib",
340 "difflib",
254 "itertools",
341 "itertools",
255 "predicates-core",
342 "predicates-core",
256 ]
343 ]
257
344
258 [[package]]
345 [[package]]
259 name = "predicates-core"
346 name = "predicates-core"
260 version = "1.0.3"
347 version = "1.0.3"
261 source = "registry+https://github.com/rust-lang/crates.io-index"
348 source = "registry+https://github.com/rust-lang/crates.io-index"
262 checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb"
349 checksum = "da1c2388b1513e1b605fcec39a95e0a9e8ef088f71443ef37099fa9ae6673fcb"
263
350
264 [[package]]
351 [[package]]
265 name = "predicates-tree"
352 name = "predicates-tree"
266 version = "1.0.5"
353 version = "1.0.5"
267 source = "registry+https://github.com/rust-lang/crates.io-index"
354 source = "registry+https://github.com/rust-lang/crates.io-index"
268 checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032"
355 checksum = "4d86de6de25020a36c6d3643a86d9a6a9f552107c0559c60ea03551b5e16c032"
269 dependencies = [
356 dependencies = [
270 "predicates-core",
357 "predicates-core",
271 "termtree",
358 "termtree",
272 ]
359 ]
273
360
274 [[package]]
361 [[package]]
275 name = "proc-macro-error"
362 name = "proc-macro2"
276 version = "1.0.4"
363 version = "1.0.66"
277 source = "registry+https://github.com/rust-lang/crates.io-index"
364 source = "registry+https://github.com/rust-lang/crates.io-index"
278 checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
365 checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
279 dependencies = [
366 dependencies = [
280 "proc-macro-error-attr",
367 "unicode-ident",
281 "proc-macro2",
282 "quote",
283 "syn",
284 "version_check",
285 ]
286
287 [[package]]
288 name = "proc-macro-error-attr"
289 version = "1.0.4"
290 source = "registry+https://github.com/rust-lang/crates.io-index"
291 checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
292 dependencies = [
293 "proc-macro2",
294 "quote",
295 "version_check",
296 ]
297
298 [[package]]
299 name = "proc-macro2"
300 version = "1.0.36"
301 source = "registry+https://github.com/rust-lang/crates.io-index"
302 checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
303 dependencies = [
304 "unicode-xid",
305 ]
368 ]
306
369
307 [[package]]
370 [[package]]
308 name = "quote"
371 name = "quote"
309 version = "1.0.15"
372 version = "1.0.31"
310 source = "registry+https://github.com/rust-lang/crates.io-index"
373 source = "registry+https://github.com/rust-lang/crates.io-index"
311 checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
374 checksum = "5fe8a65d69dd0808184ebb5f836ab526bb259db23c657efa38711b1072ee47f0"
312 dependencies = [
375 dependencies = [
313 "proc-macro2",
376 "proc-macro2",
314 ]
377 ]
315
378
316 [[package]]
379 [[package]]
317 name = "rand"
380 name = "rand"
318 version = "0.4.6"
381 version = "0.4.6"
319 source = "registry+https://github.com/rust-lang/crates.io-index"
382 source = "registry+https://github.com/rust-lang/crates.io-index"
320 checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
383 checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
321 dependencies = [
384 dependencies = [
322 "fuchsia-cprng",
385 "fuchsia-cprng",
323 "libc",
386 "libc",
324 "rand_core 0.3.1",
387 "rand_core 0.3.1",
325 "rdrand",
388 "rdrand",
326 "winapi",
389 "winapi",
327 ]
390 ]
328
391
329 [[package]]
392 [[package]]
330 name = "rand_core"
393 name = "rand_core"
331 version = "0.3.1"
394 version = "0.3.1"
332 source = "registry+https://github.com/rust-lang/crates.io-index"
395 source = "registry+https://github.com/rust-lang/crates.io-index"
333 checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
396 checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
334 dependencies = [
397 dependencies = [
335 "rand_core 0.4.2",
398 "rand_core 0.4.2",
336 ]
399 ]
337
400
338 [[package]]
401 [[package]]
339 name = "rand_core"
402 name = "rand_core"
340 version = "0.4.2"
403 version = "0.4.2"
341 source = "registry+https://github.com/rust-lang/crates.io-index"
404 source = "registry+https://github.com/rust-lang/crates.io-index"
342 checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
405 checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
343
406
344 [[package]]
407 [[package]]
345 name = "rdrand"
408 name = "rdrand"
346 version = "0.4.0"
409 version = "0.4.0"
347 source = "registry+https://github.com/rust-lang/crates.io-index"
410 source = "registry+https://github.com/rust-lang/crates.io-index"
348 checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
411 checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
349 dependencies = [
412 dependencies = [
350 "rand_core 0.3.1",
413 "rand_core 0.3.1",
351 ]
414 ]
352
415
353 [[package]]
416 [[package]]
354 name = "regex"
417 name = "regex"
355 version = "1.5.5"
418 version = "1.5.5"
356 source = "registry+https://github.com/rust-lang/crates.io-index"
419 source = "registry+https://github.com/rust-lang/crates.io-index"
357 checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
420 checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286"
358 dependencies = [
421 dependencies = [
359 "aho-corasick",
422 "aho-corasick",
360 "memchr",
423 "memchr",
361 "regex-syntax",
424 "regex-syntax",
362 ]
425 ]
363
426
364 [[package]]
427 [[package]]
365 name = "regex-automata"
428 name = "regex-automata"
366 version = "0.1.10"
429 version = "0.1.10"
367 source = "registry+https://github.com/rust-lang/crates.io-index"
430 source = "registry+https://github.com/rust-lang/crates.io-index"
368 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
431 checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132"
369
432
370 [[package]]
433 [[package]]
371 name = "regex-syntax"
434 name = "regex-syntax"
372 version = "0.6.25"
435 version = "0.6.25"
373 source = "registry+https://github.com/rust-lang/crates.io-index"
436 source = "registry+https://github.com/rust-lang/crates.io-index"
374 checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
437 checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
375
438
376 [[package]]
439 [[package]]
377 name = "remove_dir_all"
440 name = "remove_dir_all"
378 version = "0.5.3"
441 version = "0.5.3"
379 source = "registry+https://github.com/rust-lang/crates.io-index"
442 source = "registry+https://github.com/rust-lang/crates.io-index"
380 checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
443 checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
381 dependencies = [
444 dependencies = [
382 "winapi",
445 "winapi",
383 ]
446 ]
384
447
385 [[package]]
448 [[package]]
449 name = "rustix"
450 version = "0.38.4"
451 source = "registry+https://github.com/rust-lang/crates.io-index"
452 checksum = "0a962918ea88d644592894bc6dc55acc6c0956488adcebbfb6e273506b7fd6e5"
453 dependencies = [
454 "bitflags",
455 "errno",
456 "libc",
457 "linux-raw-sys",
458 "windows-sys",
459 ]
460
461 [[package]]
386 name = "ryu"
462 name = "ryu"
387 version = "1.0.9"
463 version = "1.0.9"
388 source = "registry+https://github.com/rust-lang/crates.io-index"
464 source = "registry+https://github.com/rust-lang/crates.io-index"
389 checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
465 checksum = "73b4b750c782965c211b42f022f59af1fbceabdd026623714f104152f1ec149f"
390
466
391 [[package]]
467 [[package]]
392 name = "serde"
468 name = "serde"
393 version = "1.0.136"
469 version = "1.0.136"
394 source = "registry+https://github.com/rust-lang/crates.io-index"
470 source = "registry+https://github.com/rust-lang/crates.io-index"
395 checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
471 checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
396 dependencies = [
472 dependencies = [
397 "serde_derive",
473 "serde_derive",
398 ]
474 ]
399
475
400 [[package]]
476 [[package]]
401 name = "serde_derive"
477 name = "serde_derive"
402 version = "1.0.136"
478 version = "1.0.136"
403 source = "registry+https://github.com/rust-lang/crates.io-index"
479 source = "registry+https://github.com/rust-lang/crates.io-index"
404 checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
480 checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
405 dependencies = [
481 dependencies = [
406 "proc-macro2",
482 "proc-macro2",
407 "quote",
483 "quote",
408 "syn",
484 "syn 1.0.87",
409 ]
485 ]
410
486
411 [[package]]
487 [[package]]
412 name = "serde_json"
488 name = "serde_json"
413 version = "1.0.79"
489 version = "1.0.79"
414 source = "registry+https://github.com/rust-lang/crates.io-index"
490 source = "registry+https://github.com/rust-lang/crates.io-index"
415 checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
491 checksum = "8e8d9fa5c3b304765ce1fd9c4c8a3de2c8db365a5b91be52f186efc675681d95"
416 dependencies = [
492 dependencies = [
417 "itoa",
493 "itoa",
418 "ryu",
494 "ryu",
419 "serde",
495 "serde",
420 ]
496 ]
421
497
422 [[package]]
498 [[package]]
423 name = "serde_yaml"
499 name = "serde_yaml"
424 version = "0.8.23"
500 version = "0.8.23"
425 source = "registry+https://github.com/rust-lang/crates.io-index"
501 source = "registry+https://github.com/rust-lang/crates.io-index"
426 checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
502 checksum = "a4a521f2940385c165a24ee286aa8599633d162077a54bdcae2a6fd5a7bfa7a0"
427 dependencies = [
503 dependencies = [
428 "indexmap",
504 "indexmap",
429 "ryu",
505 "ryu",
430 "serde",
506 "serde",
431 "yaml-rust",
507 "yaml-rust",
432 ]
508 ]
433
509
434 [[package]]
510 [[package]]
435 name = "similar"
511 name = "similar"
436 version = "2.1.0"
512 version = "2.1.0"
437 source = "registry+https://github.com/rust-lang/crates.io-index"
513 source = "registry+https://github.com/rust-lang/crates.io-index"
438 checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3"
514 checksum = "2e24979f63a11545f5f2c60141afe249d4f19f84581ea2138065e400941d83d3"
439 dependencies = [
515 dependencies = [
440 "bstr",
516 "bstr",
441 ]
517 ]
442
518
443 [[package]]
519 [[package]]
444 name = "strsim"
520 name = "strsim"
445 version = "0.10.0"
521 version = "0.10.0"
446 source = "registry+https://github.com/rust-lang/crates.io-index"
522 source = "registry+https://github.com/rust-lang/crates.io-index"
447 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
523 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
448
524
449 [[package]]
525 [[package]]
450 name = "syn"
526 name = "syn"
451 version = "1.0.87"
527 version = "1.0.87"
452 source = "registry+https://github.com/rust-lang/crates.io-index"
528 source = "registry+https://github.com/rust-lang/crates.io-index"
453 checksum = "1e59d925cf59d8151f25a3bedf97c9c157597c9df7324d32d68991cc399ed08b"
529 checksum = "1e59d925cf59d8151f25a3bedf97c9c157597c9df7324d32d68991cc399ed08b"
454 dependencies = [
530 dependencies = [
455 "proc-macro2",
531 "proc-macro2",
456 "quote",
532 "quote",
457 "unicode-xid",
533 "unicode-xid",
458 ]
534 ]
459
535
460 [[package]]
536 [[package]]
537 name = "syn"
538 version = "2.0.27"
539 source = "registry+https://github.com/rust-lang/crates.io-index"
540 checksum = "b60f673f44a8255b9c8c657daf66a596d435f2da81a555b06dc644d080ba45e0"
541 dependencies = [
542 "proc-macro2",
543 "quote",
544 "unicode-ident",
545 ]
546
547 [[package]]
461 name = "tempdir"
548 name = "tempdir"
462 version = "0.3.7"
549 version = "0.3.7"
463 source = "registry+https://github.com/rust-lang/crates.io-index"
550 source = "registry+https://github.com/rust-lang/crates.io-index"
464 checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
551 checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
465 dependencies = [
552 dependencies = [
466 "rand",
553 "rand",
467 "remove_dir_all",
554 "remove_dir_all",
468 ]
555 ]
469
556
470 [[package]]
557 [[package]]
471 name = "termcolor"
472 version = "1.1.3"
473 source = "registry+https://github.com/rust-lang/crates.io-index"
474 checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755"
475 dependencies = [
476 "winapi-util",
477 ]
478
479 [[package]]
480 name = "terminal_size"
558 name = "terminal_size"
481 version = "0.1.17"
559 version = "0.1.17"
482 source = "registry+https://github.com/rust-lang/crates.io-index"
560 source = "registry+https://github.com/rust-lang/crates.io-index"
483 checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
561 checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df"
484 dependencies = [
562 dependencies = [
485 "libc",
563 "libc",
486 "winapi",
564 "winapi",
487 ]
565 ]
488
566
489 [[package]]
567 [[package]]
490 name = "termtree"
568 name = "termtree"
491 version = "0.2.4"
569 version = "0.2.4"
492 source = "registry+https://github.com/rust-lang/crates.io-index"
570 source = "registry+https://github.com/rust-lang/crates.io-index"
493 checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
571 checksum = "507e9898683b6c43a9aa55b64259b721b52ba226e0f3779137e50ad114a4c90b"
494
572
495 [[package]]
573 [[package]]
496 name = "textwrap"
574 name = "unicode-ident"
497 version = "0.15.0"
575 version = "1.0.11"
498 source = "registry+https://github.com/rust-lang/crates.io-index"
576 source = "registry+https://github.com/rust-lang/crates.io-index"
499 checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"
577 checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
500
578
501 [[package]]
579 [[package]]
502 name = "unicode-xid"
580 name = "unicode-xid"
503 version = "0.2.2"
581 version = "0.2.2"
504 source = "registry+https://github.com/rust-lang/crates.io-index"
582 source = "registry+https://github.com/rust-lang/crates.io-index"
505 checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
583 checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
506
584
507 [[package]]
585 [[package]]
508 name = "version_check"
586 name = "utf8parse"
509 version = "0.9.4"
587 version = "0.2.1"
510 source = "registry+https://github.com/rust-lang/crates.io-index"
588 source = "registry+https://github.com/rust-lang/crates.io-index"
511 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
589 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
512
590
513 [[package]]
591 [[package]]
514 name = "wait-timeout"
592 name = "wait-timeout"
515 version = "0.2.0"
593 version = "0.2.0"
516 source = "registry+https://github.com/rust-lang/crates.io-index"
594 source = "registry+https://github.com/rust-lang/crates.io-index"
517 checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
595 checksum = "9f200f5b12eb75f8c1ed65abd4b2db8a6e1b138a20de009dacee265a2498f3f6"
518 dependencies = [
596 dependencies = [
519 "libc",
597 "libc",
520 ]
598 ]
521
599
522 [[package]]
600 [[package]]
523 name = "winapi"
601 name = "winapi"
524 version = "0.3.9"
602 version = "0.3.9"
525 source = "registry+https://github.com/rust-lang/crates.io-index"
603 source = "registry+https://github.com/rust-lang/crates.io-index"
526 checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
604 checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
527 dependencies = [
605 dependencies = [
528 "winapi-i686-pc-windows-gnu",
606 "winapi-i686-pc-windows-gnu",
529 "winapi-x86_64-pc-windows-gnu",
607 "winapi-x86_64-pc-windows-gnu",
530 ]
608 ]
531
609
532 [[package]]
610 [[package]]
533 name = "winapi-i686-pc-windows-gnu"
611 name = "winapi-i686-pc-windows-gnu"
534 version = "0.4.0"
612 version = "0.4.0"
535 source = "registry+https://github.com/rust-lang/crates.io-index"
613 source = "registry+https://github.com/rust-lang/crates.io-index"
536 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
614 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
537
615
538 [[package]]
616 [[package]]
539 name = "winapi-util"
540 version = "0.1.5"
541 source = "registry+https://github.com/rust-lang/crates.io-index"
542 checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
543 dependencies = [
544 "winapi",
545 ]
546
547 [[package]]
548 name = "winapi-x86_64-pc-windows-gnu"
617 name = "winapi-x86_64-pc-windows-gnu"
549 version = "0.4.0"
618 version = "0.4.0"
550 source = "registry+https://github.com/rust-lang/crates.io-index"
619 source = "registry+https://github.com/rust-lang/crates.io-index"
551 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
620 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
552
621
553 [[package]]
622 [[package]]
623 name = "windows-sys"
624 version = "0.48.0"
625 source = "registry+https://github.com/rust-lang/crates.io-index"
626 checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
627 dependencies = [
628 "windows-targets",
629 ]
630
631 [[package]]
632 name = "windows-targets"
633 version = "0.48.1"
634 source = "registry+https://github.com/rust-lang/crates.io-index"
635 checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
636 dependencies = [
637 "windows_aarch64_gnullvm",
638 "windows_aarch64_msvc",
639 "windows_i686_gnu",
640 "windows_i686_msvc",
641 "windows_x86_64_gnu",
642 "windows_x86_64_gnullvm",
643 "windows_x86_64_msvc",
644 ]
645
646 [[package]]
647 name = "windows_aarch64_gnullvm"
648 version = "0.48.0"
649 source = "registry+https://github.com/rust-lang/crates.io-index"
650 checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
651
652 [[package]]
653 name = "windows_aarch64_msvc"
654 version = "0.48.0"
655 source = "registry+https://github.com/rust-lang/crates.io-index"
656 checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
657
658 [[package]]
659 name = "windows_i686_gnu"
660 version = "0.48.0"
661 source = "registry+https://github.com/rust-lang/crates.io-index"
662 checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
663
664 [[package]]
665 name = "windows_i686_msvc"
666 version = "0.48.0"
667 source = "registry+https://github.com/rust-lang/crates.io-index"
668 checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
669
670 [[package]]
671 name = "windows_x86_64_gnu"
672 version = "0.48.0"
673 source = "registry+https://github.com/rust-lang/crates.io-index"
674 checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
675
676 [[package]]
677 name = "windows_x86_64_gnullvm"
678 version = "0.48.0"
679 source = "registry+https://github.com/rust-lang/crates.io-index"
680 checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
681
682 [[package]]
683 name = "windows_x86_64_msvc"
684 version = "0.48.0"
685 source = "registry+https://github.com/rust-lang/crates.io-index"
686 checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
687
688 [[package]]
554 name = "yaml-rust"
689 name = "yaml-rust"
555 version = "0.4.5"
690 version = "0.4.5"
556 source = "registry+https://github.com/rust-lang/crates.io-index"
691 source = "registry+https://github.com/rust-lang/crates.io-index"
557 checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
692 checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
558 dependencies = [
693 dependencies = [
559 "linked-hash-map",
694 "linked-hash-map",
560 ]
695 ]
Show file before | Show file after | Hide comments
@@ -1,21 +1,21 b''
1 # A tool that performs a 3-way merge, resolving conflicts in sorted lists and
1 # A tool that performs a 3-way merge, resolving conflicts in sorted lists and
2 # leaving other conflicts unchanged. This is useful with Mercurial's support
2 # leaving other conflicts unchanged. This is useful with Mercurial's support
3 # for partial merge tools (configured in `[partial-merge-tools]`).
3 # for partial merge tools (configured in `[partial-merge-tools]`).
4
4
5 [package]
5 [package]
6 name = "merge-lists"
6 name = "merge-lists"
7 version = "0.1.0"
7 version = "0.1.0"
8 edition = "2021"
8 edition = "2021"
9 # We need https://github.com/rust-lang/rust/pull/89825
9 # We need https://github.com/rust-lang/rust/pull/89825
10 rust-version = "1.59"
10 rust-version = "1.59"
11
11
12 [dependencies]
12 [dependencies]
13 clap = { version = "3.1.6", features = ["derive"] }
13 clap = { version = "4.3.17", features = ["derive"] }
14 itertools = "0.10.3"
14 itertools = "0.10.3"
15 regex = "1.5.5"
15 regex = "1.5.5"
16 similar = { version="2.1.0", features = ["bytes"] }
16 similar = { version="2.1.0", features = ["bytes"] }
17
17
18 [dev-dependencies]
18 [dev-dependencies]
19 assert_cmd = "2.0.4"
19 assert_cmd = "2.0.4"
20 insta = "1.13.0"
20 insta = "1.13.0"
21 tempdir = "0.3.7"
21 tempdir = "0.3.7"
General Comments 0
You need to be logged in to leave comments. Login now