Resolver: Record at least 1 ambiguous trait if main decl is not a trait. - #159599

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint
Jul 20, 2026
Merged

Resolver: Record at least 1 ambiguous trait if main decl is not a trait.#159599
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint

Conversation

@LorrensP-2158466

@LorrensP-2158466LorrensP-2158466 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Addresses #159476.

When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the AMBIGUOUSLY_GLOB_IMPORTED_TRAIT lint, which was the case in #159476.

We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.

Also updated the linked issue of the lint in question.

r? @petrochenkov

…at least 1 trait of the ambiguous decls (is possible) such that we can record the `ambiguously_glob_imported_trait` lint.
Also updated the issue linked by the lint.
+ added extra test
+ bless original test because of updated link
@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 Jul 20, 2026
@theemathastheemathas added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 20, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 73ed271 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- #159449 (Enable single Location to issue multiple borrows)
- #159544 (Suggest valid command-line crate names)
- #159587 (Improve `AttrItem::span`)
- #159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- #159597 (std: use `arc4random_buf` from libc)
- #159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- #158061 (Make `pin!()` more foolproof.)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159571 (Remove unused bundled library lookup for the local crate)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159602 (Remove `ItemLike`)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-bors
rust-borsBot merged commit 581f102 into rust-lang:mainJul 20, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Jul 20, 2026
rust-timer added a commit that referenced this pull request Jul 20, 2026
Rollup merge of #159599 - LorrensP-2158466:fix-ambig-trait-glob-lint, r=petrochenkov
Resolver: Record at least 1 ambiguous trait if main decl is not a trait.
Addresses #159476.
When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the `AMBIGUOUSLY_GLOB_IMPORTED_TRAIT` lint, which was the case in #159476.
We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.
Also updated the linked issue of the lint in question.
r? @petrochenkov
@apiraino

Copy link
Copy Markdown
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels handled by them.

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 23, 2026
@cuvipercuviper mentioned this pull request Jul 23, 2026
@cuvipercuviper modified the milestones: 1.99.0, 1.98.0Jul 23, 2026
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 23, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 24, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
@LorrensP-2158466
LorrensP-2158466 deleted the fix-ambig-trait-glob-lint branch August 4, 2026 17:49
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Aug 17, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- rust-lang/rust#159600 (`rust-analyzer` subtree update)
- rust-lang/rust#158046 (proc_macro: preserve file module spans for inner attrs)
- rust-lang/rust#159000 (Small cleanups to the incr comp session code)
- rust-lang/rust#159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- rust-lang/rust#159449 (Enable single Location to issue multiple borrows)
- rust-lang/rust#159544 (Suggest valid command-line crate names)
- rust-lang/rust#159587 (Improve `AttrItem::span`)
- rust-lang/rust#159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- rust-lang/rust#159597 (std: use `arc4random_buf` from libc)
- rust-lang/rust#159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- rust-lang/rust#158061 (Make `pin!()` more foolproof.)
- rust-lang/rust#159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- rust-lang/rust#159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- rust-lang/rust#159571 (Remove unused bundled library lookup for the local crate)
- rust-lang/rust#159585 (Minor `TokenStream` improvements)
- rust-lang/rust#159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- rust-lang/rust#159602 (Remove `ItemLike`)
- rust-lang/rust#159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- rust-lang/rust#159590 (Remove some dead code)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 26, 2026
…update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang#152822 someone reported that the explanation is lacking/confusing since rust-lang#159599.
Explanation and example are extended in this pr.
rust-borsBot pushed a commit that referenced this pull request Aug 26, 2026
Rollup merge of #160354 - LorrensP-2158466:amb-import-trait-update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` #152822 someone reported that the explanation is lacking/confusing since #159599.
Explanation and example are extended in this pr.
pullBot pushed a commit to xtqqczze/rust-lang-miri that referenced this pull request Aug 27, 2026
…=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang/rust#152822 someone reported that the explanation is lacking/confusing since rust-lang/rust#159599.
Explanation and example are extended in this pr.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.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

Development

Successfully merging this pull request may close these issues.

6 participants

@LorrensP-2158466@petrochenkov@apiraino@cuviper@theemathas@rustbot
, '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" + '
Skip to content

Resolver: Record at least 1 ambiguous trait if main decl is not a trait. - #159599

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint
Jul 20, 2026
Merged

Resolver: Record at least 1 ambiguous trait if main decl is not a trait.#159599
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint

Conversation

@LorrensP-2158466

@LorrensP-2158466LorrensP-2158466 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Addresses #159476.

