Handle regions equivalent to 'static in non_local_bounds - #139668

Merged
bors merged 2 commits into
rust-lang:masterfrom
matthewjasper:upper-bound-fix
May 23, 2025
Merged

Handle regions equivalent to 'static in non_local_bounds#139668
bors merged 2 commits into
rust-lang:masterfrom
matthewjasper:upper-bound-fix

Conversation

@matthewjasper

@matthewjaspermatthewjasper commented Apr 11, 2025

Copy link
Copy Markdown
Contributor

non_local_bounds would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as dyn Any + 'a in the tests added, is well-formed. In this case we should return 'static.

closes#122704
closes#139004

@rustbot

rustbot commented Apr 11, 2025

Copy link
Copy Markdown
Collaborator

r? @nnethercote

rustbot has assigned @nnethercote.
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

@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 Apr 11, 2025
@rustbot

rustbot commented Apr 11, 2025

Copy link
Copy Markdown
Collaborator

This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.

@compiler-errors

compiler-errors commented Apr 11, 2025

Copy link
Copy Markdown
Contributor

r? types

@rustbotrustbot added the T-types Relevant to the types team, which will review and decide on the PR/issue. label Apr 11, 2025
@rustbotrustbot assigned BoxyUwU and unassigned nnethercoteApr 11, 2025
compiler-errors
compiler-errors reviewed Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_data_structures/src/transitive_relation.rs
compiler-errors
compiler-errors reviewed Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_borrowck/src/type_check/free_region_relations.rs Outdated
let mut external_parents = vec![];
let mut queue = vec![fr0];

let mut queue = vec![relation.scc_representative(fr0)];

@compiler-errorscompiler-errorsApr 11, 2025

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.

I'm not sure if you've explained why projecting the free region to its representative affects the set of non_local_bounds that we return. It's not obvious from the definition of TransitiveRelation::parents, at least.

Like, if these are actually SCC's then I'm not sure why shuffling around which element in that SCC fixes things.

Is there something subtle going on with the fact that 'static is the first first region vid we allocate?

@compiler-errorscompiler-errorsApr 11, 2025

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.

If it has to do with the fact that TransitiveRelation::parents requires for us to pass the minimal element for this while loop to actually reach all of the parents, then perhaps we should rename thatfunction to minimal_scc_representative 🤔

Or maybe I'm totally misleading myself.

@compiler-errorscompiler-errorsMay 22, 2025

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.

Hey @matthewjasper, did you mean to resolve this without actually answering the question?

@matthewjaspermatthewjasperMay 22, 2025

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.

Your second comment was correct and I renamed scc_representative to minimal_scc_representative

@compiler-errorscompiler-errorsMay 22, 2025

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.

Ah ok thanks

@compiler-errors

compiler-errors commented Apr 13, 2025

Copy link
Copy Markdown
Contributor

@rustbot author (waiting on questions)

@rustbotrustbot 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-review Status: Awaiting review from the assignee but also interested parties. labels Apr 13, 2025
@rustbot

rustbot commented Apr 13, 2025

Copy link
Copy Markdown
Collaborator

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@matthewjasper
Handle regions equivalent to 'static in non_local_bounds
2d5e80b
`non_local_bounds` would only find non local bounds that strictly bound a given region,
but it's possible that a local region is equated to 'static when showing a type referencing
a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In
this case we should return 'static.
@matthewjasper
Add unit tests for minimal_scc_representative
c57ef29
@matthewjasper

matthewjasper commented Apr 15, 2025

Copy link
Copy Markdown
ContributorAuthor

@rustbot ready

@rustbotrustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Apr 15, 2025
@compiler-errors

compiler-errors commented May 22, 2025

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented May 22, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit c57ef29 has been approved by compiler-errors

It is now in the queue for this repository.

@compiler-errors

compiler-errors commented May 22, 2025

Copy link
Copy Markdown
Contributor

@bors rollup

@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 May 22, 2025
@matthiaskrgrmatthiaskrgr mentioned this pull request May 22, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request May 22, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
912981a
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 706dc70 into rust-lang:masterMay 23, 2025
@rustbotrustbot added this to the 1.89.0 milestone May 23, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request May 23, 2025
@rust-timer
Unrolled build forrust-lang#139668
ab89094
Rollup merge of rust-lang#139668 - matthewjasper:upper-bound-fix, r=compiler-errors
Handle regions equivalent to 'static in non_local_bounds
`non_local_bounds` would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In this case we should return 'static.
closesrust-lang#122704closesrust-lang#139004
@matthewjasper
matthewjasper deleted the upper-bound-fix branch May 23, 2025 09:04
github-actionsBot pushed a commit to model-checking/verify-rust-std that referenced this pull request May 26, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
10ed7f5
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@tnuhatnuha mentioned this pull request Aug 10, 2025
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer
@compiler-errorscompiler-errorscompiler-errors left review comments
Reviewers whose approvals may not affect merge requirements

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.T-typesRelevant to the types team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.89.0

