Skip to content

Commit 064b946

Browse files
robertoaloimeta-codesync[bot]
authored andcommitted
Bump bpaf from 0.7.9 to 0.7.10
Summary: The new version of the library introduces something called ["dynamic help splitting"](pacak/bpaf@9ec89ad). This changes the way help output is rendered to optimize space (and losing some alignment). This diff updates the library and the test expectations. Reviewed By: katiejots Differential Revision: D92984428 fbshipit-source-id: 126006cecf037e216fb0b1608aa8da31dff97179
1 parent 7da1ff3 commit 064b946

14 files changed

+157
-124
lines changed

Cargo.lock

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ hir = { path = "./crates/hir" }
4141
trie-rs = "0.4.2"
4242
always-assert = "0.1.3"
4343
anyhow = "1.0.86"
44-
bpaf = { version = "=0.7.9", features = ["derive", "autocomplete", "batteries"] }
44+
bpaf = { version = "=0.7.10", features = ["derive", "autocomplete", "batteries"] }
4545
byteorder = "1.5.0"
4646
codespan-reporting = "0.11.1"
4747
cov-mark = "2.0.0"

crates/elp/src/resources/test/build_info_help.stdout

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ Usage: [--project PROJECT] --to TO
22

33
Available options:
44
--project <PROJECT> Path to directory with project, or to a JSON file (defaults to `.`)
5-
--to <TO> Path to a (JSON) file to write the build information
6-
-h, --help Prints help information
5+
--to <TO> Path to a (JSON) file to write the build information
6+
-h, --help Prints help information
Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
Usage: [--project PROJECT] [--as PROFILE] [[--format FORMAT]] [--rebar] [--bail-on-error] [--stats] [--list-modules]
1+
Usage: [--project PROJECT] [--as PROFILE] [[--format FORMAT]] [--rebar] [--bail-on-error] [--stats]
2+
[--list-modules]
23

34
Available options:
45
--project <PROJECT> Path to directory with project, or to a JSON file (defaults to `.`)
5-
--as <PROFILE> Rebar3 profile to pickup (default is test)
6-
--format <FORMAT> Show diagnostics in JSON format
7-
--rebar Run with rebar
8-
--bail-on-error Exit with a non-zero status code if any errors are found
9-
--stats Print statistics when done
10-
--list-modules When printing statistics, include the list of modules parsed
11-
-h, --help Prints help information
6+
--as <PROFILE> Rebar3 profile to pickup (default is test)
7+
--format <FORMAT> Show diagnostics in JSON format
8+
--rebar Run with rebar
9+
--bail-on-error Exit with a non-zero status code if any errors are found
10+
--stats Print statistics when done
11+
--list-modules When printing statistics, include the list of modules parsed
12+
-h, --help Prints help information

crates/elp/src/resources/test/eqwalize_app.stdout

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Available positional items:
55

66
Available options:
77
--project <PROJECT> Path to directory with project, or to a JSON file (defaults to `.`)
8-
--as <PROFILE> Rebar3 profile to pickup (default is test)
9-
--rebar Run with rebar
10-
--bail-on-error Exit with a non-zero status code if any errors are found
11-
-h, --help Prints help information
8+
--as <PROFILE> Rebar3 profile to pickup (default is test)
9+
--rebar Run with rebar
10+
--bail-on-error Exit with a non-zero status code if any errors are found
11+
-h, --help Prints help information
Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
Usage: [--project PROJECT] [--as PROFILE] [[--format FORMAT]] [--rebar] [--bail-on-error] <MODULES>...
1+
Usage: [--project PROJECT] [--as PROFILE] [[--format FORMAT]] [--rebar] [--bail-on-error]
2+
<MODULES>...
23

34
Available positional items:
45
<MODULES> Eqwalize specified modules
56

67
Available options:
78
--project <PROJECT> Path to directory with project, or to a JSON file (defaults to `.`)
8-
--as <PROFILE> Rebar3 profile to pickup (default is test)
9-
--format <FORMAT> Show diagnostics in JSON format
10-
--rebar Run with rebar
11-
--bail-on-error Exit with a non-zero status code if any errors are found
12-
-h, --help Prints help information
9+
--as <PROFILE> Rebar3 profile to pickup (default is test)
10+
--format <FORMAT> Show diagnostics in JSON format
11+
--rebar Run with rebar
12+
--bail-on-error Exit with a non-zero status code if any errors are found
13+
-h, --help Prints help information

crates/elp/src/resources/test/eqwalize_target_help.stdout

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ Available positional items:
55

66
Available options:
77
--project <PROJECT> Path to directory with project, or to a JSON file (defaults to `.`)
8-
--bail-on-error Exit with a non-zero status code if any errors are found
9-
-h, --help Prints help information
8+
--bail-on-error Exit with a non-zero status code if any errors are found
9+
-h, --help Prints help information

