Skip to content

Clean up a few things in rustc_hir_analysis::check::region - #138989

Merged
bors merged 4 commits into
rust-lang:masterfrom
m-ou-se:clean-up-things
Mar 27, 2025
Merged

Clean up a few things in rustc_hir_analysis::check::region#138989
bors merged 4 commits into
rust-lang:masterfrom
m-ou-se:clean-up-things

Conversation

@m-ou-se

@m-ou-sem-ou-se commented Mar 26, 2025

Copy link
Copy Markdown
Member

Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.

@m-ou-se
Don't record child scopes for patterns.
1da5e60
They are unused.
@m-ou-se
Simplify RvalueCandidateType.
227f933
There is no difference between the Patternand Borrow cases. Reduce it to
a simple struct.
@m-ou-se
Don't set cx.parent to None; it seems unnecessary.
0ad0142
@m-ou-se
Remove ScopeDepth from var_parent.
2cc3fa3
It was never used.
@m-ou-sem-ou-se added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 26, 2025
@rustbot

rustbot commented Mar 26, 2025

Copy link
Copy Markdown
Collaborator

r? @cjgillot

rustbot has assigned @cjgillot.
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 the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 26, 2025
@m-ou-se

m-ou-se commented Mar 26, 2025

Copy link
Copy Markdown
MemberAuthor

@dingxiangfei2009 I think you are familiar with this code.

@dingxiangfei2009

dingxiangfei2009 commented Mar 26, 2025

Copy link
Copy Markdown
Contributor

I would like to throw in my 👍 as well. The plan to expand RvalueCandidate* was later scrapped and it ends up appearing frivolous and should be simplified.

@jdonszelmann

jdonszelmann commented Mar 27, 2025

Copy link
Copy Markdown
Contributor

Could you document in which case var_parent and parent are unequal? We figured out this was in if let right? With that I'll approve

@m-ou-se

m-ou-se commented Mar 27, 2025

Copy link
Copy Markdown
MemberAuthor

There are many points at which var_parent and parent are unequal. In an if let is one of the places where it matters, but not the only one.

@m-ou-se

m-ou-se commented Mar 27, 2025

Copy link
Copy Markdown
MemberAuthor

But that's not really the point of this PR anyway.

@jdonszelmann

jdonszelmann commented Mar 27, 2025•
edited
Loading

Copy link
Copy Markdown
Contributor

alright, I see. After some (offline) discussion there indeed seems more at play here than if let. The summary was: the difference between these two variables seems to affect more than just if-let and these changes clean some things up on their own which seems good for now). Documenting (or changing) the exact difference here can be something for later, but this seems ok on its own then. @bors r=jdonszelmann,dingxiangfei2009 rollup

@bors

bors commented Mar 27, 2025

Copy link
Copy Markdown
Collaborator

📌 Commit 2cc3fa3 has been approved by jdonszelmann,dingxiangfei2009

It is now in the queue for this repository.

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 27, 2025
@jhprattjhpratt mentioned this pull request Mar 27, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 27, 2025
@bors
Auto merge ofrust-lang#139023- jhpratt:rollup-4ou6ei4, r=jhpratt
3f55023
Rollup of 7 pull requests
Successful merges:
- rust-lang#138844 (expand: Leave traces when expanding `cfg` attributes)
- rust-lang#138926 (Remove `kw::Empty` uses from `rustc_middle`.)
- rust-lang#138989 (Clean up a few things in rustc_hir_analysis::check::region)
- rust-lang#138999 (Report compiletest pass mode if forced)
- rust-lang#139014 (Improve suggest construct with literal syntax instead of calling)
- rust-lang#139015 (Remove unneeded LLVM CI test assertions)
- rust-lang#139016 (Add job duration changes to post-merge analysis report)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit 322d1c1 into rust-lang:masterMar 27, 2025
@rustbotrustbot added this to the 1.87.0 milestone Mar 27, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#138989
94077a1
Rollup merge of rust-lang#138989 - m-ou-se:clean-up-things, r=jdonszelmann,dingxiangfei2009
Clean up a few things in rustc_hir_analysis::check::region
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
m-ou-se deleted the clean-up-things branch March 28, 2025 07:13
@m-ou-sem-ou-se mentioned this pull request Mar 28, 2025
Open
29 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cjgillotcjgillot

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