When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the AMBIGUOUSLY_GLOB_IMPORTED_TRAIT lint, which was the case in #159476.

We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.

Also updated the linked issue of the lint in question.

r? @petrochenkov

…at least 1 trait of the ambiguous decls (is possible) such that we can record the `ambiguously_glob_imported_trait` lint.
Also updated the issue linked by the lint.
+ added extra test
+ bless original test because of updated link
@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 Jul 20, 2026
@theemathastheemathas added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 20, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 73ed271 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- #159449 (Enable single Location to issue multiple borrows)
- #159544 (Suggest valid command-line crate names)
- #159587 (Improve `AttrItem::span`)
- #159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- #159597 (std: use `arc4random_buf` from libc)
- #159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- #158061 (Make `pin!()` more foolproof.)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159571 (Remove unused bundled library lookup for the local crate)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159602 (Remove `ItemLike`)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-bors
rust-borsBot merged commit 581f102 into rust-lang:mainJul 20, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Jul 20, 2026
rust-timer added a commit that referenced this pull request Jul 20, 2026
Rollup merge of #159599 - LorrensP-2158466:fix-ambig-trait-glob-lint, r=petrochenkov
Resolver: Record at least 1 ambiguous trait if main decl is not a trait.
Addresses #159476.
When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the `AMBIGUOUSLY_GLOB_IMPORTED_TRAIT` lint, which was the case in #159476.
We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.
Also updated the linked issue of the lint in question.
r? @petrochenkov
@apiraino

Copy link
Copy Markdown
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels handled by them.

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 23, 2026
@cuvipercuviper mentioned this pull request Jul 23, 2026
@cuvipercuviper modified the milestones: 1.99.0, 1.98.0Jul 23, 2026
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 23, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 24, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
@LorrensP-2158466
LorrensP-2158466 deleted the fix-ambig-trait-glob-lint branch August 4, 2026 17:49
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Aug 17, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- rust-lang/rust#159600 (`rust-analyzer` subtree update)
- rust-lang/rust#158046 (proc_macro: preserve file module spans for inner attrs)
- rust-lang/rust#159000 (Small cleanups to the incr comp session code)
- rust-lang/rust#159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- rust-lang/rust#159449 (Enable single Location to issue multiple borrows)
- rust-lang/rust#159544 (Suggest valid command-line crate names)
- rust-lang/rust#159587 (Improve `AttrItem::span`)
- rust-lang/rust#159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- rust-lang/rust#159597 (std: use `arc4random_buf` from libc)
- rust-lang/rust#159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- rust-lang/rust#158061 (Make `pin!()` more foolproof.)
- rust-lang/rust#159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- rust-lang/rust#159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- rust-lang/rust#159571 (Remove unused bundled library lookup for the local crate)
- rust-lang/rust#159585 (Minor `TokenStream` improvements)
- rust-lang/rust#159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- rust-lang/rust#159602 (Remove `ItemLike`)
- rust-lang/rust#159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- rust-lang/rust#159590 (Remove some dead code)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 26, 2026
…update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang#152822 someone reported that the explanation is lacking/confusing since rust-lang#159599.
Explanation and example are extended in this pr.
rust-borsBot pushed a commit that referenced this pull request Aug 26, 2026
Rollup merge of #160354 - LorrensP-2158466:amb-import-trait-update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` #152822 someone reported that the explanation is lacking/confusing since #159599.
Explanation and example are extended in this pr.
pullBot pushed a commit to xtqqczze/rust-lang-miri that referenced this pull request Aug 27, 2026
…=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang/rust#152822 someone reported that the explanation is lacking/confusing since rust-lang/rust#159599.
Explanation and example are extended in this pr.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.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

Development

Successfully merging this pull request may close these issues.

6 participants

@LorrensP-2158466@petrochenkov@apiraino@cuviper@theemathas@rustbot
, '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('^' + ".*" + '
Skip to content

Resolver: Record at least 1 ambiguous trait if main decl is not a trait. - #159599

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint
Jul 20, 2026
Merged

Resolver: Record at least 1 ambiguous trait if main decl is not a trait.#159599
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint

Conversation

@LorrensP-2158466

@LorrensP-2158466LorrensP-2158466 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Addresses #159476.

When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the AMBIGUOUSLY_GLOB_IMPORTED_TRAIT lint, which was the case in #159476.

We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.

Also updated the linked issue of the lint in question.

r? @petrochenkov