6 participants

@matthewjasper@rustbot@compiler-errors@bors@nnethercote@BoxyUwU
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Handle regions equivalent to 'static in non_local_bounds - #139668
Merged
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
May 23, 2025
Merged
Handle regions equivalent to 'static in non_local_bounds#139668
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
Conversation
@matthewjasper
@matthewjaspermatthewjasper
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
non_local_bounds would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as dyn Any + 'a in the tests added, is well-formed. In this case we should return 'static.
closes#122704
closes#139004
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
r? @nnethercote
rustbot has assigned @nnethercote.

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
@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
Apr 11, 2025
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.
@compiler-errors
compiler-errors
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
r? types
@rustbotrustbot
added
the 
T-types
Relevant to the types team, which will review and decide on the PR/issue.
label
Apr 11, 2025
@rustbotrustbot
assigned BoxyUwU and unassigned nnethercoteApr 11, 2025
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_data_structures/src/transitive_relation.rs
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_borrowck/src/type_check/free_region_relations.rs
Outdated

 let mut external_parents = vec![];
 let mut queue = vec![fr0];

 let mut queue = vec![relation.scc_representative(fr0)];
@compiler-errorscompiler-errorsApr 11, 2025

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.

I'm not sure if you've explained why projecting the free region to its representative affects the set of non_local_bounds that we return. It's not obvious from the definition of TransitiveRelation::parents, at least.
Like, if these are actually SCC's then I'm not sure why shuffling around which element in that SCC fixes things.
Is there something subtle going on with the fact that 'static is the first first region vid we allocate?
@compiler-errorscompiler-errorsApr 11, 2025

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.

If it has to do with the fact that TransitiveRelation::parents requires for us to pass the minimal element for this while loop to actually reach all of the parents, then perhaps we should rename thatfunction to minimal_scc_representative 🤔
Or maybe I'm totally misleading myself.
@compiler-errorscompiler-errorsMay 22, 2025

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.

Hey @matthewjasper, did you mean to resolve this without actually answering the question?
@matthewjaspermatthewjasperMay 22, 2025

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.

Your second comment was correct and I renamed scc_representative to minimal_scc_representative
@compiler-errorscompiler-errorsMay 22, 2025

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.

Ah ok thanks
@compiler-errors
compiler-errors
commented
Apr 13, 2025

Copy link


Copy Markdown

Contributor
@rustbot author (waiting on questions)
@rustbotrustbot
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Apr 13, 2025
@rustbot
rustbot
commented
Apr 13, 2025

Copy link


Copy Markdown

Collaborator
Reminder, once the PR becomes ready for a review, use @rustbot ready.
@matthewjasper
Handle regions equivalent to 'static in non_local_bounds
2d5e80b
`non_local_bounds` would only find non local bounds that strictly bound a given region,
but it's possible that a local region is equated to 'static when showing a type referencing
a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In
this case we should return 'static.
@matthewjasper
Add unit tests for minimal_scc_representative
c57ef29
@matthewjasper
matthewjasper
commented
Apr 15, 2025

Copy link


Copy Markdown

ContributorAuthor
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Apr 15, 2025
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors r+
@bors
bors
commented
May 22, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit c57ef29 has been approved by compiler-errors
It is now in the queue for this repository.
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors rollup
@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
May 22, 2025
@matthiaskrgrmatthiaskrgr
mentioned this pull request
May 22, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 22, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
912981a
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 706dc70
into
rust-lang:masterMay 23, 2025
@rustbotrustbot
added this to the 1.89.0 milestone
May 23, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 23, 2025
@rust-timer
Unrolled build forrust-lang#139668
ab89094
Rollup merge of rust-lang#139668 - matthewjasper:upper-bound-fix, r=compiler-errors
Handle regions equivalent to 'static in non_local_bounds
`non_local_bounds` would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In this case we should return 'static.
closesrust-lang#122704closesrust-lang#139004
@matthewjasper
matthewjasper
deleted the

upper-bound-fix

branch
May 23, 2025 09:04
github-actionsBot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
May 26, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
10ed7f5
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@tnuhatnuha
mentioned this pull request
Aug 10, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@compiler-errorscompiler-errorscompiler-errors left review comments
Reviewers whose approvals may not affect merge requirements

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.T-typesRelevant to the types team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.89.0