6 participants

@m-ou-se@rustbot@dingxiangfei2009@jdonszelmann@bors@cjgillot
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Clean up a few things in rustc_hir_analysis::check::region by m-ou-se · Pull Request #138989 · rust-lang/rust · GitHub
Skip to content
Clean up a few things in rustc_hir_analysis::check::region - #138989
Merged
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Mar 27, 2025
Merged
Clean up a few things in rustc_hir_analysis::check::region#138989
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Conversation
@m-ou-se
@m-ou-sem-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

Member
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
Don't record child scopes for patterns.
1da5e60
They are unused.
@m-ou-se
Simplify RvalueCandidateType.
227f933
There is no difference between the Patternand Borrow cases. Reduce it to
a simple struct.
@m-ou-se
Don't set cx.parent to None; it seems unnecessary.
0ad0142
@m-ou-se
Remove ScopeDepth from var_parent.
2cc3fa3
It was never used.
@m-ou-sem-ou-se
added

C-cleanup
Category: PRs that clean code up or issues documenting cleanup.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
Mar 26, 2025
@rustbot
rustbot
commented
Mar 26, 2025

Copy link


Copy Markdown

Collaborator
r? @cjgillot
rustbot has assigned @cjgillot.

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
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Mar 26, 2025
@m-ou-se
m-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

MemberAuthor
@dingxiangfei2009 I think you are familiar with this code.
@dingxiangfei2009
dingxiangfei2009
commented
Mar 26, 2025

Copy link


Copy Markdown

Contributor
I would like to throw in my 👍 as well. The plan to expand RvalueCandidate* was later scrapped and it ends up appearing frivolous and should be simplified.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025

Copy link


Copy Markdown

Contributor
Could you document in which case var_parent and parent are unequal? We figured out this was in if let right? With that I'll approve
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
There are many points at which var_parent and parent are unequal. In an if let is one of the places where it matters, but not the only one.
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
But that's not really the point of this PR anyway.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
alright, I see. After some (offline) discussion there indeed seems more at play here than if let. The summary was: the difference between these two variables seems to affect more than just if-let and these changes clean some things up on their own which seems good for now). Documenting (or changing) the exact difference here can be something for later, but this seems ok on its own then. @bors r=jdonszelmann,dingxiangfei2009 rollup
@bors
bors
commented
Mar 27, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 2cc3fa3 has been approved by jdonszelmann,dingxiangfei2009
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 27, 2025
@jhprattjhpratt
mentioned this pull request
Mar 27, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@bors
Auto merge ofrust-lang#139023- jhpratt:rollup-4ou6ei4, r=jhpratt
3f55023
Rollup of 7 pull requests
Successful merges:
- rust-lang#138844 (expand: Leave traces when expanding `cfg` attributes)
- rust-lang#138926 (Remove `kw::Empty` uses from `rustc_middle`.)
- rust-lang#138989 (Clean up a few things in rustc_hir_analysis::check::region)
- rust-lang#138999 (Report compiletest pass mode if forced)
- rust-lang#139014 (Improve suggest construct with literal syntax instead of calling)
- rust-lang#139015 (Remove unneeded LLVM CI test assertions)
- rust-lang#139016 (Add job duration changes to post-merge analysis report)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 322d1c1
into
rust-lang:masterMar 27, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 27, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#138989
94077a1
Rollup merge of rust-lang#138989 - m-ou-se:clean-up-things, r=jdonszelmann,dingxiangfei2009
Clean up a few things in rustc_hir_analysis::check::region
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
m-ou-se
deleted the

clean-up-things

