Fixes handling of keywords in rustdoc json output #98390
Merged
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
GuillaumeGomez added T-rustdoc 
rust-highfive added the S-waiting-on-review 
notriddle approved these changes Jun 22, 2022
Contributor
| @bors r+ rollup |
Collaborator
| 📌 Commit 75ad2f7 has been approved by |
Collaborator
| 🌲 The tree is currently closed for pull requests below priority 1000. This pull request will be tested once the tree is reopened. |
bors added S-waiting-on-bors matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jun 23, 2022
…, r=notriddle Fixes handling of keywords in rustdoc json output Fixes rust-lang#98002. Instead of panicking, we just filter them out. cc `@matthiaskrgr` r? `@notriddle`
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Jun 23, 2022
…, r=notriddle Fixes handling of keywords in rustdoc json output Fixes rust-lang#98002. Instead of panicking, we just filter them out. cc ``@matthiaskrgr`` r? ``@notriddle``
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 24, 2022
…piler-errors Rollup of 16 pull requests Successful merges: - rust-lang#96173 (Fix documentation for `with_capacity` and `reserve` families of methods) - rust-lang#98184 (Give name if anonymous region appears in impl signature) - rust-lang#98259 (Greatly improve error reporting for futures and generators in `note_obligation_cause_code`) - rust-lang#98269 (Provide a `PathSegment.res` in more cases) - rust-lang#98283 (Point at private fields in struct literal) - rust-lang#98305 (prohibit_generics: don't alloc error string if no error emitted) - rust-lang#98310 (rustdoc: optimize loading of source sidebar) - rust-lang#98353 (Migrate two diagnostics from the `rustc_builtin_macros` crate) - rust-lang#98355 (Update no_default_libraries handling for emscripten target) - rust-lang#98364 (clarify Arc::clone overflow check comment) - rust-lang#98365 (Address review comments from rust-lang#98259) - rust-lang#98388 (implement `iter_projections` function on `PlaceRef`) - rust-lang#98390 (Fixes handling of keywords in rustdoc json output) - rust-lang#98409 (triagebot.toml: Allow applying nominated labels) - rust-lang#98410 (Update books) - rust-lang#98422 (Update browser-ui-test version to 0.9.6) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
5 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.
Fixes #98002.
Instead of panicking, we just filter them out.
cc @matthiaskrgr
r? @notriddle