Fix a span in `parse_ty_bare_fn`. #126724

nnethercote · 2024-06-20T05:02:26Z

It currently goes one token too far.

Example: line 259 of tests/ui/abi/compatibility.rs:

test_abi_compatible!(fn_fn, fn(), fn(i32) -> i32);

This commit changes the span for the second element from fn(), to fn(), i.e. removes the extraneous comma.

This doesn't affect any tests. I found it while debugging some other code. Not a big deal but an easy fix so I figure it worth doing.

r? @spastorino

compiler-errors

Oof, yeah. Span handling in the parser can be very manual.

compiler-errors · 2024-06-20T15:29:49Z

r? compiler-errors @bors r+ rollup

bors · 2024-06-20T15:29:52Z

📌 Commit e9a5dae has been approved by compiler-errors

It is now in the queue for this repository.

compiler-errors · 2024-06-20T15:30:08Z

Actually, wait. Please add a test lmao

@bors r-

compiler-errors · 2024-06-20T15:30:35Z

Unless there's a good reason to believe that this test is impossible to create

nnethercote · 2024-06-21T06:27:24Z

@compiler-errors: the decl_span field has a single meaningful use:

rust/compiler/rustc_resolve/src/late.rs

Line 813 in 7a08f84

let span = ty.span.shrink_to_lo().to(bare_fn.decl_span.shrink_to_lo());

and the hi field (i.e. the part changed by this PR) isn't even used, lol.

So the only way to test this would be with a -Zunpretty=ast-tree test, but that seems like overkill. I suggest we merge as is.

Please note that I have also modified a comment in the updated version.

compiler-errors · 2024-06-25T05:15:14Z

@bors r+

bors · 2024-06-25T05:15:17Z

📌 Commit c39b86a has been approved by compiler-errors

It is now in the queue for this repository.

…pan, r=compiler-errors Fix a span in `parse_ty_bare_fn`. It currently goes one token too far. Example: line 259 of `tests/ui/abi/compatibility.rs`: ``` test_abi_compatible!(fn_fn, fn(), fn(i32) -> i32); ``` This commit changes the span for the second element from `fn(),` to `fn()`, i.e. removes the extraneous comma. This doesn't affect any tests. I found it while debugging some other code. Not a big deal but an easy fix so I figure it worth doing. r? `@spastorino`

…mpiler-errors Rollup of 9 pull requests Successful merges: - rust-lang#126326 (Un-unsafe the `StableOrd` trait) - rust-lang#126618 (Mark assoc tys live only if the corresponding trait is live) - rust-lang#126724 (Fix a span in `parse_ty_bare_fn`.) - rust-lang#126746 (Deny `use<>` for RPITITs) - rust-lang#126868 (not use offset when there is not ends with brace) - rust-lang#126884 (Do not ICE when suggesting dereferencing closure arg) - rust-lang#126915 (Don't suggest awaiting in closure patterns) - rust-lang#126916 (Specify target specific linker for `riscv64gc-gnu` job) - rust-lang#126926 (Tweak a confusing comment in `create_match_candidates`) r? `@ghost` `@rustbot` modify labels: rollup

compiler-errors · 2024-06-25T15:32:32Z

needs blessing: #126949 (comment)

@bors r-

It currently goes one token too far. Example: line 259 of `tests/ui/abi/compatibility.rs`: ``` test_abi_compatible!(fn_fn, fn(), fn(i32) -> i32); ``` This commit changes the span for the second element from `fn(),` to `fn()`, i.e. removes the extraneous comma.

nnethercote · 2024-06-25T22:27:08Z

Talk about serendipity: this incorrect span had no meaningful uses until @spastorino added one in #126758, a PR that came after this one! But now we can see the effect in the changed test output, so that's nice.

@bors r=compiler-errors

bors · 2024-06-25T22:27:10Z

📌 Commit cf0251d has been approved by compiler-errors

It is now in the queue for this repository.

…pan, r=compiler-errors Fix a span in `parse_ty_bare_fn`. It currently goes one token too far. Example: line 259 of `tests/ui/abi/compatibility.rs`: ``` test_abi_compatible!(fn_fn, fn(), fn(i32) -> i32); ``` This commit changes the span for the second element from `fn(),` to `fn()`, i.e. removes the extraneous comma. This doesn't affect any tests. I found it while debugging some other code. Not a big deal but an easy fix so I figure it worth doing. r? `@spastorino`