…at least 1 trait of the ambiguous decls (is possible) such that we can record the `ambiguously_glob_imported_trait` lint.
Also updated the issue linked by the lint.
+ added extra test
+ bless original test because of updated link
@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 Jul 20, 2026
@theemathastheemathas added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 20, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 73ed271 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- #159449 (Enable single Location to issue multiple borrows)
- #159544 (Suggest valid command-line crate names)
- #159587 (Improve `AttrItem::span`)
- #159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- #159597 (std: use `arc4random_buf` from libc)
- #159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- #158061 (Make `pin!()` more foolproof.)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159571 (Remove unused bundled library lookup for the local crate)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159602 (Remove `ItemLike`)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-bors
rust-borsBot merged commit 581f102 into rust-lang:mainJul 20, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Jul 20, 2026
rust-timer added a commit that referenced this pull request Jul 20, 2026
Rollup merge of #159599 - LorrensP-2158466:fix-ambig-trait-glob-lint, r=petrochenkov
Resolver: Record at least 1 ambiguous trait if main decl is not a trait.
Addresses #159476.
When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the `AMBIGUOUSLY_GLOB_IMPORTED_TRAIT` lint, which was the case in #159476.
We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.
Also updated the linked issue of the lint in question.
r? @petrochenkov
@apiraino

Copy link
Copy Markdown
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels handled by them.

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 23, 2026
@cuvipercuviper mentioned this pull request Jul 23, 2026
@cuvipercuviper modified the milestones: 1.99.0, 1.98.0Jul 23, 2026
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 23, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 24, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
@LorrensP-2158466
LorrensP-2158466 deleted the fix-ambig-trait-glob-lint branch August 4, 2026 17:49
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Aug 17, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- rust-lang/rust#159600 (`rust-analyzer` subtree update)
- rust-lang/rust#158046 (proc_macro: preserve file module spans for inner attrs)
- rust-lang/rust#159000 (Small cleanups to the incr comp session code)
- rust-lang/rust#159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- rust-lang/rust#159449 (Enable single Location to issue multiple borrows)
- rust-lang/rust#159544 (Suggest valid command-line crate names)
- rust-lang/rust#159587 (Improve `AttrItem::span`)
- rust-lang/rust#159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- rust-lang/rust#159597 (std: use `arc4random_buf` from libc)
- rust-lang/rust#159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- rust-lang/rust#158061 (Make `pin!()` more foolproof.)
- rust-lang/rust#159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- rust-lang/rust#159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- rust-lang/rust#159571 (Remove unused bundled library lookup for the local crate)
- rust-lang/rust#159585 (Minor `TokenStream` improvements)
- rust-lang/rust#159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- rust-lang/rust#159602 (Remove `ItemLike`)
- rust-lang/rust#159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- rust-lang/rust#159590 (Remove some dead code)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 26, 2026
…update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang#152822 someone reported that the explanation is lacking/confusing since rust-lang#159599.
Explanation and example are extended in this pr.
rust-borsBot pushed a commit that referenced this pull request Aug 26, 2026
Rollup merge of #160354 - LorrensP-2158466:amb-import-trait-update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` #152822 someone reported that the explanation is lacking/confusing since #159599.
Explanation and example are extended in this pr.
pullBot pushed a commit to xtqqczze/rust-lang-miri that referenced this pull request Aug 27, 2026
…=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang/rust#152822 someone reported that the explanation is lacking/confusing since rust-lang/rust#159599.
Explanation and example are extended in this pr.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.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

Development

Successfully merging this pull request may close these issues.

6 participants

@LorrensP-2158466@petrochenkov@apiraino@cuviper@theemathas@rustbot
, '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('^' + ".*" + '
Skip to content

Resolver: Record at least 1 ambiguous trait if main decl is not a trait. - #159599

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint
Jul 20, 2026
Merged

Resolver: Record at least 1 ambiguous trait if main decl is not a trait.#159599
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint

Conversation

@LorrensP-2158466

@LorrensP-2158466LorrensP-2158466 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Addresses #159476.

When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the AMBIGUOUSLY_GLOB_IMPORTED_TRAIT lint, which was the case in #159476.

We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.

Also updated the linked issue of the lint in question.

r? @petrochenkov

