Skip to content

Rollup of 9 pull requests #109043

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.

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

Merged
merged 26 commits into from
Mar 12, 2023
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
63396b3
Allow binary files to go through the `FileLoader`
thomcc Mar 6, 2023
8ac7d0e
Add suggestion to diagnostic when user has array but trait wants slice.
BGR360 Nov 28, 2021
29b0bef
bootstrap: document tidy
Teapot4195 Mar 10, 2023
b7a7077
Give proper error message when tcx wasn't passed to decoder
Noratrieb Mar 11, 2023
898d2c1
remove duplicated calls to sort_string
klensy Mar 11, 2023
9a24e2f
Expand on the allocator comment in `rustc-main`
jyn514 Mar 11, 2023
e89bd94
fix link
jyn514 Mar 11, 2023
cde0b16
tidy: allow direct format args capture in macro
est31 Mar 4, 2023
7a686bf
tidy: enforce comment blocks to have even number of backticks
est31 Mar 3, 2023
7f4cc17
Address the new odd backticks tidy lint in compiler/
est31 Mar 4, 2023
9475717
Add a fixme and address a more non trivial case
est31 Mar 4, 2023
3a20d52
Extend the tidy lint to ftl files
est31 Mar 4, 2023
b2aeb07
Use trimmed instead of line for performance
est31 Mar 4, 2023
856c9bb
Add eslint checks for rustdoc-js tester
GuillaumeGomez Mar 11, 2023
904d9c5
Improve rustdoc-js tester code clarity a bit
GuillaumeGomez Mar 11, 2023
ca9b618
Add rustdoc-js eslint check into CI
GuillaumeGomez Mar 11, 2023
1c4603e
Commit some tests for the new solver + lazy norm
compiler-errors Mar 11, 2023
9668ae5
Rollup merge of #108726 - est31:backticks_matchmaking_tidy, r=Nilstrieb
matthiaskrgr Mar 12, 2023
b16ed69
Rollup merge of #108797 - thomcc:sourcemap_include_binary_file, r=com…
matthiaskrgr Mar 12, 2023
67c9dbf
Rollup merge of #108841 - jackh726:issue-90528, r=compiler-errors
matthiaskrgr Mar 12, 2023
0b0f334
Rollup merge of #108984 - Teapot4195:issue-106803-fix, r=ozkanonur
matthiaskrgr Mar 12, 2023
738c4bf
Rollup merge of #109013 - Nilstrieb:obscurity-is-not-a-necessity, r=f…
matthiaskrgr Mar 12, 2023
c9a38c3
Rollup merge of #109017 - klensy:dupe, r=cjgillot
matthiaskrgr Mar 12, 2023
7ad471b
Rollup merge of #109018 - jyn514:global-allocator-comment, r=lqd
matthiaskrgr Mar 12, 2023
54c95a8
Rollup merge of #109028 - GuillaumeGomez:rustdoc-js-tester-eslint, r=…
matthiaskrgr Mar 12, 2023
3166b4a
Rollup merge of #109034 - compiler-errors:lazy-norm-tests, r=jackh726
matthiaskrgr Mar 12, 2023
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
Prev Previous commit
Next Next commit
Improve rustdoc-js tester code clarity a bit
  • Loading branch information
GuillaumeGomez committed Mar 11, 2023
commit 904d9c5c549745793c98a1c2cd0a2665d30fe34e
16 changes: 9 additions & 7 deletions src/tools/rustdoc-js/tester.js
Original file line number Diff line number Diff line change
Expand Up @@ -361,22 +361,24 @@ function parseOptions(args) {
};

for (let i = 0; i < args.length; ++i) {
if (Object.prototype.hasOwnProperty.call(correspondences, args[i])) {
const arg = args[i];
if (Object.prototype.hasOwnProperty.call(correspondences, arg)) {
i += 1;
if (i >= args.length) {
console.log("Missing argument after `" + args[i - 1] + "` option.");
console.log("Missing argument after `" + arg + "` option.");
return null;
}
if (args[i - 1] !== "--test-file") {
opts[correspondences[args[i - 1]]] = args[i];
const arg_value = args[i];
if (arg !== "--test-file") {
opts[correspondences[arg]] = arg_value;
} else {
opts[correspondences[args[i - 1]]].push(args[i]);
opts[correspondences[arg]].push(arg_value);
}
} else if (args[i] === "--help") {
} else if (arg === "--help") {
showHelp();
process.exit(0);
} else {
console.log("Unknown option `" + args[i] + "`.");
console.log("Unknown option `" + arg + "`.");
console.log("Use `--help` to see the list of options");
return null;
}
Expand Down