branch
March 28, 2025 07:13
@m-ou-sem-ou-se
mentioned this pull request
Mar 28, 2025

Open

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

Reviewers


No reviews


Assignees

@cjgillotcjgillot

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

6 participants

@m-ou-se@rustbot@dingxiangfei2009@jdonszelmann@bors@cjgillot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Clean up a few things in rustc_hir_analysis::check::region by m-ou-se · Pull Request #138989 · rust-lang/rust · GitHub
Skip to content
Clean up a few things in rustc_hir_analysis::check::region - #138989
Merged
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Mar 27, 2025
Merged
Clean up a few things in rustc_hir_analysis::check::region#138989
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Conversation
@m-ou-se
@m-ou-sem-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

Member
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
Don't record child scopes for patterns.
1da5e60
They are unused.
@m-ou-se
Simplify RvalueCandidateType.
227f933
There is no difference between the Patternand Borrow cases. Reduce it to
a simple struct.
@m-ou-se
Don't set cx.parent to None; it seems unnecessary.
0ad0142
@m-ou-se
Remove ScopeDepth from var_parent.
2cc3fa3
It was never used.
@m-ou-sem-ou-se
added

C-cleanup
Category: PRs that clean code up or issues documenting cleanup.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
Mar 26, 2025
@rustbot
rustbot
commented
Mar 26, 2025

Copy link


Copy Markdown

Collaborator
r? @cjgillot
rustbot has assigned @cjgillot.

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
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Mar 26, 2025
@m-ou-se
m-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

MemberAuthor
@dingxiangfei2009 I think you are familiar with this code.
@dingxiangfei2009
dingxiangfei2009
commented
Mar 26, 2025

Copy link


Copy Markdown

Contributor
I would like to throw in my 👍 as well. The plan to expand RvalueCandidate* was later scrapped and it ends up appearing frivolous and should be simplified.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025

Copy link


Copy Markdown

Contributor
Could you document in which case var_parent and parent are unequal? We figured out this was in if let right? With that I'll approve
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
There are many points at which var_parent and parent are unequal. In an if let is one of the places where it matters, but not the only one.
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
But that's not really the point of this PR anyway.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
alright, I see. After some (offline) discussion there indeed seems more at play here than if let. The summary was: the difference between these two variables seems to affect more than just if-let and these changes clean some things up on their own which seems good for now). Documenting (or changing) the exact difference here can be something for later, but this seems ok on its own then. @bors r=jdonszelmann,dingxiangfei2009 rollup
@bors
bors
commented
Mar 27, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 2cc3fa3 has been approved by jdonszelmann,dingxiangfei2009
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 27, 2025
@jhprattjhpratt
mentioned this pull request
Mar 27, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@bors
Auto merge ofrust-lang#139023- jhpratt:rollup-4ou6ei4, r=jhpratt
3f55023
Rollup of 7 pull requests
Successful merges:
- rust-lang#138844 (expand: Leave traces when expanding `cfg` attributes)
- rust-lang#138926 (Remove `kw::Empty` uses from `rustc_middle`.)
- rust-lang#138989 (Clean up a few things in rustc_hir_analysis::check::region)
- rust-lang#138999 (Report compiletest pass mode if forced)
- rust-lang#139014 (Improve suggest construct with literal syntax instead of calling)
- rust-lang#139015 (Remove unneeded LLVM CI test assertions)
- rust-lang#139016 (Add job duration changes to post-merge analysis report)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 322d1c1
into
rust-lang:masterMar 27, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 27, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#138989
94077a1
Rollup merge of rust-lang#138989 - m-ou-se:clean-up-things, r=jdonszelmann,dingxiangfei2009
Clean up a few things in rustc_hir_analysis::check::region
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
m-ou-se
deleted the

clean-up-things

branch
March 28, 2025 07:13
@m-ou-sem-ou-se
mentioned this pull request
Mar 28, 2025

Open

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

Reviewers


No reviews


Assignees

