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.

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

Remove all but one of the spans in BoundRegionKind::BrAnon #110276

Merged
merged 4 commits into from
Apr 14, 2023

Conversation

nnethercote
Copy link
Contributor

@nnethercote nnethercote commented Apr 13, 2023

There are only three places where BoundRegionKind::BrAnon uses Some(span) instead of None. Two of them are easy to remove, which this PR does.

r? @jackh726

@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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Apr 13, 2023
@rustbot
Copy link
Collaborator

rustbot commented Apr 13, 2023

Some changes occurred to the core trait solver

cc @rust-lang/initiative-trait-system-refactor

Copy link
Member

@jackh726 jackh726 left a comment

Choose a reason for hiding this comment

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

Unless you can solve the diagnostic removal for tests/ui/generic-associated-types/bugs/issue-100013.stderr, I don't think we can land this yet.

tests/ui/generic-associated-types/bugs/issue-100013.stderr Outdated Show resolved Hide resolved
@nnethercote nnethercote changed the title Remove the span in BoundRegionKind::BrAnon Remove all but one of the spans in BoundRegionKind::BrAnon Apr 14, 2023
@nnethercote
Copy link
Contributor Author

@jackh726 I've removed the last two commits, the earlier ones are still worth doing.

@jackh726
Copy link
Member

r=me with ci green

@nnethercote
Copy link
Contributor Author

@bors r=jackh726 rollup

@bors
Copy link
Contributor

bors commented Apr 14, 2023

📌 Commit f07c335 has been approved by jackh726

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 Apr 14, 2023
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Apr 14, 2023
…h726

Remove all but one of the spans in `BoundRegionKind::BrAnon`

There are only three places where `BoundRegionKind::BrAnon` uses `Some(span)` instead of `None`. Two of them are easy to remove, which this PR does.

r? `@jackh726`
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Apr 14, 2023
…h726

Remove all but one of the spans in `BoundRegionKind::BrAnon`

There are only three places where `BoundRegionKind::BrAnon` uses `Some(span)` instead of `None`. Two of them are easy to remove, which this PR does.

r? ``@jackh726``
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 14, 2023
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#109225 (Clarify that RUST_MIN_STACK may be internally cached)
 - rust-lang#109800 (Improve safe transmute error reporting)
 - rust-lang#110158 (Remove obsolete test case)
 - rust-lang#110180 (don't uniquify regions when canonicalizing)
 - rust-lang#110207 (Assemble `Unpin` candidates specially for generators in new solver)
 - rust-lang#110276 (Remove all but one of the spans in `BoundRegionKind::BrAnon`)
 - rust-lang#110279 (rustdoc: Correctly handle built-in compiler proc-macros as proc-macro and not macro)
 - rust-lang#110298 (Cover edge cases for {f32, f64}.hypot() docs)
 - rust-lang#110299 (Switch to `EarlyBinder` for `impl_subject` query)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit f3c6955 into rust-lang:master Apr 14, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 14, 2023
@nnethercote nnethercote deleted the rm-BrAnon-Span branch April 16, 2023 21:08
@lcnr lcnr removed the WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) label Apr 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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