Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
surechen:fix_span_x
Aug 26, 2024
Merged

Fixing span manipulation and indentation of the suggestion introduced by #126187#129405
bors merged 1 commit into
rust-lang:masterfrom
surechen:fix_span_x

Conversation

@surechen

@surechensurechen commented Aug 22, 2024•
edited
Loading

Copy link
Copy Markdown
Contributor

@rustbot

rustbot commented Aug 22, 2024

Copy link
Copy Markdown
Collaborator

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

rustbot commented Aug 22, 2024

Copy link
Copy Markdown
Collaborator

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

cc @nnethercote

@rustbotrustbot 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

rustbot commented Aug 23, 2024

Copy link
Copy Markdown
Collaborator

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

@cjgillot

cjgillot commented Aug 23, 2024

Copy link
Copy Markdown
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

surechen commented Aug 23, 2024

Copy link
Copy Markdown
ContributorAuthor

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
Comment threadcompiler/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(),

@cjgillotcjgillotAug 24, 2024

Copy link
Copy Markdown
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?

@surechensurechenAug 25, 2024

Copy link
Copy Markdown
ContributorAuthor

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 cjgillotAugust 25, 2024 12:49
@cjgillot

cjgillot commented Aug 25, 2024

Copy link
Copy Markdown
Contributor

@bors r+ rollup

@bors

bors commented Aug 25, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit 8750e24 has been approved by cjgillot

It is now in the queue for this repository.

@borsbors 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 ofrust-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
@matthiaskrgrmatthiaskrgr 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 ofrust-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
@matthiaskrgrmatthiaskrgr 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 ofrust-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 ofrust-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:masterAug 26, 2024
@rustbotrustbot 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 forrust-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 freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@cjgillotcjgillotAwaiting requested review from cjgillot

Assignees

@compiler-errorscompiler-errors

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant 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