Skip to content

Minimize can_begin_literal_maybe_minus usage #126708

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged

Conversation

nnethercote
Copy link
Contributor

can_begin_literal_maybe_minus is used in a few confusing ways. This PR makes them clearer.

r? @spastorino

It's clearer this way, because the `Interpolated` cases in
`can_begin_const_arg` and `is_pat_range_end_start` are more permissive
than the `Interpolated` cases in `can_begin_literal_maybe_minus`.
We currently use `can_begin_literal_maybe_minus` in a couple of places
where only string literals are allowed. This commit introduces a
more specific function, which makes things clearer. It doesn't change
behaviour because the two functions affected (`is_unsafe_foreign_mod`
and `check_keyword_case`) are always followed by a call to `parse_abi`,
which checks again for a string literal.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jun 19, 2024
@compiler-errors
Copy link
Member

r=me when CI is green

@nnethercote
Copy link
Contributor Author

Thanks for the fast review!

@bors r=compiler-errors

@bors
Copy link
Collaborator

bors commented Jun 19, 2024

📌 Commit c6f7827 has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 19, 2024
@nnethercote
Copy link
Contributor Author

@bors rollup

jieyouxu added a commit to jieyouxu/rust that referenced this pull request Jun 19, 2024
…eral_maybe_minus, r=compiler-errors

Minimize `can_begin_literal_maybe_minus` usage

`can_begin_literal_maybe_minus` is used in a few confusing ways. This PR makes them clearer.

r? `@spastorino`
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2024
Rollup of 9 pull requests

Successful merges:

 - rust-lang#126095 (Migrate `link-args-order`, `ls-metadata` and `lto-readonly-lib` `run-make` tests to `rmake`)
 - rust-lang#126534 (Migrate `run-make/comment-section` to `rmake.rs`)
 - rust-lang#126620 (Actually taint InferCtxt when a fulfillment error is emitted)
 - rust-lang#126629 (Migrate `run-make/compressed-debuginfo` to `rmake.rs`)
 - rust-lang#126644 (Rewrite `extern-flag-rename-transitive`. `debugger-visualizer-dep-info`, `metadata-flag-frobs-symbols`, `extern-overrides-distribution` and `forced-unwind-terminate-pof` `run-make` tests to rmake)
 - rust-lang#126650 (Rename a bunch of things in the new solver and `rustc_type_ir`)
 - rust-lang#126698 (Migrate `unknown-mod-stdin`, `issue-68794-textrel-on-minimal-lib`, `raw-dylib-cross-compilation` and `used-cdylib-macos` `run-make` tests to rmake)
 - rust-lang#126703 (reword the hint::blackbox non-guarantees)
 - rust-lang#126708 (Minimize `can_begin_literal_maybe_minus` usage)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2024
…iaskrgr

Rollup of 5 pull requests

Successful merges:

 - rust-lang#126620 (Actually taint InferCtxt when a fulfillment error is emitted)
 - rust-lang#126649 (Fix `feature = "nightly"` in the new trait solver)
 - rust-lang#126652 (Clarify that anonymous consts still do introduce a new scope)
 - rust-lang#126703 (reword the hint::blackbox non-guarantees)
 - rust-lang#126708 (Minimize `can_begin_literal_maybe_minus` usage)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c979535 into rust-lang:master Jun 20, 2024
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 20, 2024
Rollup merge of rust-lang#126708 - nnethercote:minimize-can_begin_literal_maybe_minus, r=compiler-errors

Minimize `can_begin_literal_maybe_minus` usage

`can_begin_literal_maybe_minus` is used in a few confusing ways. This PR makes them clearer.

r? ``@spastorino``
@rustbot rustbot added this to the 1.81.0 milestone Jun 20, 2024
@nnethercote nnethercote deleted the minimize-can_begin_literal_maybe_minus branch June 20, 2024 09:29
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants