Skip to content
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

Revert #112758 and add test case #112847

Merged
merged 2 commits into from
Jun 20, 2023
Merged

Revert #112758 and add test case #112847

merged 2 commits into from
Jun 20, 2023

Conversation

bvanjoi
Copy link
Contributor

@bvanjoi bvanjoi commented Jun 20, 2023

Fixes #112831.

Cannot unwrap update_resolution for resolution.single_imports.remove(&Interned::new_unchecked(import)); because there is a relationship between the Import and &NameBinding in NameResolution. This issue caused by my unfamiliarity with the data structure and I apologize for it.

This PR had been reverted, and test case have been added.

r? @Nilstrieb
cc @petrochenkov

@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 Jun 20, 2023
@Noratrieb
Copy link
Member

no worries, mistakes happen, that's what nightly is for. at least we got a nice test for it :)
@bors r+ p=1
let's try getting this into today's nightly

@bors
Copy link
Contributor

bors commented Jun 20, 2023

📌 Commit 09d4a82 has been approved by Nilstrieb

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 Jun 20, 2023
@bors
Copy link
Contributor

bors commented Jun 20, 2023

⌛ Testing commit 09d4a82 with merge a34cead...

@bors
Copy link
Contributor

bors commented Jun 20, 2023

☀️ Test successful - checks-actions
Approved by: Nilstrieb
Pushing a34cead to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 20, 2023
@bors bors merged commit a34cead into rust-lang:master Jun 20, 2023
@rustbot rustbot added this to the 1.72.0 milestone Jun 20, 2023
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a34cead): 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)
3.3% [3.3%, 3.3%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.4% [-2.4%, -2.4%] 1
All ❌✅ (primary) 3.3% [3.3%, 3.3%] 1

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: 657.549s -> 657.004s (-0.08%)

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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
Development

Successfully merging this pull request may close these issues.

Trait not imported with super::*;
5 participants