@cjgillotcjgillot

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

6 participants

@m-ou-se@rustbot@dingxiangfei2009@jdonszelmann@bors@cjgillot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Clean up a few things in rustc_hir_analysis::check::region by m-ou-se · Pull Request #138989 · rust-lang/rust · GitHub
Skip to content
Clean up a few things in rustc_hir_analysis::check::region - #138989
Merged
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Mar 27, 2025
Merged
Clean up a few things in rustc_hir_analysis::check::region#138989
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Conversation
@m-ou-se
@m-ou-sem-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

Member
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
Don't record child scopes for patterns.
1da5e60
They are unused.
@m-ou-se
Simplify RvalueCandidateType.
227f933
There is no difference between the Patternand Borrow cases. Reduce it to
a simple struct.
@m-ou-se
Don't set cx.parent to None; it seems unnecessary.
0ad0142
@m-ou-se
Remove ScopeDepth from var_parent.
2cc3fa3
It was never used.
@m-ou-sem-ou-se
added

C-cleanup
Category: PRs that clean code up or issues documenting cleanup.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
Mar 26, 2025
@rustbot
rustbot
commented
Mar 26, 2025

Copy link


Copy Markdown

Collaborator
r? @cjgillot
rustbot has assigned @cjgillot.

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
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Mar 26, 2025
@m-ou-se
m-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

MemberAuthor
@dingxiangfei2009 I think you are familiar with this code.
@dingxiangfei2009
dingxiangfei2009
commented
Mar 26, 2025

Copy link


Copy Markdown

Contributor
I would like to throw in my 👍 as well. The plan to expand RvalueCandidate* was later scrapped and it ends up appearing frivolous and should be simplified.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025

Copy link


Copy Markdown

Contributor
Could you document in which case var_parent and parent are unequal? We figured out this was in if let right? With that I'll approve
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
There are many points at which var_parent and parent are unequal. In an if let is one of the places where it matters, but not the only one.
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
But that's not really the point of this PR anyway.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
alright, I see. After some (offline) discussion there indeed seems more at play here than if let. The summary was: the difference between these two variables seems to affect more than just if-let and these changes clean some things up on their own which seems good for now). Documenting (or changing) the exact difference here can be something for later, but this seems ok on its own then. @bors r=jdonszelmann,dingxiangfei2009 rollup
@bors
bors
commented
Mar 27, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 2cc3fa3 has been approved by jdonszelmann,dingxiangfei2009
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 27, 2025
@jhprattjhpratt
mentioned this pull request
Mar 27, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@bors
Auto merge ofrust-lang#139023- jhpratt:rollup-4ou6ei4, r=jhpratt
3f55023
Rollup of 7 pull requests
Successful merges:
- rust-lang#138844 (expand: Leave traces when expanding `cfg` attributes)
- rust-lang#138926 (Remove `kw::Empty` uses from `rustc_middle`.)
- rust-lang#138989 (Clean up a few things in rustc_hir_analysis::check::region)
- rust-lang#138999 (Report compiletest pass mode if forced)
- rust-lang#139014 (Improve suggest construct with literal syntax instead of calling)
- rust-lang#139015 (Remove unneeded LLVM CI test assertions)
- rust-lang#139016 (Add job duration changes to post-merge analysis report)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 322d1c1
into
rust-lang:masterMar 27, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 27, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#138989
94077a1
Rollup merge of rust-lang#138989 - m-ou-se:clean-up-things, r=jdonszelmann,dingxiangfei2009
Clean up a few things in rustc_hir_analysis::check::region
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
m-ou-se
deleted the

clean-up-things

branch
March 28, 2025 07:13
@m-ou-sem-ou-se
mentioned this pull request
Mar 28, 2025

Open

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

Reviewers


No reviews


Assignees

@cjgillotcjgillot

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

6 participants