…at least 1 trait of the ambiguous decls (is possible) such that we can record the `ambiguously_glob_imported_trait` lint.
Also updated the issue linked by the lint.
+ added extra test
+ bless original test because of updated link
@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 Jul 20, 2026
@theemathastheemathas added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 20, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 73ed271 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- #159449 (Enable single Location to issue multiple borrows)
- #159544 (Suggest valid command-line crate names)
- #159587 (Improve `AttrItem::span`)
- #159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- #159597 (std: use `arc4random_buf` from libc)
- #159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- #158061 (Make `pin!()` more foolproof.)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159571 (Remove unused bundled library lookup for the local crate)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159602 (Remove `ItemLike`)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-bors
rust-borsBot merged commit 581f102 into rust-lang:mainJul 20, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Jul 20, 2026
rust-timer added a commit that referenced this pull request Jul 20, 2026
Rollup merge of #159599 - LorrensP-2158466:fix-ambig-trait-glob-lint, r=petrochenkov
Resolver: Record at least 1 ambiguous trait if main decl is not a trait.
Addresses #159476.
When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the `AMBIGUOUSLY_GLOB_IMPORTED_TRAIT` lint, which was the case in #159476.
We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.
Also updated the linked issue of the lint in question.
r? @petrochenkov
@apiraino

Copy link
Copy Markdown
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels handled by them.

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 23, 2026
@cuvipercuviper mentioned this pull request Jul 23, 2026
@cuvipercuviper modified the milestones: 1.99.0, 1.98.0Jul 23, 2026
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 23, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 24, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
@LorrensP-2158466
LorrensP-2158466 deleted the fix-ambig-trait-glob-lint branch August 4, 2026 17:49
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Aug 17, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- rust-lang/rust#159600 (`rust-analyzer` subtree update)
- rust-lang/rust#158046 (proc_macro: preserve file module spans for inner attrs)
- rust-lang/rust#159000 (Small cleanups to the incr comp session code)
- rust-lang/rust#159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- rust-lang/rust#159449 (Enable single Location to issue multiple borrows)
- rust-lang/rust#159544 (Suggest valid command-line crate names)
- rust-lang/rust#159587 (Improve `AttrItem::span`)
- rust-lang/rust#159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- rust-lang/rust#159597 (std: use `arc4random_buf` from libc)
- rust-lang/rust#159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- rust-lang/rust#158061 (Make `pin!()` more foolproof.)
- rust-lang/rust#159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- rust-lang/rust#159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- rust-lang/rust#159571 (Remove unused bundled library lookup for the local crate)
- rust-lang/rust#159585 (Minor `TokenStream` improvements)
- rust-lang/rust#159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- rust-lang/rust#159602 (Remove `ItemLike`)
- rust-lang/rust#159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- rust-lang/rust#159590 (Remove some dead code)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 26, 2026
…update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang#152822 someone reported that the explanation is lacking/confusing since rust-lang#159599.
Explanation and example are extended in this pr.
rust-borsBot pushed a commit that referenced this pull request Aug 26, 2026
Rollup merge of #160354 - LorrensP-2158466:amb-import-trait-update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` #152822 someone reported that the explanation is lacking/confusing since #159599.
Explanation and example are extended in this pr.
pullBot pushed a commit to xtqqczze/rust-lang-miri that referenced this pull request Aug 27, 2026
…=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang/rust#152822 someone reported that the explanation is lacking/confusing since rust-lang/rust#159599.
Explanation and example are extended in this pr.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.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

Development

Successfully merging this pull request may close these issues.

6 participants

@LorrensP-2158466@petrochenkov@apiraino@cuviper@theemathas@rustbot
, '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" + '
Skip to content

Resolver: Record at least 1 ambiguous trait if main decl is not a trait. - #159599

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint
Jul 20, 2026
Merged

Resolver: Record at least 1 ambiguous trait if main decl is not a trait.#159599
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint

Conversation

@LorrensP-2158466

@LorrensP-2158466LorrensP-2158466 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Addresses #159476.

When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the AMBIGUOUSLY_GLOB_IMPORTED_TRAIT lint, which was the case in #159476.

We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.

Also updated the linked issue of the lint in question.

r? @petrochenkov

…at least 1 trait of the ambiguous decls (is possible) such that we can record the `ambiguously_glob_imported_trait` lint.
Also updated the issue linked by the lint.
+ added extra test
+ bless original test because of updated link
@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 Jul 20, 2026
@theemathastheemathas added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 20, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 73ed271 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- #159449 (Enable single Location to issue multiple borrows)
- #159544 (Suggest valid command-line crate names)
- #159587 (Improve `AttrItem::span`)
- #159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- #159597 (std: use `arc4random_buf` from libc)
- #159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- #158061 (Make `pin!()` more foolproof.)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159571 (Remove unused bundled library lookup for the local crate)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159602 (Remove `ItemLike`)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-bors
rust-borsBot merged commit 581f102 into rust-lang:mainJul 20, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Jul 20, 2026
rust-timer added a commit that referenced this pull request Jul 20, 2026
Rollup merge of #159599 - LorrensP-2158466:fix-ambig-trait-glob-lint, r=petrochenkov
Resolver: Record at least 1 ambiguous trait if main decl is not a trait.
Addresses #159476.
When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the `AMBIGUOUSLY_GLOB_IMPORTED_TRAIT` lint, which was the case in #159476.
We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.
Also updated the linked issue of the lint in question.
r? @petrochenkov
@apiraino