…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#126158 (Disallow setting some built-in cfg via set the command-line) - rust-lang#126724 (Fix a span in `parse_ty_bare_fn`.) - rust-lang#126812 (Rename `tcx` to `cx` in new solver generic code) - rust-lang#126879 (fix Drop items getting leaked in Filter::next_chunk) - rust-lang#126941 (Migrate `run-make/llvm-ident` to `rmake.rs`) - rust-lang#126954 (resolve: Tweak some naming around import ambiguities) - rust-lang#126968 (Don't ICE during RPITIT refinement checking for resolution errors after normalization) - rust-lang#126973 (Fix bad replacement for unsafe extern block suggestion) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 10 pull requests Successful merges: - rust-lang#126724 (Fix a span in `parse_ty_bare_fn`.) - rust-lang#126812 (Rename `tcx` to `cx` in new solver generic code) - rust-lang#126879 (fix Drop items getting leaked in Filter::next_chunk) - rust-lang#126925 (Change E0369 to give note informations for foreign items.) - rust-lang#126938 (miri: make sure we can find link_section statics even for the local crate) - rust-lang#126954 (resolve: Tweak some naming around import ambiguities) - rust-lang#126964 (Migrate `lto-empty`, `invalid-so` and `issue-20626` `run-make` tests to rmake.rs) - rust-lang#126968 (Don't ICE during RPITIT refinement checking for resolution errors after normalization) - rust-lang#126971 (Bump black, ruff and platformdirs) - rust-lang#126973 (Fix bad replacement for unsafe extern block suggestion) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#126724 - nnethercote:fix-parse_ty_bare_fn-span, r=compiler-errors Fix a span in `parse_ty_bare_fn`. It currently goes one token too far. Example: line 259 of `tests/ui/abi/compatibility.rs`: ``` test_abi_compatible!(fn_fn, fn(), fn(i32) -> i32); ``` This commit changes the span for the second element from `fn(),` to `fn()`, i.e. removes the extraneous comma. This doesn't affect any tests. I found it while debugging some other code. Not a big deal but an easy fix so I figure it worth doing. r? ``@spastorino``

rustbot assigned spastorino Jun 20, 2024

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 20, 2024

compiler-errors approved these changes Jun 20, 2024

View reviewed changes

rustbot assigned compiler-errors and unassigned spastorino Jun 20, 2024

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 20, 2024

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 20, 2024

nnethercote force-pushed the fix-parse_ty_bare_fn-span branch from e9a5dae to c39b86a Compare June 21, 2024 06:22

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 25, 2024

compiler-errors mentioned this pull request Jun 25, 2024

Rollup of 9 pull requests #126949

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 25, 2024

nnethercote force-pushed the fix-parse_ty_bare_fn-span branch from c39b86a to cf0251d Compare June 25, 2024 22:24

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 25, 2024

matthiaskrgr mentioned this pull request Jun 26, 2024

Rollup of 8 pull requests #126974

Closed

matthiaskrgr mentioned this pull request Jun 26, 2024

Rollup of 10 pull requests #126979

Merged

bors merged commit dd6b046 into rust-lang:master Jun 26, 2024
6 checks passed

rustbot added this to the 1.81.0 milestone Jun 26, 2024

nnethercote deleted the fix-parse_ty_bare_fn-span branch June 26, 2024 23:29

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix a span in `parse_ty_bare_fn`. #126724

Fix a span in `parse_ty_bare_fn`. #126724

Uh oh!

nnethercote commented Jun 20, 2024

Uh oh!

compiler-errors left a comment

Uh oh!

compiler-errors commented Jun 20, 2024

Uh oh!

bors commented Jun 20, 2024

Uh oh!

compiler-errors commented Jun 20, 2024

Uh oh!

compiler-errors commented Jun 20, 2024

Uh oh!

nnethercote commented Jun 21, 2024 •

edited

Loading

Uh oh!

compiler-errors commented Jun 25, 2024

Uh oh!

bors commented Jun 25, 2024

Uh oh!

compiler-errors commented Jun 25, 2024

Uh oh!

nnethercote commented Jun 25, 2024

Uh oh!

bors commented Jun 25, 2024

Uh oh!

Uh oh!

Uh oh!

Fix a span in parse_ty_bare_fn. #126724

Fix a span in parse_ty_bare_fn. #126724

Uh oh!

Conversation

nnethercote commented Jun 20, 2024

Uh oh!

compiler-errors left a comment

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Jun 20, 2024

Uh oh!

bors commented Jun 20, 2024

Uh oh!

compiler-errors commented Jun 20, 2024

Uh oh!

compiler-errors commented Jun 20, 2024

Uh oh!

nnethercote commented Jun 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

compiler-errors commented Jun 25, 2024

Uh oh!

bors commented Jun 25, 2024

Uh oh!

compiler-errors commented Jun 25, 2024

Uh oh!

nnethercote commented Jun 25, 2024

Uh oh!

bors commented Jun 25, 2024

Uh oh!

Uh oh!

Uh oh!

Fix a span in `parse_ty_bare_fn`. #126724

Fix a span in `parse_ty_bare_fn`. #126724

nnethercote commented Jun 21, 2024 •

edited

Loading