Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

Fixing span manipulation and indentation of the suggestion introduced by #126187 #129405

Merged
merged 1 commit into from
Aug 26, 2024
Merged

Fixing span manipulation and indentation of the suggestion introduced by #126187 #129405

merged 1 commit into from
Aug 26, 2024

Conversation

surechen
Copy link
Contributor

@surechen surechen commented Aug 22, 2024 •
edited
Loading

@rustbot
Copy link
Collaborator

rustbot commented Aug 22, 2024

r? @compiler-errors

rustbot has assigned @compiler-errors.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot
Copy link
Collaborator

rustbot commented Aug 22, 2024

Changes to the size of AST and/or HIR nodes.

cc @nnethercote

@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 Aug 22, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rustbot
Copy link
Collaborator

rustbot commented Aug 23, 2024

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

@cjgillot
Copy link
Contributor

no_brace_span.shrink_to_hi() is tcx.source_map().end_point(b.span).shrink_to_hi().
And you can use tcx.source_map().indentation_before(..) to get the correct number of spaces.

@surechen
Copy link
Contributor Author

no_brace_span.shrink_to_hi() is tcx.source_map().end_point(b.span).shrink_to_hi(). And you can use tcx.source_map().indentation_before(..) to get the correct number of spaces.

Done. Thank you.

cjgillot
cjgillot reviewed Aug 24, 2024
View reviewed changes
compiler/rustc_trait_selection/src/error_reporting/traits/suggestions.rs Outdated
b.span.shrink_to_hi().with_lo(b.span.hi() - BytePos(1)),
"\n Ok(())\n}".to_string(),
self.tcx.sess.source_map().end_point(b.span).shrink_to_lo(),
"\n Ok(())\n".to_string(),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you fix the indentation level too?
And maybe avoid creating an empty line before the Ok?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you fix the indentation level too? And maybe avoid creating an empty line before the Ok?

Done. Thank you.

@surechen surechen requested a review from cjgillot August 25, 2024 12:49
@cjgillot
Copy link
Contributor

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Aug 25, 2024

📌 Commit 8750e24 has been approved by cjgillot

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 Aug 25, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 25, 2024
@matthiaskrgr
Rollup merge of rust-lang#129405 - surechen:fix_span_x, r=cjgillot
614ea5a 
Fixing span manipulation and indentation of the suggestion introduced by rust-lang#126187

According to comments:
rust-lang#128084 (comment)
https://github.com/rust-lang/rust/pull/126187/files#r1634897691
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 25, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
@bors
Auto merge of rust-lang#129591 - matthiaskrgr:rollup-t1y17qs, r=matth…
751e9ff 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#129207 (Lint that warns when an elided lifetime ends up being a named lifetime)
 - rust-lang#129288 (Use subtyping for `UnsafeFnPointer` coercion, too)
 - rust-lang#129405 (Fixing span manipulation and indentation of the suggestion introduced by rust-lang#126187)
 - rust-lang#129518 (gitignore: ignore ICE reports regardless of directory)
 - rust-lang#129519 (Remove redundant flags from `lower_ty_common` that can be inferred from the HIR)
 - rust-lang#129544 (Removes dead code from the compiler)
 - rust-lang#129553 (add back test for stable-const-can-only-call-stable-const)
 - rust-lang#129590 (Avoid taking reference of &TyKind)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Aug 25, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 26, 2024
@bors
Auto merge of rust-lang#129595 - matthiaskrgr:rollup-4udn7nn, r=matth…
d305239 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#129288 (Use subtyping for `UnsafeFnPointer` coercion, too)
 - rust-lang#129405 (Fixing span manipulation and indentation of the suggestion introduced by rust-lang#126187)
 - rust-lang#129518 (gitignore: ignore ICE reports regardless of directory)
 - rust-lang#129519 (Remove redundant flags from `lower_ty_common` that can be inferred from the HIR)
 - rust-lang#129525 (rustdoc: clean up tuple <-> primitive conversion docs)
 - rust-lang#129526 (Use `FxHasher` on new solver unconditionally)
 - rust-lang#129544 (Removes dead code from the compiler)
 - rust-lang#129553 (add back test for stable-const-can-only-call-stable-const)
 - rust-lang#129590 (Avoid taking reference of &TyKind)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 26, 2024
@bors
Auto merge of rust-lang#129595 - matthiaskrgr:rollup-4udn7nn, r=matth…
f48062e 
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#129288 (Use subtyping for `UnsafeFnPointer` coercion, too)
 - rust-lang#129405 (Fixing span manipulation and indentation of the suggestion introduced by rust-lang#126187)
 - rust-lang#129518 (gitignore: ignore ICE reports regardless of directory)
 - rust-lang#129519 (Remove redundant flags from `lower_ty_common` that can be inferred from the HIR)
 - rust-lang#129525 (rustdoc: clean up tuple <-> primitive conversion docs)
 - rust-lang#129526 (Use `FxHasher` on new solver unconditionally)
 - rust-lang#129544 (Removes dead code from the compiler)
 - rust-lang#129553 (add back test for stable-const-can-only-call-stable-const)
 - rust-lang#129590 (Avoid taking reference of &TyKind)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 6228bd6 into rust-lang:master Aug 26, 2024
6 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 26, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 26, 2024
@rust-timer
Unrolled build for rust-lang#129405
f29614b 
Rollup merge of rust-lang#129405 - surechen:fix_span_x, r=cjgillot

Fixing span manipulation and indentation of the suggestion introduced by rust-lang#126187

According to comments:
rust-lang#128084 (comment)
https://github.com/rust-lang/rust/pull/126187/files#r1634897691
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjgillot cjgillot Awaiting requested review from cjgillot

Assignees

@compiler-errors compiler-errors

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
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.
6 participants
@surechen @rustbot @rust-log-analyzer @cjgillot @bors @compiler-errors