6 participants

@matthewjasper@rustbot@compiler-errors@bors@nnethercote@BoxyUwU

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Handle regions equivalent to 'static in non_local_bounds - #139668
Merged
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
May 23, 2025
Merged
Handle regions equivalent to 'static in non_local_bounds#139668
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
Conversation
@matthewjasper
@matthewjaspermatthewjasper
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
non_local_bounds would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as dyn Any + 'a in the tests added, is well-formed. In this case we should return 'static.
closes#122704
closes#139004
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
r? @nnethercote
rustbot has assigned @nnethercote.

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
@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
Apr 11, 2025
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.
@compiler-errors
compiler-errors
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
r? types
@rustbotrustbot
added
the 
T-types
Relevant to the types team, which will review and decide on the PR/issue.
label
Apr 11, 2025
@rustbotrustbot
assigned BoxyUwU and unassigned nnethercoteApr 11, 2025
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_data_structures/src/transitive_relation.rs
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_borrowck/src/type_check/free_region_relations.rs
Outdated

 let mut external_parents = vec![];
 let mut queue = vec![fr0];

 let mut queue = vec![relation.scc_representative(fr0)];
@compiler-errorscompiler-errorsApr 11, 2025

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.

I'm not sure if you've explained why projecting the free region to its representative affects the set of non_local_bounds that we return. It's not obvious from the definition of TransitiveRelation::parents, at least.
Like, if these are actually SCC's then I'm not sure why shuffling around which element in that SCC fixes things.
Is there something subtle going on with the fact that 'static is the first first region vid we allocate?
@compiler-errorscompiler-errorsApr 11, 2025

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.

If it has to do with the fact that TransitiveRelation::parents requires for us to pass the minimal element for this while loop to actually reach all of the parents, then perhaps we should rename thatfunction to minimal_scc_representative 🤔
Or maybe I'm totally misleading myself.
@compiler-errorscompiler-errorsMay 22, 2025

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.

Hey @matthewjasper, did you mean to resolve this without actually answering the question?
@matthewjaspermatthewjasperMay 22, 2025

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.

Your second comment was correct and I renamed scc_representative to minimal_scc_representative
@compiler-errorscompiler-errorsMay 22, 2025

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.

Ah ok thanks
@compiler-errors
compiler-errors
commented
Apr 13, 2025

Copy link


Copy Markdown

Contributor
@rustbot author (waiting on questions)
@rustbotrustbot
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Apr 13, 2025
@rustbot
rustbot
commented
Apr 13, 2025

Copy link


Copy Markdown

Collaborator
Reminder, once the PR becomes ready for a review, use @rustbot ready.
@matthewjasper
Handle regions equivalent to 'static in non_local_bounds
2d5e80b
`non_local_bounds` would only find non local bounds that strictly bound a given region,
but it's possible that a local region is equated to 'static when showing a type referencing
a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In
this case we should return 'static.
@matthewjasper
Add unit tests for minimal_scc_representative
c57ef29
@matthewjasper
matthewjasper
commented
Apr 15, 2025

Copy link


Copy Markdown

ContributorAuthor
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Apr 15, 2025
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors r+
@bors
bors
commented
May 22, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit c57ef29 has been approved by compiler-errors
It is now in the queue for this repository.
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors rollup
@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
May 22, 2025
@matthiaskrgrmatthiaskrgr
mentioned this pull request
May 22, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 22, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
912981a
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 706dc70
into
rust-lang:masterMay 23, 2025
@rustbotrustbot
added this to the 1.89.0 milestone
May 23, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 23, 2025
@rust-timer
Unrolled build forrust-lang#139668
ab89094
Rollup merge of rust-lang#139668 - matthewjasper:upper-bound-fix, r=compiler-errors
Handle regions equivalent to 'static in non_local_bounds
`non_local_bounds` would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In this case we should return 'static.
closesrust-lang#122704closesrust-lang#139004
@matthewjasper
matthewjasper
deleted the

upper-bound-fix

branch
May 23, 2025 09:04
github-actionsBot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
May 26, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
10ed7f5
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@tnuhatnuha
mentioned this pull request
Aug 10, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@compiler-errorscompiler-errorscompiler-errors left review comments
Reviewers whose approvals may not affect merge requirements

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.T-typesRelevant to the types team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.89.0

6 participants