Copy link
Copy Markdown
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels handled by them.

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 23, 2026
@cuvipercuviper mentioned this pull request Jul 23, 2026
@cuvipercuviper modified the milestones: 1.99.0, 1.98.0Jul 23, 2026
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 23, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 24, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
@LorrensP-2158466
LorrensP-2158466 deleted the fix-ambig-trait-glob-lint branch August 4, 2026 17:49
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Aug 17, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- rust-lang/rust#159600 (`rust-analyzer` subtree update)
- rust-lang/rust#158046 (proc_macro: preserve file module spans for inner attrs)
- rust-lang/rust#159000 (Small cleanups to the incr comp session code)
- rust-lang/rust#159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- rust-lang/rust#159449 (Enable single Location to issue multiple borrows)
- rust-lang/rust#159544 (Suggest valid command-line crate names)
- rust-lang/rust#159587 (Improve `AttrItem::span`)
- rust-lang/rust#159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- rust-lang/rust#159597 (std: use `arc4random_buf` from libc)
- rust-lang/rust#159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- rust-lang/rust#158061 (Make `pin!()` more foolproof.)
- rust-lang/rust#159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- rust-lang/rust#159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- rust-lang/rust#159571 (Remove unused bundled library lookup for the local crate)
- rust-lang/rust#159585 (Minor `TokenStream` improvements)
- rust-lang/rust#159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- rust-lang/rust#159602 (Remove `ItemLike`)
- rust-lang/rust#159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- rust-lang/rust#159590 (Remove some dead code)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 26, 2026
…update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang#152822 someone reported that the explanation is lacking/confusing since rust-lang#159599.
Explanation and example are extended in this pr.
rust-borsBot pushed a commit that referenced this pull request Aug 26, 2026
Rollup merge of #160354 - LorrensP-2158466:amb-import-trait-update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` #152822 someone reported that the explanation is lacking/confusing since #159599.
Explanation and example are extended in this pr.
pullBot pushed a commit to xtqqczze/rust-lang-miri that referenced this pull request Aug 27, 2026
…=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang/rust#152822 someone reported that the explanation is lacking/confusing since rust-lang/rust#159599.
Explanation and example are extended in this pr.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.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

Development

Successfully merging this pull request may close these issues.

6 participants

@LorrensP-2158466@petrochenkov@apiraino@cuviper@theemathas@rustbot
, '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('^' + ".*" + '
Skip to content

Resolver: Record at least 1 ambiguous trait if main decl is not a trait. - #159599

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint
Jul 20, 2026
Merged

Resolver: Record at least 1 ambiguous trait if main decl is not a trait.#159599
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint

Conversation

@LorrensP-2158466

@LorrensP-2158466LorrensP-2158466 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Addresses #159476.

When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the AMBIGUOUSLY_GLOB_IMPORTED_TRAIT lint, which was the case in #159476.

We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.

Also updated the linked issue of the lint in question.

r? @petrochenkov

…at least 1 trait of the ambiguous decls (is possible) such that we can record the `ambiguously_glob_imported_trait` lint.
Also updated the issue linked by the lint.
+ added extra test
+ bless original test because of updated link
@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 Jul 20, 2026
@theemathastheemathas added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 20, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 73ed271 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- #159449 (Enable single Location to issue multiple borrows)
- #159544 (Suggest valid command-line crate names)
- #159587 (Improve `AttrItem::span`)
- #159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- #159597 (std: use `arc4random_buf` from libc)
- #159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- #158061 (Make `pin!()` more foolproof.)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159571 (Remove unused bundled library lookup for the local crate)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159602 (Remove `ItemLike`)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-bors
rust-borsBot merged commit 581f102 into rust-lang:mainJul 20, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Jul 20, 2026
rust-timer added a commit that referenced this pull request Jul 20, 2026
Rollup merge of #159599 - LorrensP-2158466:fix-ambig-trait-glob-lint, r=petrochenkov
Resolver: Record at least 1 ambiguous trait if main decl is not a trait.
Addresses #159476.
When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the `AMBIGUOUSLY_GLOB_IMPORTED_TRAIT` lint, which was the case in #159476.
We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.
Also updated the linked issue of the lint in question.
r? @petrochenkov
@apiraino

