jsondocck: Use correct index for error message. #127287
Merged
+3 −1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
If you misused a count command like `@count $some.selector '"T'"`, you would panic with OOB: ``` thread 'main' panicked at src/tools/jsondocck/src/main.rs:76:92: index out of bounds: the len is 2 but the index is 2 ``` Fixing this typo, we now get. ``` Invalid command: Second argument to @count must be a valid usize (got `"T"`) on line 20 ``` As some point I want to rewrite this code to avoid indexing in general, but this is a nice small fix.
rustbot added A-rustdoc-json 
GuillaumeGomez approved these changes Jul 3, 2024
Member
| Thanks! r=me once CI pass |
Member Author
| @bors r=GuillaumeGomez rollup |
Collaborator
bors added S-waiting-on-bors 
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 4, 2024
Rollup of 5 pull requests Successful merges: - rust-lang#126792 (wasm64 build with target-feature=+simd128,+atomics) - rust-lang#127195 (Remove unqualified form import of io::Error in process_vxworks.rs and fallback on remove_dir_impl for vxworks) - rust-lang#127287 (jsondocck: Use correct index for error message.) - rust-lang#127289 (rustdoc-json: Better representation of lifetime bounds in where clauses.) - rust-lang#127303 (chore: remove repeat words) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jul 4, 2024
Rollup merge of rust-lang#127287 - aDotInTheVoid:jsondocck-index, r=GuillaumeGomez jsondocck: Use correct index for error message. If you misused a count command like ``@count` $some.selector '"T'"`, you would panic with OOB: ``` thread 'main' panicked at src/tools/jsondocck/src/main.rs:76:92: index out of bounds: the len is 2 but the index is 2 ``` This is because 57c85bd removed the file param, but didn't update the error case. We now error with: ``` Invalid command: Second argument to `@count` must be a valid usize (got `"T"`) on line 20 ``` As some point I want to rewrite this code to avoid indexing in general, but this is a nice small fix. r? `@GuillaumeGomez`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
If you misused a count command like
@count $some.selector '"T'", you would panic with OOB:This is because 57c85bd removed the file param, but didn't update the error case. We now error with:
As some point I want to rewrite this code to avoid indexing in general, but this is a nice small fix.
r? @GuillaumeGomez