Skip to content

Conversation

@petrochenkov
Copy link
Contributor

But still keep it report-in-deps, as decided in #149845 (comment).

This will need to be reverted after ~February 27 2026, when Rust 1.95 branches out from the main branch.

Closes #149845.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 14, 2026
@rustbot
Copy link
Collaborator

rustbot commented Jan 14, 2026

r? @jackh726

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

@lqd
Copy link
Member

lqd commented Jan 14, 2026

The plan described in that comment looks good and will help smooth over the diesel transition.

r? me @bors r+

@rust-bors rust-bors bot 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 Jan 14, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 14, 2026

📌 Commit ff3bf0f has been approved by lqd

It is now in the queue for this repository.

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Jan 14, 2026
resolve: Downgrade `ambiguous_glob_imports` to warn-by-default

But still keep it report-in-deps, as decided in rust-lang#149845 (comment).

This will need to be reverted after ~February 27 2026, when Rust 1.95 branches out from the main branch.

Closes rust-lang#149845.
rust-bors bot pushed a commit that referenced this pull request Jan 14, 2026
…uwer

Rollup of 16 pull requests

Successful merges:

 - #150585 (Add a context-consistency check before emitting redundant generic-argument suggestions)
 - #150586 (rustdoc: Fix intra-doc link bugs involving type aliases and associated items)
 - #150590 (Don't try to recover keyword as non-keyword identifier )
 - #150817 (cleanup: remove borrowck handling for inline const patterns)
 - #150939 (resolve: Relax some asserts in glob overwriting and add tests)
 - #150962 (Remove `FeedConstTy` and provide ty when lowering const arg)
 - #150966 (rustc_target: Remove unused Arch::PowerPC64LE)
 - #150971 (Disallow eii in statement position)
 - #151016 (fix: WASI threading regression by disabling pthread usage)
 - #151046 (compiler: Make Externally Implementable Item (eii) macros "semiopaque")
 - #151099 (Recover parse gracefully from `<const N>`)
 - #151117 (Avoid serde dependency in build_helper when not necessary)
 - #151127 (Delete `MetaItemOrLitParser::Err`)
 - #151128 (Add temporary new bors e-mail address to the mailmap)
 - #151130 (resolve: Downgrade `ambiguous_glob_imports` to warn-by-default)
 - #151138 (Rename `rust.use-lld` to `rust.bootstrap-override-lld` in INSTALL.md)

r? @ghost
@JonathanBrouwer
Copy link
Contributor

@bors r-
#151139 (comment)

@rust-bors rust-bors bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 14, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 14, 2026

Commit ff3bf0f has been unapproved.

@JonathanBrouwer
Copy link
Contributor

Soft conflict with https://github.com/rust-lang/rust/pull/150939/changes, rebase on that after that merges

But still keep it report-in-deps.

To revert after ~February 27 2026, when Rust 1.95 branches out from the main branch.
@rustbot
Copy link
Collaborator

rustbot commented Jan 15, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@petrochenkov
Copy link
Contributor Author

@bors r=lqd

@rust-bors rust-bors bot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 15, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 15, 2026

📌 Commit cd05071 has been approved by lqd

It is now in the queue for this repository.

rust-bors bot pushed a commit that referenced this pull request Jan 15, 2026
Rollup of 4 pull requests

Successful merges:

 - #150846 (include `HirId`s directly in the THIR, not wrapped in `LintLevel`s)
 - #150979 (Avoid ICEs after bad patterns, for the other syntactic variants)
 - #151103 (mir_build: Simplify length-determination and indexing for array/slice patterns)
 - #151130 (resolve: Downgrade `ambiguous_glob_imports` to warn-by-default)

r? @ghost
@rust-bors rust-bors bot merged commit 2567226 into rust-lang:main Jan 15, 2026
11 checks passed
rust-timer added a commit that referenced this pull request Jan 15, 2026
Rollup merge of #151130 - diesel2, r=lqd

resolve: Downgrade `ambiguous_glob_imports` to warn-by-default

But still keep it report-in-deps, as decided in #149845 (comment).

This will need to be reverted after ~February 27 2026, when Rust 1.95 branches out from the main branch.

Closes #149845.
@rustbot rustbot added this to the 1.94.0 milestone Jan 15, 2026
@petrochenkov
Copy link
Contributor Author

Looks like the milestone both here and in #147984 is 1.94.0, so backport is not needed.

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

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Diesel stops building with nightly-2025-12-10

5 participants