@m-ou-se@rustbot@dingxiangfei2009@jdonszelmann@bors@cjgillot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Clean up a few things in rustc_hir_analysis::check::region by m-ou-se · Pull Request #138989 · rust-lang/rust · GitHub
Skip to content
Clean up a few things in rustc_hir_analysis::check::region - #138989
Merged
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Mar 27, 2025
Merged
Clean up a few things in rustc_hir_analysis::check::region#138989
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Conversation
@m-ou-se
@m-ou-sem-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

Member
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
Don't record child scopes for patterns.
1da5e60
They are unused.
@m-ou-se
Simplify RvalueCandidateType.
227f933
There is no difference between the Patternand Borrow cases. Reduce it to
a simple struct.
@m-ou-se
Don't set cx.parent to None; it seems unnecessary.
0ad0142
@m-ou-se
Remove ScopeDepth from var_parent.
2cc3fa3
It was never used.
@m-ou-sem-ou-se
added

C-cleanup
Category: PRs that clean code up or issues documenting cleanup.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
Mar 26, 2025
@rustbot
rustbot
commented
Mar 26, 2025

Copy link


Copy Markdown

Collaborator
r? @cjgillot
rustbot has assigned @cjgillot.

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
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Mar 26, 2025
@m-ou-se
m-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

MemberAuthor
@dingxiangfei2009 I think you are familiar with this code.
@dingxiangfei2009
dingxiangfei2009
commented
Mar 26, 2025

Copy link


Copy Markdown

Contributor
I would like to throw in my 👍 as well. The plan to expand RvalueCandidate* was later scrapped and it ends up appearing frivolous and should be simplified.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025

Copy link


Copy Markdown

Contributor
Could you document in which case var_parent and parent are unequal? We figured out this was in if let right? With that I'll approve
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
There are many points at which var_parent and parent are unequal. In an if let is one of the places where it matters, but not the only one.
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
But that's not really the point of this PR anyway.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
alright, I see. After some (offline) discussion there indeed seems more at play here than if let. The summary was: the difference between these two variables seems to affect more than just if-let and these changes clean some things up on their own which seems good for now). Documenting (or changing) the exact difference here can be something for later, but this seems ok on its own then. @bors r=jdonszelmann,dingxiangfei2009 rollup
@bors
bors
commented
Mar 27, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 2cc3fa3 has been approved by jdonszelmann,dingxiangfei2009
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 27, 2025
@jhprattjhpratt
mentioned this pull request
Mar 27, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@bors
Auto merge ofrust-lang#139023- jhpratt:rollup-4ou6ei4, r=jhpratt
3f55023
Rollup of 7 pull requests
Successful merges:
- rust-lang#138844 (expand: Leave traces when expanding `cfg` attributes)
- rust-lang#138926 (Remove `kw::Empty` uses from `rustc_middle`.)
- rust-lang#138989 (Clean up a few things in rustc_hir_analysis::check::region)
- rust-lang#138999 (Report compiletest pass mode if forced)
- rust-lang#139014 (Improve suggest construct with literal syntax instead of calling)
- rust-lang#139015 (Remove unneeded LLVM CI test assertions)
- rust-lang#139016 (Add job duration changes to post-merge analysis report)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 322d1c1
into
rust-lang:masterMar 27, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 27, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#138989
94077a1
Rollup merge of rust-lang#138989 - m-ou-se:clean-up-things, r=jdonszelmann,dingxiangfei2009
Clean up a few things in rustc_hir_analysis::check::region
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
m-ou-se
deleted the

clean-up-things

branch
March 28, 2025 07:13
@m-ou-sem-ou-se
mentioned this pull request
Mar 28, 2025

Open

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

Reviewers


No reviews


Assignees

@cjgillotcjgillot

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

6 participants

@m-ou-se@rustbot@dingxiangfei2009@jdonszelmann@bors@cjgillot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Clean up a few things in rustc_hir_analysis::check::region by m-ou-se · Pull Request #138989 · rust-lang/rust · GitHub
Skip to content
Clean up a few things in rustc_hir_analysis::check::region - #138989
Merged
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Mar 27, 2025
Merged
Clean up a few things in rustc_hir_analysis::check::region#138989
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Conversation
@m-ou-se
@m-ou-sem-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

