Skip to content

fix(resolve): update def if binding is warning ambiguity #115389

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 1 commit into from
Aug 31, 2023
Merged

fix(resolve): update def if binding is warning ambiguity #115389

merged 1 commit into from
Aug 31, 2023

Conversation

bvanjoi
Copy link
Contributor

@bvanjoi bvanjoi commented Aug 30, 2023

Fixes #115380

@bvanjoi bvanjoi mentioned this pull request Aug 30, 2023
Closed
@rust-log-analyzer

This comment has been minimized.

# to view
@rustbot
Copy link
Collaborator

rustbot commented Aug 30, 2023

r? @petrochenkov

(rustbot has picked a reviewer for you, use r? to override)

@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 Aug 30, 2023
petrochenkov
petrochenkov reviewed Aug 31, 2023
View reviewed changes
@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 31, 2023
@bvanjoi
Copy link
Contributor Author

bvanjoi commented Aug 31, 2023

ci is green
@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 31, 2023
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Aug 31, 2023

📌 Commit 1071521 has been approved by petrochenkov

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 31, 2023
@bors
Copy link
Collaborator

bors commented Aug 31, 2023

⌛ Testing commit 1071521 with merge 9194213...

@bors
Copy link
Collaborator

bors commented Aug 31, 2023

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing 9194213 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 31, 2023
@bors bors merged commit 9194213 into rust-lang:master Aug 31, 2023
@rustbot rustbot added this to the 1.74.0 milestone Aug 31, 2023
@bors bors mentioned this pull request Aug 31, 2023
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (9194213): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 0.7% [0.5%, 0.9%] 2
Regressions ❌
(secondary)		 1.4% [1.4%, 1.4%] 2
Improvements ✅
(primary)		 -1.5% [-2.4%, -0.5%] 2
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.4% [-2.4%, 0.9%] 4

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 629.802s -> 630.392s (0.09%)
Artifact size: 316.41 MiB -> 316.46 MiB (0.02%)

@tmiasko tmiasko added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 7, 2023
@tmiasko tmiasko mentioned this pull request Sep 12, 2023
Closed
@apiraino
Copy link
Contributor

Beta backport accepted as per compiler team on Zulip

@rustbot label +beta-accepted

@rustbot rustbot added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Sep 14, 2023
@Mark-Simulacrum Mark-Simulacrum removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Sep 16, 2023
@Mark-Simulacrum Mark-Simulacrum modified the milestones: 1.74.0, 1.73.0 Sep 16, 2023
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Sep 16, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 17, 2023
@bors
Auto merge of rust-lang#115901 - Mark-Simulacrum:beta-backport, r=Mar…
9b95397 
…k-Simulacrum

[beta] backport

This PR backports:

- rust-lang#115785: Only suggest turbofish in patterns if we may recover
- rust-lang#115527: Don't require `Drop` for `[PhantomData<T>; N]` where `N` and `T` are generic, if `T` requires `Drop`
- rust-lang#115389: fix(resolve): update def if binding is warning ambiguity
- rust-lang#115215: Remove assert that checks type equality

r? `@Mark-Simulacrum`
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. merged-by-bors This PR was explicitly merged by bors. 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
Milestone
1.73.0
Development

Successfully merging this pull request may close these issues.

no MIR available ICE instead of an ambiguity error
9 participants
@bvanjoi @rust-log-analyzer @rustbot @petrochenkov @bors @rust-timer @apiraino @Mark-Simulacrum @tmiasko