@matthewjasper@rustbot@compiler-errors@bors@nnethercote@BoxyUwU

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Handle regions equivalent to 'static in non_local_bounds - #139668
Merged
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
May 23, 2025
Merged
Handle regions equivalent to 'static in non_local_bounds#139668
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
Conversation
@matthewjasper
@matthewjaspermatthewjasper
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
non_local_bounds would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as dyn Any + 'a in the tests added, is well-formed. In this case we should return 'static.
closes#122704
closes#139004
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
r? @nnethercote
rustbot has assigned @nnethercote.

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
@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
Apr 11, 2025
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.
@compiler-errors
compiler-errors
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
r? types
@rustbotrustbot
added
the 
T-types
Relevant to the types team, which will review and decide on the PR/issue.
label
Apr 11, 2025
@rustbotrustbot
assigned BoxyUwU and unassigned nnethercoteApr 11, 2025
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_data_structures/src/transitive_relation.rs
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_borrowck/src/type_check/free_region_relations.rs
Outdated

 let mut external_parents = vec![];
 let mut queue = vec![fr0];

 let mut queue = vec![relation.scc_representative(fr0)];
@compiler-errorscompiler-errorsApr 11, 2025

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.

I'm not sure if you've explained why projecting the free region to its representative affects the set of non_local_bounds that we return. It's not obvious from the definition of TransitiveRelation::parents, at least.
Like, if these are actually SCC's then I'm not sure why shuffling around which element in that SCC fixes things.
Is there something subtle going on with the fact that 'static is the first first region vid we allocate?
@compiler-errorscompiler-errorsApr 11, 2025

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.

If it has to do with the fact that TransitiveRelation::parents requires for us to pass the minimal element for this while loop to actually reach all of the parents, then perhaps we should rename thatfunction to minimal_scc_representative 🤔
Or maybe I'm totally misleading myself.
@compiler-errorscompiler-errorsMay 22, 2025

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.

Hey @matthewjasper, did you mean to resolve this without actually answering the question?
@matthewjaspermatthewjasperMay 22, 2025

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.

Your second comment was correct and I renamed scc_representative to minimal_scc_representative
@compiler-errorscompiler-errorsMay 22, 2025

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.

Ah ok thanks
@compiler-errors
compiler-errors
commented
Apr 13, 2025

Copy link


Copy Markdown

Contributor
@rustbot author (waiting on questions)
@rustbotrustbot
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Apr 13, 2025
@rustbot
rustbot
commented
Apr 13, 2025

Copy link


Copy Markdown

Collaborator
Reminder, once the PR becomes ready for a review, use @rustbot ready.
@matthewjasper
Handle regions equivalent to 'static in non_local_bounds
2d5e80b
`non_local_bounds` would only find non local bounds that strictly bound a given region,
but it's possible that a local region is equated to 'static when showing a type referencing
a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In
this case we should return 'static.
@matthewjasper
Add unit tests for minimal_scc_representative
c57ef29
@matthewjasper
matthewjasper
commented
Apr 15, 2025

Copy link


Copy Markdown

ContributorAuthor
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Apr 15, 2025
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors r+
@bors
bors
commented
May 22, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit c57ef29 has been approved by compiler-errors
It is now in the queue for this repository.
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors rollup
@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
May 22, 2025
@matthiaskrgrmatthiaskrgr
mentioned this pull request
May 22, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 22, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
912981a
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 706dc70
into
rust-lang:masterMay 23, 2025
@rustbotrustbot
added this to the 1.89.0 milestone
May 23, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 23, 2025
@rust-timer
Unrolled build forrust-lang#139668
ab89094
Rollup merge of rust-lang#139668 - matthewjasper:upper-bound-fix, r=compiler-errors
Handle regions equivalent to 'static in non_local_bounds
`non_local_bounds` would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In this case we should return 'static.
closesrust-lang#122704closesrust-lang#139004
@matthewjasper
matthewjasper
deleted the

upper-bound-fix

branch
May 23, 2025 09:04
github-actionsBot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
May 26, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
10ed7f5
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@tnuhatnuha
mentioned this pull request
Aug 10, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@compiler-errorscompiler-errorscompiler-errors left review comments
Reviewers whose approvals may not affect merge requirements

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.T-typesRelevant to the types team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.89.0

6 participants

@matthewjasper@rustbot@compiler-errors@bors@nnethercote@BoxyUwU

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Handle regions equivalent to 'static in non_local_bounds - #139668
Merged
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
May 23, 2025
Merged
Handle regions equivalent to 'static in non_local_bounds#139668
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
Conversation
@matthewjasper
@matthewjaspermatthewjasper
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
non_local_bounds would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as dyn Any + 'a in the tests added, is well-formed. In this case we should return 'static.
closes#122704
closes#139004
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
r? @nnethercote
rustbot has assigned @nnethercote.

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
@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
Apr 11, 2025
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.
@compiler-errors
compiler-errors
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
r? types
@rustbotrustbot
added
the 
T-types
Relevant to the types team, which will review and decide on the PR/issue.
label
Apr 11, 2025
@rustbotrustbot
assigned BoxyUwU and unassigned nnethercoteApr 11, 2025
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_data_structures/src/transitive_relation.rs
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_borrowck/src/type_check/free_region_relations.rs
Outdated

 let mut external_parents = vec![];
 let mut queue = vec![fr0];

 let mut queue = vec![relation.scc_representative(fr0)];