crates/elp/src/resources/test/glean_help.stdout

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Usage: [--project PROJECT] [--module MODULE] [--to TO] [--v2] [--pretty] [--mult
33
Available options:
44
--project <PROJECT> Path to directory with project, or to a JSON file (defaults to `.`)
55
--module <MODULE>
6-
--to <TO> Path to a directory where to dump result
7-
--v2 Produce glean db with macros, types, xrefs. Incompatible with previous
8-
--pretty Pretty print
9-
--multi Output each fact separately
10-
-h, --help Prints help information
6+
--to <TO> Path to a directory where to dump result
7+
--v2 Produce glean db with macros, types, xrefs. Incompatible with previous
8+
--pretty Pretty print
9+
--multi Output each fact separately
10+
-h, --help Prints help information

crates/elp/src/resources/test/help.stdout

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
1-
Usage: [--log-file LOG_FILE] [--erl ERL] [--escript ESCRIPT] [--no-log-buffering] [--no-buck-generated] [--buck-quick-start] [[--color WHEN]] [COMMAND ...]
1+
Usage: [--log-file LOG_FILE] [--erl ERL] [--escript ESCRIPT] [--no-log-buffering]
2+
[--no-buck-generated] [--buck-quick-start] [[--color WHEN]] [COMMAND ...]
23

34
Available options:
45
--log-file <LOG_FILE>
56
--erl <ERL>
67
--escript <ESCRIPT>
78
--no-log-buffering
8-
--no-buck-generated When using buck, do not invoke a build step for generated files.
9-
--buck-quick-start Use buck2 targets for first stage project loading
10-
--color <WHEN> Use color in output; WHEN is 'always', 'never', or 'auto'
11-
-h, --help Prints help information
9+
--no-buck-generated When using buck, do not invoke a build step for generated files.
10+
--buck-quick-start Use buck2 targets for first stage project loading
11+
--color <WHEN> Use color in output; WHEN is 'always', 'never', or 'auto'
12+
-h, --help Prints help information
1213

1314
Available commands:
1415
version Print version
@@ -18,10 +19,12 @@ Available commands:
1819
eqwalize-all Eqwalize all opted-in modules in a project
1920
eqwalize-app Eqwalize all opted-in modules in specified application
2021
eqwalize-target Eqwalize all opted-in modules in specified buck target
21-
dialyze-all Run Dialyzer on the whole project by shelling out to a `dialyzer-run` tool on the path to do the legwork.
22+
dialyze-all Run Dialyzer on the whole project by shelling out to a `dialyzer-run` tool
23+
on the path to do the legwork.
2224
lint Parse files in project and emit diagnostics, optionally apply fixes.
2325
ssr Run SSR (Structural Search and Replace) pattern matching on project files.
24-
search Alias for 'ssr': Run SSR (Structural Search and Replace) pattern matching on project files.
26+
search Alias for 'ssr': Run SSR (Structural Search and Replace) pattern matching
27+
on project files.
2528
parse-all Dump ast for all files in a project for specified rebar.config file
2629
parse-elp Tree-sitter parse all files in a project for specified rebar.config file
2730
explain Explain a diagnostic code
Lines changed: 50 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,56 @@
1-
Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE] [--include-generated] [--include-tests] [--no-diags] [[--format FORMAT]] [--include-erlc-diagnostics] [--include-ct-diagnostics] [--include-edoc-diagnostics] [--include-eqwalizer-diagnostics] [--include-suppressed] [--use-cli-severity] [--diagnostic-ignore CODE] [--diagnostic-filter CODE] [--experimental] [--read-config] [--config-file CONFIG_FILE] [--apply-fix] [--ignore-fix-only] [--in-place] [--to TO] [--recursive] [--with-check] [--check-eqwalize-all] [--one-shot] [--report-system-stats] [--no-stream] <IGNORED_APPS>...
1+
Usage: [--project PROJECT] [--module MODULE] [--app APP] [--file FILE] [--rebar] [--as PROFILE]
2+
[--include-generated] [--include-tests] [--no-diags] [[--format FORMAT]] [--include-erlc-diagnostics]
3+
[--include-ct-diagnostics] [--include-edoc-diagnostics] [--include-eqwalizer-diagnostics]
4+
[--include-suppressed] [--use-cli-severity] [--diagnostic-ignore CODE] [--diagnostic-filter CODE]
5+
[--experimental] [--read-config] [--config-file CONFIG_FILE] [--apply-fix] [--ignore-fix-only]
6+
[--in-place] [--to TO] [--recursive] [--with-check] [--check-eqwalize-all] [--one-shot]
7+
[--report-system-stats] [--no-stream] <IGNORED_APPS>...
28

39
Available positional items:
410
<IGNORED_APPS> Rest of args are space separated list of apps to ignore
511

