Clean: rename open_braces to open_delimiters in lexer and move make_unclosed_delims_error into diagnostics.rs.
#140147
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
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
rustbot
added
S-waiting-on-review
compiler-errors
approved these changes
Apr 22, 2025
|
r? compiler-errors @bors r+ rollup |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 23, 2025
…enton Rollup of 7 pull requests Successful merges: - rust-lang#140142 (Some more graphviz tweaks) - rust-lang#140146 (Update `compiler_builtins` to 0.1.156) - rust-lang#140147 (Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.) - rust-lang#140160 (Use `is_lang_item` and `as_lang_item` instead of handrolling their logic) - rust-lang#140163 (Validate extension in `PathBuf::add_extension`) - rust-lang#140173 (Ping Mara when touching format_args!() internals.) - rust-lang#140175 (`rc""` more clear error message) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 23, 2025
…enton Rollup of 7 pull requests Successful merges: - rust-lang#140142 (Some more graphviz tweaks) - rust-lang#140146 (Update `compiler_builtins` to 0.1.156) - rust-lang#140147 (Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.) - rust-lang#140160 (Use `is_lang_item` and `as_lang_item` instead of handrolling their logic) - rust-lang#140163 (Validate extension in `PathBuf::add_extension`) - rust-lang#140173 (Ping Mara when touching format_args!() internals.) - rust-lang#140175 (`rc""` more clear error message) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 23, 2025
…enton Rollup of 7 pull requests Successful merges: - rust-lang#140142 (Some more graphviz tweaks) - rust-lang#140146 (Update `compiler_builtins` to 0.1.156) - rust-lang#140147 (Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.) - rust-lang#140160 (Use `is_lang_item` and `as_lang_item` instead of handrolling their logic) - rust-lang#140163 (Validate extension in `PathBuf::add_extension`) - rust-lang#140173 (Ping Mara when touching format_args!() internals.) - rust-lang#140175 (`rc""` more clear error message) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 23, 2025
…enton Rollup of 7 pull requests Successful merges: - rust-lang#140142 (Some more graphviz tweaks) - rust-lang#140146 (Update `compiler_builtins` to 0.1.156) - rust-lang#140147 (Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.) - rust-lang#140160 (Use `is_lang_item` and `as_lang_item` instead of handrolling their logic) - rust-lang#140163 (Validate extension in `PathBuf::add_extension`) - rust-lang#140173 (Ping Mara when touching format_args!() internals.) - rust-lang#140175 (`rc""` more clear error message) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 23, 2025
Rollup merge of rust-lang#140147 - xizheyin:issue-138401-1, r=compiler-errors Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`. Clean code prepared for resolving rust-lang#138401. To avoid having too many extraneous changes in one PR, I cleaned up some of the naming and method placement in lexer in this PR. 1. For the make_unclosed_delims_error function defined in mod.rs is only used in lexer, so moved into lexer, which enhances encapsulation. 2. For open_braces in TokenTreeDiagInfo the naming is not canonical, as Brace refers to `{...} ` and this variable can store all kinds of different Delimiters. so I named it open_delimiters. r? `@chenyukang`
github-actions bot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
Apr 24, 2025
…enton Rollup of 7 pull requests Successful merges: - rust-lang#140142 (Some more graphviz tweaks) - rust-lang#140146 (Update `compiler_builtins` to 0.1.156) - rust-lang#140147 (Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.) - rust-lang#140160 (Use `is_lang_item` and `as_lang_item` instead of handrolling their logic) - rust-lang#140163 (Validate extension in `PathBuf::add_extension`) - rust-lang#140173 (Ping Mara when touching format_args!() internals.) - rust-lang#140175 (`rc""` more clear error message) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Clean code prepared for resolving #138401. To avoid having too many extraneous changes in one PR, I cleaned up some of the naming and method placement in lexer in this PR.
{...}and this variable can store all kinds of different Delimiters. so I named it open_delimiters.r? @chenyukang