@compiler-errorscompiler-errorsApr 11, 2025

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.

I'm not sure if you've explained why projecting the free region to its representative affects the set of non_local_bounds that we return. It's not obvious from the definition of TransitiveRelation::parents, at least.
Like, if these are actually SCC's then I'm not sure why shuffling around which element in that SCC fixes things.
Is there something subtle going on with the fact that 'static is the first first region vid we allocate?
@compiler-errorscompiler-errorsApr 11, 2025

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.

If it has to do with the fact that TransitiveRelation::parents requires for us to pass the minimal element for this while loop to actually reach all of the parents, then perhaps we should rename thatfunction to minimal_scc_representative 🤔
Or maybe I'm totally misleading myself.
@compiler-errorscompiler-errorsMay 22, 2025

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.

Hey @matthewjasper, did you mean to resolve this without actually answering the question?
@matthewjaspermatthewjasperMay 22, 2025

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.

Your second comment was correct and I renamed scc_representative to minimal_scc_representative
@compiler-errorscompiler-errorsMay 22, 2025

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.

Ah ok thanks
@compiler-errors
compiler-errors
commented
Apr 13, 2025

Copy link


Copy Markdown

Contributor
@rustbot author (waiting on questions)
@rustbotrustbot
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Apr 13, 2025
@rustbot
rustbot
commented
Apr 13, 2025

Copy link


Copy Markdown

Collaborator
Reminder, once the PR becomes ready for a review, use @rustbot ready.
@matthewjasper
Handle regions equivalent to 'static in non_local_bounds
2d5e80b
`non_local_bounds` would only find non local bounds that strictly bound a given region,
but it's possible that a local region is equated to 'static when showing a type referencing
a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In
this case we should return 'static.
@matthewjasper
Add unit tests for minimal_scc_representative
c57ef29
@matthewjasper
matthewjasper
commented
Apr 15, 2025

Copy link


Copy Markdown

ContributorAuthor
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Apr 15, 2025
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors r+
@bors
bors
commented
May 22, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit c57ef29 has been approved by compiler-errors
It is now in the queue for this repository.
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors rollup
@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
May 22, 2025
@matthiaskrgrmatthiaskrgr
mentioned this pull request
May 22, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 22, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
912981a
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 706dc70
into
rust-lang:masterMay 23, 2025
@rustbotrustbot
added this to the 1.89.0 milestone
May 23, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 23, 2025
@rust-timer
Unrolled build forrust-lang#139668
ab89094
Rollup merge of rust-lang#139668 - matthewjasper:upper-bound-fix, r=compiler-errors
Handle regions equivalent to 'static in non_local_bounds
`non_local_bounds` would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In this case we should return 'static.
closesrust-lang#122704closesrust-lang#139004
@matthewjasper
matthewjasper
deleted the

upper-bound-fix

branch
May 23, 2025 09:04
github-actionsBot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
May 26, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
10ed7f5
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@tnuhatnuha
mentioned this pull request
Aug 10, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@compiler-errorscompiler-errorscompiler-errors left review comments
Reviewers whose approvals may not affect merge requirements

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.T-typesRelevant to the types team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.89.0

6 participants

@matthewjasper@rustbot@compiler-errors@bors@nnethercote@BoxyUwU

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Handle regions equivalent to 'static in non_local_bounds - #139668
Merged
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
May 23, 2025
Merged
Handle regions equivalent to 'static in non_local_bounds#139668
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
Conversation
@matthewjasper
@matthewjaspermatthewjasper
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
non_local_bounds would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as dyn Any + 'a in the tests added, is well-formed. In this case we should return 'static.
closes#122704
closes#139004
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
r? @nnethercote
rustbot has assigned @nnethercote.

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
@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
Apr 11, 2025
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.
@compiler-errors
compiler-errors
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
r? types
@rustbotrustbot
added
the 
T-types
Relevant to the types team, which will review and decide on the PR/issue.
label
Apr 11, 2025
@rustbotrustbot
assigned BoxyUwU and unassigned nnethercoteApr 11, 2025
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_data_structures/src/transitive_relation.rs
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_borrowck/src/type_check/free_region_relations.rs
Outdated

 let mut external_parents = vec![];
 let mut queue = vec![fr0];

 let mut queue = vec![relation.scc_representative(fr0)];