Member
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
Don't record child scopes for patterns.
1da5e60
They are unused.
@m-ou-se
Simplify RvalueCandidateType.
227f933
There is no difference between the Patternand Borrow cases. Reduce it to
a simple struct.
@m-ou-se
Don't set cx.parent to None; it seems unnecessary.
0ad0142
@m-ou-se
Remove ScopeDepth from var_parent.
2cc3fa3
It was never used.
@m-ou-sem-ou-se
added

C-cleanup
Category: PRs that clean code up or issues documenting cleanup.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
Mar 26, 2025
@rustbot
rustbot
commented
Mar 26, 2025

Copy link


Copy Markdown

Collaborator
r? @cjgillot
rustbot has assigned @cjgillot.

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
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Mar 26, 2025
@m-ou-se
m-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

MemberAuthor
@dingxiangfei2009 I think you are familiar with this code.
@dingxiangfei2009
dingxiangfei2009
commented
Mar 26, 2025

Copy link


Copy Markdown

Contributor
I would like to throw in my 👍 as well. The plan to expand RvalueCandidate* was later scrapped and it ends up appearing frivolous and should be simplified.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025

Copy link


Copy Markdown

Contributor
Could you document in which case var_parent and parent are unequal? We figured out this was in if let right? With that I'll approve
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
There are many points at which var_parent and parent are unequal. In an if let is one of the places where it matters, but not the only one.
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
But that's not really the point of this PR anyway.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
alright, I see. After some (offline) discussion there indeed seems more at play here than if let. The summary was: the difference between these two variables seems to affect more than just if-let and these changes clean some things up on their own which seems good for now). Documenting (or changing) the exact difference here can be something for later, but this seems ok on its own then. @bors r=jdonszelmann,dingxiangfei2009 rollup
@bors
bors
commented
Mar 27, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 2cc3fa3 has been approved by jdonszelmann,dingxiangfei2009
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 27, 2025
@jhprattjhpratt
mentioned this pull request
Mar 27, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@bors
Auto merge ofrust-lang#139023- jhpratt:rollup-4ou6ei4, r=jhpratt
3f55023
Rollup of 7 pull requests
Successful merges:
- rust-lang#138844 (expand: Leave traces when expanding `cfg` attributes)
- rust-lang#138926 (Remove `kw::Empty` uses from `rustc_middle`.)
- rust-lang#138989 (Clean up a few things in rustc_hir_analysis::check::region)
- rust-lang#138999 (Report compiletest pass mode if forced)
- rust-lang#139014 (Improve suggest construct with literal syntax instead of calling)
- rust-lang#139015 (Remove unneeded LLVM CI test assertions)
- rust-lang#139016 (Add job duration changes to post-merge analysis report)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 322d1c1
into
rust-lang:masterMar 27, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 27, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#138989
94077a1
Rollup merge of rust-lang#138989 - m-ou-se:clean-up-things, r=jdonszelmann,dingxiangfei2009
Clean up a few things in rustc_hir_analysis::check::region
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
m-ou-se
deleted the

clean-up-things

branch
March 28, 2025 07:13
@m-ou-sem-ou-se
mentioned this pull request
Mar 28, 2025

Open

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

Reviewers


No reviews


Assignees

@cjgillotcjgillot

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

6 participants

@m-ou-se@rustbot@dingxiangfei2009@jdonszelmann@bors@cjgillot

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Clean up a few things in rustc_hir_analysis::check::region by m-ou-se · Pull Request #138989 · rust-lang/rust · GitHub
Skip to content
Clean up a few things in rustc_hir_analysis::check::region - #138989
Merged
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Mar 27, 2025
Merged
Clean up a few things in rustc_hir_analysis::check::region#138989
bors merged 4 commits into
rust-lang:masterfrom 
m-ou-se:clean-up-things
Conversation
@m-ou-se
@m-ou-sem-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