Copy link
Copy Markdown
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels handled by them.

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 23, 2026
@cuvipercuviper mentioned this pull request Jul 23, 2026
@cuvipercuviper modified the milestones: 1.99.0, 1.98.0Jul 23, 2026
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 23, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 24, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
@LorrensP-2158466
LorrensP-2158466 deleted the fix-ambig-trait-glob-lint branch August 4, 2026 17:49
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Aug 17, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- rust-lang/rust#159600 (`rust-analyzer` subtree update)
- rust-lang/rust#158046 (proc_macro: preserve file module spans for inner attrs)
- rust-lang/rust#159000 (Small cleanups to the incr comp session code)
- rust-lang/rust#159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- rust-lang/rust#159449 (Enable single Location to issue multiple borrows)
- rust-lang/rust#159544 (Suggest valid command-line crate names)
- rust-lang/rust#159587 (Improve `AttrItem::span`)
- rust-lang/rust#159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- rust-lang/rust#159597 (std: use `arc4random_buf` from libc)
- rust-lang/rust#159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- rust-lang/rust#158061 (Make `pin!()` more foolproof.)
- rust-lang/rust#159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- rust-lang/rust#159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- rust-lang/rust#159571 (Remove unused bundled library lookup for the local crate)
- rust-lang/rust#159585 (Minor `TokenStream` improvements)
- rust-lang/rust#159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- rust-lang/rust#159602 (Remove `ItemLike`)
- rust-lang/rust#159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- rust-lang/rust#159590 (Remove some dead code)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 26, 2026
…update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang#152822 someone reported that the explanation is lacking/confusing since rust-lang#159599.
Explanation and example are extended in this pr.
rust-borsBot pushed a commit that referenced this pull request Aug 26, 2026
Rollup merge of #160354 - LorrensP-2158466:amb-import-trait-update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` #152822 someone reported that the explanation is lacking/confusing since #159599.
Explanation and example are extended in this pr.
pullBot pushed a commit to xtqqczze/rust-lang-miri that referenced this pull request Aug 27, 2026
…=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang/rust#152822 someone reported that the explanation is lacking/confusing since rust-lang/rust#159599.
Explanation and example are extended in this pr.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.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

Development

Successfully merging this pull request may close these issues.

6 participants

@LorrensP-2158466@petrochenkov@apiraino@cuviper@theemathas@rustbot
, '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('^' + ".*" + '
Skip to content

Resolver: Record at least 1 ambiguous trait if main decl is not a trait. - #159599

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint
Jul 20, 2026
Merged

Resolver: Record at least 1 ambiguous trait if main decl is not a trait.#159599
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint

Conversation

@LorrensP-2158466

@LorrensP-2158466LorrensP-2158466 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Addresses #159476.

When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the AMBIGUOUSLY_GLOB_IMPORTED_TRAIT lint, which was the case in #159476.

We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.

Also updated the linked issue of the lint in question.

r? @petrochenkov

…at least 1 trait of the ambiguous decls (is possible) such that we can record the `ambiguously_glob_imported_trait` lint.
Also updated the issue linked by the lint.
+ added extra test
+ bless original test because of updated link
@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 Jul 20, 2026
@theemathastheemathas added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 20, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 73ed271 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- #159449 (Enable single Location to issue multiple borrows)
- #159544 (Suggest valid command-line crate names)
- #159587 (Improve `AttrItem::span`)
- #159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- #159597 (std: use `arc4random_buf` from libc)
- #159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- #158061 (Make `pin!()` more foolproof.)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159571 (Remove unused bundled library lookup for the local crate)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159602 (Remove `ItemLike`)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-bors
rust-borsBot merged commit 581f102 into rust-lang:mainJul 20, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Jul 20, 2026
rust-timer added a commit that referenced this pull request Jul 20, 2026
Rollup merge of #159599 - LorrensP-2158466:fix-ambig-trait-glob-lint, r=petrochenkov
Resolver: Record at least 1 ambiguous trait if main decl is not a trait.
Addresses #159476.
When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the `AMBIGUOUSLY_GLOB_IMPORTED_TRAIT` lint, which was the case in #159476.
We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.
Also updated the linked issue of the lint in question.
r? @petrochenkov
@apiraino