612
Available options:
7-
--project <PROJECT> Path to directory with project, or to a JSON file (defaults to `.`)
8-
--module <MODULE> Parse a single module from the project, not the entire project.
9-
--app <APP> Parse a single application from the project, not the entire project.
10-
--file <FILE> Parse a single file from the project, not the entire project. This can be an include file or escript, etc.
11-
--rebar Run with rebar
12-
--as <PROFILE> Rebar3 profile to pickup (default is test)
13-
--include-generated Also generate diagnostics for generated files
14-
--include-tests Also generate diagnostics for test files
15-
--no-diags Do not print the full diagnostics for a file, just the count
16-
--format <FORMAT> Show diagnostics in JSON format
17-
--include-erlc-diagnostics Include diagnostics produced by erlc
18-
--include-ct-diagnostics Deprecated (no-op): Common Test diagnostics are now always included
19-
--include-edoc-diagnostics Include EDoc diagnostics
13+
--project <PROJECT> Path to directory with project, or to a JSON file (defaults to `.`)
14+
--module <MODULE> Parse a single module from the project, not the entire project.
15+
--app <APP> Parse a single application from the project, not the entire project.
16+
--file <FILE> Parse a single file from the project, not the entire project. This can be an
17+
include file or escript, etc.
18+
--rebar Run with rebar
19+
--as <PROFILE> Rebar3 profile to pickup (default is test)
20+
--include-generated Also generate diagnostics for generated files
21+
--include-tests Also generate diagnostics for test files
22+
--no-diags Do not print the full diagnostics for a file, just the count
23+
--format <FORMAT> Show diagnostics in JSON format
24+
--include-erlc-diagnostics Include diagnostics produced by erlc
25+
--include-ct-diagnostics Deprecated (no-op): Common Test diagnostics are now always included
26+
--include-edoc-diagnostics Include EDoc diagnostics
2027
--include-eqwalizer-diagnostics Include Eqwalizer diagnostics
21-
--include-suppressed Include Suppressed diagnostics (e.g. elp:fixme)
22-
--use-cli-severity If specified, use the provided CLI severity mapping instead of the default one
23-
--diagnostic-ignore <CODE> Ignore the specified diagnostic, by code or label
24-
--diagnostic-filter <CODE> Filter out all reported diagnostics except this one, by code or label
25-
--experimental Report experimental diagnostics too, if diagnostics are enabled
26-
--read-config Get some configuration from a .elp_lint.toml file instead in the project root
27-
--config-file <CONFIG_FILE> Override normal configuration file. When set, acts as if READ_CONFIG is true.
28-
--apply-fix If the diagnostic has an associated fix, apply it. Modifies the original file. Use --to to write to a different directory.
29-
--ignore-fix-only Only apply elp:ignore fixes
30-
--in-place Deprecated: in-place is now the default behavior. This flag will be removed in a future release.
31-
--to <TO> When applying a fix, put the results in this directory path
32-
--recursive If applying fixes, apply any new ones that arise from the
33-
prior fixes recursively. Limited in scope to the clause of the
34-
prior change.
35-
--with-check After applying a fix step, check that the diagnostics are clear, else roll back
36-
--check-eqwalize-all After applying a fix step, check that all eqwalizer project diagnostics are clear, else roll back
37-
--one-shot Apply to all matching diagnostic occurrences at once, rather
38-
than one at a time.
39-
--report-system-stats Report system memory usage and other statistics
40-
--no-stream Disable streaming of diagnostics when applying fixes (collect all before printing)
41-
-h, --help Prints help information
28+
--include-suppressed Include Suppressed diagnostics (e.g. elp:fixme)
29+
--use-cli-severity If specified, use the provided CLI severity mapping instead of the
30+
default one
31+
--diagnostic-ignore <CODE> Ignore the specified diagnostic, by code or label
32+
--diagnostic-filter <CODE> Filter out all reported diagnostics except this one, by code or
33+
label
34+
--experimental Report experimental diagnostics too, if diagnostics are enabled
35+
--read-config Get some configuration from a .elp_lint.toml file instead in the project
36+
root
37+
--config-file <CONFIG_FILE> Override normal configuration file. When set, acts as if
38+
READ_CONFIG is true.
39+
--apply-fix If the diagnostic has an associated fix, apply it. Modifies the original
40+
file. Use --to to write to a different directory.
41+
--ignore-fix-only Only apply elp:ignore fixes
42+
--in-place Deprecated: in-place is now the default behavior. This flag will be removed
43+
in a future release.
44+
--to <TO> When applying a fix, put the results in this directory path
45+
--recursive If applying fixes, apply any new ones that arise from the prior fixes
46+
recursively. Limited in scope to the clause of the prior change.
47+
--with-check After applying a fix step, check that the diagnostics are clear, else roll
48+
back
49+
--check-eqwalize-all After applying a fix step, check that all eqwalizer project diagnostics
50+
are clear, else roll back
51+
--one-shot Apply to all matching diagnostic occurrences at once, rather than one at a
52+
time.
53+
--report-system-stats Report system memory usage and other statistics
54+
--no-stream Disable streaming of diagnostics when applying fixes (collect all before
55+
printing)
56+
-h, --help Prints help information

0 commit comments

Comments
 (0)