Member
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
Don't record child scopes for patterns.
1da5e60
They are unused.
@m-ou-se
Simplify RvalueCandidateType.
227f933
There is no difference between the Patternand Borrow cases. Reduce it to
a simple struct.
@m-ou-se
Don't set cx.parent to None; it seems unnecessary.
0ad0142
@m-ou-se
Remove ScopeDepth from var_parent.
2cc3fa3
It was never used.
@m-ou-sem-ou-se
added

C-cleanup
Category: PRs that clean code up or issues documenting cleanup.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
Mar 26, 2025
@rustbot
rustbot
commented
Mar 26, 2025

Copy link


Copy Markdown

Collaborator
r? @cjgillot
rustbot has assigned @cjgillot.

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
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Mar 26, 2025
@m-ou-se
m-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

MemberAuthor
@dingxiangfei2009 I think you are familiar with this code.
@dingxiangfei2009
dingxiangfei2009
commented
Mar 26, 2025

Copy link


Copy Markdown

Contributor
I would like to throw in my 👍 as well. The plan to expand RvalueCandidate* was later scrapped and it ends up appearing frivolous and should be simplified.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025

Copy link


Copy Markdown

Contributor
Could you document in which case var_parent and parent are unequal? We figured out this was in if let right? With that I'll approve
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
There are many points at which var_parent and parent are unequal. In an if let is one of the places where it matters, but not the only one.
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
But that's not really the point of this PR anyway.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
alright, I see. After some (offline) discussion there indeed seems more at play here than if let. The summary was: the difference between these two variables seems to affect more than just if-let and these changes clean some things up on their own which seems good for now). Documenting (or changing) the exact difference here can be something for later, but this seems ok on its own then. @bors r=jdonszelmann,dingxiangfei2009 rollup
@bors
bors
commented
Mar 27, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 2cc3fa3 has been approved by jdonszelmann,dingxiangfei2009
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 27, 2025
@jhprattjhpratt
mentioned this pull request
Mar 27, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@bors
Auto merge ofrust-lang#139023- jhpratt:rollup-4ou6ei4, r=jhpratt
3f55023
Rollup of 7 pull requests
Successful merges:
- rust-lang#138844 (expand: Leave traces when expanding `cfg` attributes)
- rust-lang#138926 (Remove `kw::Empty` uses from `rustc_middle`.)
- rust-lang#138989 (Clean up a few things in rustc_hir_analysis::check::region)
- rust-lang#138999 (Report compiletest pass mode if forced)
- rust-lang#139014 (Improve suggest construct with literal syntax instead of calling)
- rust-lang#139015 (Remove unneeded LLVM CI test assertions)
- rust-lang#139016 (Add job duration changes to post-merge analysis report)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 322d1c1
into
rust-lang:masterMar 27, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 27, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#138989
94077a1
Rollup merge of rust-lang#138989 - m-ou-se:clean-up-things, r=jdonszelmann,dingxiangfei2009
Clean up a few things in rustc_hir_analysis::check::region
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
m-ou-se
deleted the

clean-up-things

branch
March 28, 2025 07:13
@m-ou-sem-ou-se
mentioned this pull request
Mar 28, 2025

Open

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

Reviewers


No reviews


Assignees

@cjgillotcjgillot

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

6 participants

@m-ou-se@rustbot@dingxiangfei2009@jdonszelmann@bors@cjgillot

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

Copy link


Copy Markdown

Member
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
Don't record child scopes for patterns.
1da5e60
They are unused.
@m-ou-se
Simplify RvalueCandidateType.
227f933
There is no difference between the Patternand Borrow cases. Reduce it to
a simple struct.
@m-ou-se
Don't set cx.parent to None; it seems unnecessary.
0ad0142
@m-ou-se
Remove ScopeDepth from var_parent.
2cc3fa3
It was never used.
@m-ou-sem-ou-se
added