Copy link
Copy Markdown
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels handled by them.

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 23, 2026
@cuvipercuviper mentioned this pull request Jul 23, 2026
@cuvipercuviper modified the milestones: 1.99.0, 1.98.0Jul 23, 2026
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 23, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 24, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
@LorrensP-2158466
LorrensP-2158466 deleted the fix-ambig-trait-glob-lint branch August 4, 2026 17:49
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Aug 17, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- rust-lang/rust#159600 (`rust-analyzer` subtree update)
- rust-lang/rust#158046 (proc_macro: preserve file module spans for inner attrs)
- rust-lang/rust#159000 (Small cleanups to the incr comp session code)
- rust-lang/rust#159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- rust-lang/rust#159449 (Enable single Location to issue multiple borrows)
- rust-lang/rust#159544 (Suggest valid command-line crate names)
- rust-lang/rust#159587 (Improve `AttrItem::span`)
- rust-lang/rust#159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- rust-lang/rust#159597 (std: use `arc4random_buf` from libc)
- rust-lang/rust#159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- rust-lang/rust#158061 (Make `pin!()` more foolproof.)
- rust-lang/rust#159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- rust-lang/rust#159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- rust-lang/rust#159571 (Remove unused bundled library lookup for the local crate)
- rust-lang/rust#159585 (Minor `TokenStream` improvements)
- rust-lang/rust#159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- rust-lang/rust#159602 (Remove `ItemLike`)
- rust-lang/rust#159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- rust-lang/rust#159590 (Remove some dead code)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 26, 2026
…update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang#152822 someone reported that the explanation is lacking/confusing since rust-lang#159599.
Explanation and example are extended in this pr.
rust-borsBot pushed a commit that referenced this pull request Aug 26, 2026
Rollup merge of #160354 - LorrensP-2158466:amb-import-trait-update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` #152822 someone reported that the explanation is lacking/confusing since #159599.
Explanation and example are extended in this pr.
pullBot pushed a commit to xtqqczze/rust-lang-miri that referenced this pull request Aug 27, 2026
…=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang/rust#152822 someone reported that the explanation is lacking/confusing since rust-lang/rust#159599.
Explanation and example are extended in this pr.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.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

Development

Successfully merging this pull request may close these issues.

6 participants

@LorrensP-2158466@petrochenkov@apiraino@cuviper@theemathas@rustbot
, '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); } })(); })();
Skip to content

Resolver: Record at least 1 ambiguous trait if main decl is not a trait. - #159599

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint
Jul 20, 2026
Merged

Resolver: Record at least 1 ambiguous trait if main decl is not a trait.#159599
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
LorrensP-2158466:fix-ambig-trait-glob-lint

Conversation

@LorrensP-2158466

@LorrensP-2158466LorrensP-2158466 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Addresses #159476.

When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the AMBIGUOUSLY_GLOB_IMPORTED_TRAIT lint, which was the case in #159476.

We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.

Also updated the linked issue of the lint in question.

r? @petrochenkov

…at least 1 trait of the ambiguous decls (is possible) such that we can record the `ambiguously_glob_imported_trait` lint.
Also updated the issue linked by the lint.
+ added extra test
+ bless original test because of updated link
@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 Jul 20, 2026
@theemathastheemathas added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 20, 2026
@petrochenkov

Copy link
Copy Markdown
Contributor

@bors r+

@rust-bors

rust-borsBot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 73ed271 has been approved by petrochenkov

It is now in the queue for this repository.

@rust-borsrust-borsBot 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 Jul 20, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 20, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- #159600 (`rust-analyzer` subtree update)
- #158046 (proc_macro: preserve file module spans for inner attrs)
- #159000 (Small cleanups to the incr comp session code)
- #159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- #159449 (Enable single Location to issue multiple borrows)
- #159544 (Suggest valid command-line crate names)
- #159587 (Improve `AttrItem::span`)
- #159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- #159597 (std: use `arc4random_buf` from libc)
- #159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- #158061 (Make `pin!()` more foolproof.)
- #159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- #159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- #159571 (Remove unused bundled library lookup for the local crate)
- #159585 (Minor `TokenStream` improvements)
- #159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- #159602 (Remove `ItemLike`)
- #159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- #159590 (Remove some dead code)
@rust-bors
rust-borsBot merged commit 581f102 into rust-lang:mainJul 20, 2026
13 checks passed
@rustbotrustbot added this to the 1.99.0 milestone Jul 20, 2026
rust-timer added a commit that referenced this pull request Jul 20, 2026
Rollup merge of #159599 - LorrensP-2158466:fix-ambig-trait-glob-lint, r=petrochenkov
Resolver: Record at least 1 ambiguous trait if main decl is not a trait.
Addresses #159476.
When recording traits of a particular module, it is possible that a trait hidden in the ambiguity declaration of a main declaration (struct, enum, ...), thus causing us to never record that trait. This caused us to report an error that methods of those traits are not in scope and that we do not report the `AMBIGUOUSLY_GLOB_IMPORTED_TRAIT` lint, which was the case in #159476.
We now record at least 1 trait in the collection of ambiguous declarations, such that we don't report that error and can report the relevant lint.
Also updated the linked issue of the lint in question.
r? @petrochenkov
@apiraino