@compiler-errorscompiler-errorsApr 11, 2025

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.

I'm not sure if you've explained why projecting the free region to its representative affects the set of non_local_bounds that we return. It's not obvious from the definition of TransitiveRelation::parents, at least.
Like, if these are actually SCC's then I'm not sure why shuffling around which element in that SCC fixes things.
Is there something subtle going on with the fact that 'static is the first first region vid we allocate?
@compiler-errorscompiler-errorsApr 11, 2025

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.

If it has to do with the fact that TransitiveRelation::parents requires for us to pass the minimal element for this while loop to actually reach all of the parents, then perhaps we should rename thatfunction to minimal_scc_representative 🤔
Or maybe I'm totally misleading myself.
@compiler-errorscompiler-errorsMay 22, 2025

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.

Hey @matthewjasper, did you mean to resolve this without actually answering the question?
@matthewjaspermatthewjasperMay 22, 2025

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.

Your second comment was correct and I renamed scc_representative to minimal_scc_representative
@compiler-errorscompiler-errorsMay 22, 2025

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.

Ah ok thanks
@compiler-errors
compiler-errors
commented
Apr 13, 2025

Copy link


Copy Markdown

Contributor
@rustbot author (waiting on questions)
@rustbotrustbot
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Apr 13, 2025
@rustbot
rustbot
commented
Apr 13, 2025

Copy link


Copy Markdown

Collaborator
Reminder, once the PR becomes ready for a review, use @rustbot ready.
@matthewjasper
Handle regions equivalent to 'static in non_local_bounds
2d5e80b
`non_local_bounds` would only find non local bounds that strictly bound a given region,
but it's possible that a local region is equated to 'static when showing a type referencing
a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In
this case we should return 'static.
@matthewjasper
Add unit tests for minimal_scc_representative
c57ef29
@matthewjasper
matthewjasper
commented
Apr 15, 2025

Copy link


Copy Markdown

ContributorAuthor
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Apr 15, 2025
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors r+
@bors
bors
commented
May 22, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit c57ef29 has been approved by compiler-errors
It is now in the queue for this repository.
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors rollup
@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
May 22, 2025
@matthiaskrgrmatthiaskrgr
mentioned this pull request
May 22, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 22, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
912981a
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 706dc70
into
rust-lang:masterMay 23, 2025
@rustbotrustbot
added this to the 1.89.0 milestone
May 23, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 23, 2025
@rust-timer
Unrolled build forrust-lang#139668
ab89094
Rollup merge of rust-lang#139668 - matthewjasper:upper-bound-fix, r=compiler-errors
Handle regions equivalent to 'static in non_local_bounds
`non_local_bounds` would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In this case we should return 'static.
closesrust-lang#122704closesrust-lang#139004
@matthewjasper
matthewjasper
deleted the

upper-bound-fix

branch
May 23, 2025 09:04
github-actionsBot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
May 26, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
10ed7f5
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@tnuhatnuha
mentioned this pull request
Aug 10, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@compiler-errorscompiler-errorscompiler-errors left review comments
Reviewers whose approvals may not affect merge requirements

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.T-typesRelevant to the types team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.89.0

6 participants

@matthewjasper@rustbot@compiler-errors@bors@nnethercote@BoxyUwU

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Handle regions equivalent to 'static in non_local_bounds - #139668
Merged
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
May 23, 2025
Merged
Handle regions equivalent to 'static in non_local_bounds#139668
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
Conversation
@matthewjasper
@matthewjaspermatthewjasper
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
non_local_bounds would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as dyn Any + 'a in the tests added, is well-formed. In this case we should return 'static.
closes#122704
closes#139004
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
r? @nnethercote
rustbot has assigned @nnethercote.

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
@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
Apr 11, 2025
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.
@compiler-errors
compiler-errors
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
r? types
@rustbotrustbot
added
the 
T-types
Relevant to the types team, which will review and decide on the PR/issue.
label
Apr 11, 2025
@rustbotrustbot
assigned BoxyUwU and unassigned nnethercoteApr 11, 2025
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_data_structures/src/transitive_relation.rs
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_borrowck/src/type_check/free_region_relations.rs
Outdated

 let mut external_parents = vec![];
 let mut queue = vec![fr0];

 let mut queue = vec![relation.scc_representative(fr0)];
@compiler-errorscompiler-errorsApr 11, 2025

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.