C-cleanup
Category: PRs that clean code up or issues documenting cleanup.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
Mar 26, 2025
@rustbot
rustbot
commented
Mar 26, 2025

Copy link


Copy Markdown

Collaborator
r? @cjgillot
rustbot has assigned @cjgillot.

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
the 
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
label
Mar 26, 2025
@m-ou-se
m-ou-se
commented
Mar 26, 2025

Copy link


Copy Markdown

MemberAuthor
@dingxiangfei2009 I think you are familiar with this code.
@dingxiangfei2009
dingxiangfei2009
commented
Mar 26, 2025

Copy link


Copy Markdown

Contributor
I would like to throw in my 👍 as well. The plan to expand RvalueCandidate* was later scrapped and it ends up appearing frivolous and should be simplified.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025

Copy link


Copy Markdown

Contributor
Could you document in which case var_parent and parent are unequal? We figured out this was in if let right? With that I'll approve
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
There are many points at which var_parent and parent are unequal. In an if let is one of the places where it matters, but not the only one.
@m-ou-se
m-ou-se
commented
Mar 27, 2025

Copy link


Copy Markdown

MemberAuthor
But that's not really the point of this PR anyway.
@jdonszelmann
jdonszelmann
commented
Mar 27, 2025•

edited

Loading

Copy link


Copy Markdown

Contributor
alright, I see. After some (offline) discussion there indeed seems more at play here than if let. The summary was: the difference between these two variables seems to affect more than just if-let and these changes clean some things up on their own which seems good for now). Documenting (or changing) the exact difference here can be something for later, but this seems ok on its own then. @bors r=jdonszelmann,dingxiangfei2009 rollup
@bors
bors
commented
Mar 27, 2025

Copy link


Copy Markdown

Collaborator
📌 Commit 2cc3fa3 has been approved by jdonszelmann,dingxiangfei2009
It is now in the queue for this repository.
@borsbors
added

S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed

S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Mar 27, 2025
@jhprattjhpratt
mentioned this pull request
Mar 27, 2025
 Merged

bors added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@bors
Auto merge ofrust-lang#139023- jhpratt:rollup-4ou6ei4, r=jhpratt
3f55023
Rollup of 7 pull requests
Successful merges:
- rust-lang#138844 (expand: Leave traces when expanding `cfg` attributes)
- rust-lang#138926 (Remove `kw::Empty` uses from `rustc_middle`.)
- rust-lang#138989 (Clean up a few things in rustc_hir_analysis::check::region)
- rust-lang#138999 (Report compiletest pass mode if forced)
- rust-lang#139014 (Improve suggest construct with literal syntax instead of calling)
- rust-lang#139015 (Remove unneeded LLVM CI test assertions)
- rust-lang#139016 (Add job duration changes to post-merge analysis report)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors
merged commit 322d1c1
into
rust-lang:masterMar 27, 2025
@rustbotrustbot
added this to the 1.87.0 milestone
Mar 27, 2025
rust-timer added a commit
to rust-lang-ci/rust
that referenced
this pull request
Mar 27, 2025
@rust-timer
Unrolled build forrust-lang#138989
94077a1
Rollup merge of rust-lang#138989 - m-ou-se:clean-up-things, r=jdonszelmann,dingxiangfei2009
Clean up a few things in rustc_hir_analysis::check::region
Each commit is independent. They are all small clean-ups in rustc_hir_analysis::check::region.
@m-ou-se
m-ou-se
deleted the

clean-up-things

branch
March 28, 2025 07:13
@m-ou-sem-ou-se
mentioned this pull request
Mar 28, 2025

Open

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

Reviewers


No reviews


Assignees

@cjgillotcjgillot

Labels

C-cleanupCategory: PRs that clean code up or issues documenting cleanup.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects


None yet


Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

6 participants

@m-ou-se@rustbot@dingxiangfei2009@jdonszelmann@bors@cjgillot