Copy link
Copy Markdown
Contributor

Beta backport accepted as per compiler team on Zulip. A backport PR will be authored by the release team at the end of the current development cycle. Backport labels handled by them.

@rustbot label +beta-accepted

@rustbotrustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jul 23, 2026
@cuvipercuviper mentioned this pull request Jul 23, 2026
@cuvipercuviper modified the milestones: 1.99.0, 1.98.0Jul 23, 2026
@cuvipercuviper removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 23, 2026
rust-borsBot pushed a commit that referenced this pull request Jul 24, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
rust-borsBot pushed a commit that referenced this pull request Jul 25, 2026
[beta] backports
- Fix string indexing in diagnostic format strings #159470
- Resolver: Record at least 1 ambiguous trait if main decl is not a trait. #159599
- Set the rustc lib path for unstable-book-gen #159613
r? me
@LorrensP-2158466
LorrensP-2158466 deleted the fix-ambig-trait-glob-lint branch August 4, 2026 17:49
lnicola pushed a commit to lnicola/rust-analyzer that referenced this pull request Aug 17, 2026
…uwer
Rollup of 18 pull requests
Successful merges:
- rust-lang/rust#159600 (`rust-analyzer` subtree update)
- rust-lang/rust#158046 (proc_macro: preserve file module spans for inner attrs)
- rust-lang/rust#159000 (Small cleanups to the incr comp session code)
- rust-lang/rust#159189 (Account for type alias projections in E0308 "expected/found" shortening logic)
- rust-lang/rust#159449 (Enable single Location to issue multiple borrows)
- rust-lang/rust#159544 (Suggest valid command-line crate names)
- rust-lang/rust#159587 (Improve `AttrItem::span`)
- rust-lang/rust#159594 (feat(rustc_hir_typeck): suggest `impl Fn` return for capturing closures)
- rust-lang/rust#159597 (std: use `arc4random_buf` from libc)
- rust-lang/rust#159599 (Resolver: Record at least 1 ambiguous trait if main decl is not a trait.)
- rust-lang/rust#158061 (Make `pin!()` more foolproof.)
- rust-lang/rust#159460 (Do not mark unnormalized const aliases as rigid when normalizing param env)
- rust-lang/rust#159529 (Add regression test for nested replacement ranges in `collect_tokens`)
- rust-lang/rust#159571 (Remove unused bundled library lookup for the local crate)
- rust-lang/rust#159585 (Minor `TokenStream` improvements)
- rust-lang/rust#159586 (Separate `InterpCx` usage by `ConstAnalysis` phases)
- rust-lang/rust#159602 (Remove `ItemLike`)
- rust-lang/rust#159603 (Clarify `push_stream`/`push_tree`)
Failed merges:
- rust-lang/rust#159590 (Remove some dead code)
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Aug 26, 2026
…update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang#152822 someone reported that the explanation is lacking/confusing since rust-lang#159599.
Explanation and example are extended in this pr.
rust-borsBot pushed a commit that referenced this pull request Aug 26, 2026
Rollup merge of #160354 - LorrensP-2158466:amb-import-trait-update, r=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` #152822 someone reported that the explanation is lacking/confusing since #159599.
Explanation and example are extended in this pr.
pullBot pushed a commit to xtqqczze/rust-lang-miri that referenced this pull request Aug 27, 2026
…=ShoyuVanilla
update `ambiguous_glob_imported_trait` lint explanation and example.
In the tracking issue for the `ambiguous_glob_imported_trait` rust-lang/rust#152822 someone reported that the explanation is lacking/confusing since rust-lang/rust#159599.
Explanation and example are extended in this pr.
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.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

Development

Successfully merging this pull request may close these issues.

6 participants

@LorrensP-2158466@petrochenkov@apiraino@cuviper@theemathas@rustbot