I'm not sure if you've explained why projecting the free region to its representative affects the set of non_local_bounds that we return. It's not obvious from the definition of TransitiveRelation::parents, at least.
Like, if these are actually SCC's then I'm not sure why shuffling around which element in that SCC fixes things.
Is there something subtle going on with the fact that 'static is the first first region vid we allocate?
@compiler-errorscompiler-errorsApr 11, 2025

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.

If it has to do with the fact that TransitiveRelation::parents requires for us to pass the minimal element for this while loop to actually reach all of the parents, then perhaps we should rename thatfunction to minimal_scc_representative 🤔
Or maybe I'm totally misleading myself.
@compiler-errorscompiler-errorsMay 22, 2025

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.

Hey @matthewjasper, did you mean to resolve this without actually answering the question?
@matthewjaspermatthewjasperMay 22, 2025

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.

Your second comment was correct and I renamed scc_representative to minimal_scc_representative
@compiler-errorscompiler-errorsMay 22, 2025

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.

Ah ok thanks
@compiler-errors
compiler-errors
commented
Apr 13, 2025

Copy link


Copy Markdown

Contributor
@rustbot author (waiting on questions)
@rustbotrustbot
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Apr 13, 2025
@rustbot
rustbot
commented
Apr 13, 2025

Copy link


Copy Markdown

Collaborator
Reminder, once the PR becomes ready for a review, use @rustbot ready.
@matthewjasper
Handle regions equivalent to 'static in non_local_bounds
2d5e80b
`non_local_bounds` would only find non local bounds that strictly bound a given region,
but it's possible that a local region is equated to 'static when showing a type referencing
a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In
this case we should return 'static.
@matthewjasper
Add unit tests for minimal_scc_representative
c57ef29
@matthewjasper
matthewjasper
commented
Apr 15, 2025

Copy link


Copy Markdown

ContributorAuthor
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Apr 15, 2025
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors r+
@bors
bors
commented
May 22, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit c57ef29 has been approved by compiler-errors
It is now in the queue for this repository.
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors rollup
@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
May 22, 2025
@matthiaskrgrmatthiaskrgr
mentioned this pull request
May 22, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 22, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
912981a
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 706dc70
into
rust-lang:masterMay 23, 2025
@rustbotrustbot
added this to the 1.89.0 milestone
May 23, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 23, 2025
@rust-timer
Unrolled build forrust-lang#139668
ab89094
Rollup merge of rust-lang#139668 - matthewjasper:upper-bound-fix, r=compiler-errors
Handle regions equivalent to 'static in non_local_bounds
`non_local_bounds` would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In this case we should return 'static.
closesrust-lang#122704closesrust-lang#139004
@matthewjasper
matthewjasper
deleted the

upper-bound-fix

branch
May 23, 2025 09:04
github-actionsBot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
May 26, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
10ed7f5
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@tnuhatnuha
mentioned this pull request
Aug 10, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@compiler-errorscompiler-errorscompiler-errors left review comments
Reviewers whose approvals may not affect merge requirements

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.T-typesRelevant to the types team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.89.0

6 participants

@matthewjasper@rustbot@compiler-errors@bors@nnethercote@BoxyUwU

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Handle regions equivalent to 'static in non_local_bounds - #139668
Merged
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
May 23, 2025
Merged
Handle regions equivalent to 'static in non_local_bounds#139668
bors merged 2 commits into
rust-lang:masterfrom 
matthewjasper:upper-bound-fix
Conversation
@matthewjasper
@matthewjaspermatthewjasper
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
non_local_bounds would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as dyn Any + 'a in the tests added, is well-formed. In this case we should return 'static.
closes#122704
closes#139004
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
r? @nnethercote
rustbot has assigned @nnethercote.

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
@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
Apr 11, 2025
@rustbot
rustbot
commented
Apr 11, 2025

Copy link


Copy Markdown

Collaborator
This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.
@compiler-errors
compiler-errors
commented
Apr 11, 2025

Copy link


Copy Markdown

Contributor
r? types
@rustbotrustbot
added
the 
T-types
Relevant to the types team, which will review and decide on the PR/issue.
label
Apr 11, 2025
@rustbotrustbot
assigned BoxyUwU and unassigned nnethercoteApr 11, 2025
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_data_structures/src/transitive_relation.rs
compiler-errors
compiler-errors
reviewed
Apr 11, 2025
View reviewed changes
Comment threadcompiler/rustc_borrowck/src/type_check/free_region_relations.rs
Outdated

 let mut external_parents = vec![];
 let mut queue = vec![fr0];

 let mut queue = vec![relation.scc_representative(fr0)];
@compiler-errorscompiler-errorsApr 11, 2025

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.

