diff options
| author | bors <bors@rust-lang.org> | 2021-11-05 04:35:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-11-05 04:35:13 +0000 |
| commit | b99bd8f8be49ba9676d3274fdbd06b2d476adfcd (patch) | |
| tree | d5d6436ab391a2b0da3d1772ee75b1f958de8fce /src/tools/rustdoc-js/tester.js | |
| parent | a6162f6c0ff39a6cc8dcb11a456e54f592653cc9 (diff) | |
| parent | 3821ab231b2bdf6c6d6871fec45121c2f8715d1e (diff) | |
| download | rust-b99bd8f8be49ba9676d3274fdbd06b2d476adfcd.tar.gz rust-b99bd8f8be49ba9676d3274fdbd06b2d476adfcd.zip | |
Auto merge of #90598 - JohnTitor:rollup-kz1qioz, r=JohnTitor
Rollup of 9 pull requests
Successful merges:
- #90507 (Suggest `extern crate alloc` when using undeclared module `alloc`)
- #90530 (Simplify js tester a bit)
- #90533 (Add note about x86 instruction prefixes in asm! to unstable book)
- #90537 (Update aarch64 `target_feature` list for LLVM 12.)
- #90544 (Demote metadata load warning to "info".)
- #90554 (Clean up some `-Z unstable-options` in tests.)
- #90556 (Add more text and examples to `carrying_{add|mul}`)
- #90563 (rustbot allow labels)
- #90571 (Fix missing bottom border for headings in sidebar)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools/rustdoc-js/tester.js')
| -rw-r--r-- | src/tools/rustdoc-js/tester.js | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/tools/rustdoc-js/tester.js b/src/tools/rustdoc-js/tester.js index bb9cd00f3f5..a673e425dff 100644 --- a/src/tools/rustdoc-js/tester.js +++ b/src/tools/rustdoc-js/tester.js @@ -414,7 +414,7 @@ function parseOptions(args) { "test_folder": "", "test_file": "", }; - var correspondances = { + var correspondences = { "--resource-suffix": "resource_suffix", "--doc-folder": "doc_folder", "--test-folder": "test_folder", @@ -423,17 +423,13 @@ function parseOptions(args) { }; for (var i = 0; i < args.length; ++i) { - if (args[i] === "--resource-suffix" - || args[i] === "--doc-folder" - || args[i] === "--test-folder" - || args[i] === "--test-file" - || args[i] === "--crate-name") { + if (correspondences.hasOwnProperty(args[i])) { i += 1; if (i >= args.length) { console.log("Missing argument after `" + args[i - 1] + "` option."); return null; } - opts[correspondances[args[i - 1]]] = args[i]; + opts[correspondences[args[i - 1]]] = args[i]; } else if (args[i] === "--help") { showHelp(); process.exit(0); |