I'm not sure if you've explained why projecting the free region to its representative affects the set of non_local_bounds that we return. It's not obvious from the definition of TransitiveRelation::parents, at least.
Like, if these are actually SCC's then I'm not sure why shuffling around which element in that SCC fixes things.
Is there something subtle going on with the fact that 'static is the first first region vid we allocate?
@compiler-errorscompiler-errorsApr 11, 2025

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.

If it has to do with the fact that TransitiveRelation::parents requires for us to pass the minimal element for this while loop to actually reach all of the parents, then perhaps we should rename thatfunction to minimal_scc_representative 🤔
Or maybe I'm totally misleading myself.
@compiler-errorscompiler-errorsMay 22, 2025

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.

Hey @matthewjasper, did you mean to resolve this without actually answering the question?
@matthewjaspermatthewjasperMay 22, 2025

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.

Your second comment was correct and I renamed scc_representative to minimal_scc_representative
@compiler-errorscompiler-errorsMay 22, 2025

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.

Ah ok thanks
@compiler-errors
compiler-errors
commented
Apr 13, 2025

Copy link


Copy Markdown

Contributor
@rustbot author (waiting on questions)
@rustbotrustbot
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-review
Status: Awaiting review from the assignee but also interested parties.
labels
Apr 13, 2025
@rustbot
rustbot
commented
Apr 13, 2025

Copy link


Copy Markdown

Collaborator
Reminder, once the PR becomes ready for a review, use @rustbot ready.
@matthewjasper
Handle regions equivalent to 'static in non_local_bounds
2d5e80b
`non_local_bounds` would only find non local bounds that strictly bound a given region,
but it's possible that a local region is equated to 'static when showing a type referencing
a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In
this case we should return 'static.
@matthewjasper
Add unit tests for minimal_scc_representative
c57ef29
@matthewjasper
matthewjasper
commented
Apr 15, 2025

Copy link


Copy Markdown

ContributorAuthor
@rustbot ready
@rustbotrustbot
added

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed

S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Apr 15, 2025
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors r+
@bors
bors
commented
May 22, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit c57ef29 has been approved by compiler-errors
It is now in the queue for this repository.
@compiler-errors
compiler-errors
commented
May 22, 2025

Copy link


Copy Markdown

Contributor
@bors rollup
@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
May 22, 2025
@matthiaskrgrmatthiaskrgr
mentioned this pull request
May 22, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 22, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
912981a
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 706dc70
into
rust-lang:masterMay 23, 2025
@rustbotrustbot
added this to the 1.89.0 milestone
May 23, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 23, 2025
@rust-timer
Unrolled build forrust-lang#139668
ab89094
Rollup merge of rust-lang#139668 - matthewjasper:upper-bound-fix, r=compiler-errors
Handle regions equivalent to 'static in non_local_bounds
`non_local_bounds` would only find non local bounds that strictly bound a given region, but it's possible that a local region is equated to 'static when showing a type referencing a locally bound lifetime, such as `dyn Any + 'a` in the tests added, is well-formed. In this case we should return 'static.
closesrust-lang#122704closesrust-lang#139004
@matthewjasper
matthewjasper
deleted the

upper-bound-fix

branch
May 23, 2025 09:04
github-actionsBot
pushed a commit
to model-checking/verify-rust-std
that referenced
this pull request
May 26, 2025
@bors
Auto merge ofrust-lang#141396- matthiaskrgr:rollup-feg050g, r=matth…
10ed7f5
…iaskrgr
Rollup of 7 pull requests
Successful merges:
- rust-lang#135562 (Add ignore value suggestion in closure body)
- rust-lang#139635 (Finalize repeat expr inference behaviour with inferred repeat counts)
- rust-lang#139668 (Handle regions equivalent to 'static in non_local_bounds)
- rust-lang#140218 (HIR ty lowering: Clean up & refactor the lowering of type-relative paths)
- rust-lang#140435 (use uX::from instead of _ as uX in non - const contexts)
- rust-lang#141130 (rustc_on_unimplemented cleanups)
- rust-lang#141286 (Querify `coroutine_hidden_types`)
Failed merges:
- rust-lang#140247 (Don't build `ParamEnv` and do trait solving in `ItemCtxt`s when lowering IATs)
r? `@ghost`
`@rustbot` modify labels: rollup
@tnuhatnuha
mentioned this pull request
Aug 10, 2025

Closed

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


1 more reviewer

@compiler-errorscompiler-errorscompiler-errors left review comments
Reviewers whose approvals may not affect merge requirements

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.T-typesRelevant to the types team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.89.0

6 participants

@matthewjasper@rustbot@compiler-errors@bors@nnethercote@BoxyUwU