Resolve: merge `source_bindings` and `target_bindings` into `bindings` #143685

LorrensP-2158466 · 2025-07-09T13:02:37Z

Attempts to merge the 2 fields source_bindings and target_bindings of ImportKind::Single into 1 field called bindings.

r? @petrochenkov

LorrensP-2158466 · 2025-07-09T13:05:50Z

I used std::task::Poll as Progress (is not as confusing and I liked it more than Option).

compiler/rustc_resolve/src/ident.rs

compiler/rustc_resolve/src/imports.rs

LorrensP-2158466 · 2025-07-09T17:27:00Z

Unfortunately, this didn't fix the fail. I'll investigate it tomorrow.

compiler/rustc_resolve/src/imports.rs

compiler/rustc_resolve/src/lib.rs

compiler/rustc_resolve/src/imports.rs

LorrensP-2158466 · 2025-07-11T21:34:21Z

@rustbot ready

compiler/rustc_resolve/src/imports.rs

petrochenkov · 2025-07-12T09:45:17Z

Let's add a custom enum for this

enum PendingBinding {
    Pending,
    Ready(Option<NameBinding>)
}

, and add a helper method fn binding(&self) -> Option<NameBinding>, it will be more convenient.

LorrensP-2158466 · 2025-07-12T15:43:49Z

@bors r=petrochenkov

bors · 2025-07-12T15:43:51Z

@LorrensP-2158466: 🔑 Insufficient privileges: Not in reviewers

LorrensP-2158466 · 2025-07-12T15:44:20Z

@rustbot ready

Yeah, that was expected.

petrochenkov · 2025-07-12T15:46:02Z

@bors r+

bors · 2025-07-12T15:46:05Z

📌 Commit e3fc6e5 has been approved by petrochenkov

It is now in the queue for this repository.

…ings, r=petrochenkov Resolve: merge `source_bindings` and `target_bindings` into `bindings` Attempts to merge the 2 fields `source_bindings` and `target_bindings` of `ImportKind::Single` into 1 field called `bindings`. r? `@petrochenkov`

Rollup of 14 pull requests Successful merges: - #143301 (`tests/ui`: A New Order [26/N]) - #143461 (make `cfg_select` a builtin macro) - #143519 (Check assoc consts and tys later like assoc fns) - #143554 (slice: Mark `rotate_left`, `rotate_right` unstably const) - #143634 (interpret/allocation: expose init + write_wildcards on a range) - #143679 (Preserve the .debug_gdb_scripts section) - #143685 (Resolve: merge `source_bindings` and `target_bindings` into `bindings`) - #143704 (Be a bit more careful around exotic cycles in in the inliner) - #143734 (Refactor resolve resolution bindings) - #143774 (constify `From` and `Into`) - #143785 (Add --compile-time-deps argument for x check) - #143786 (Fix fallback for CI_JOB_NAME) - #143825 (clippy: fix test filtering when TESTNAME is empty) - #143826 (Fix command trace) r? `@ghost` `@rustbot` modify labels: rollup

…ings, r=petrochenkov Resolve: merge `source_bindings` and `target_bindings` into `bindings` Attempts to merge the 2 fields `source_bindings` and `target_bindings` of `ImportKind::Single` into 1 field called `bindings`. r? ``@petrochenkov``

Rollup of 13 pull requests Successful merges: - #143301 (`tests/ui`: A New Order [26/N]) - #143461 (make `cfg_select` a builtin macro) - #143519 (Check assoc consts and tys later like assoc fns) - #143554 (slice: Mark `rotate_left`, `rotate_right` unstably const) - #143634 (interpret/allocation: expose init + write_wildcards on a range) - #143679 (Preserve the .debug_gdb_scripts section) - #143685 (Resolve: merge `source_bindings` and `target_bindings` into `bindings`) - #143734 (Refactor resolve resolution bindings) - #143774 (constify `From` and `Into`) - #143785 (Add --compile-time-deps argument for x check) - #143786 (Fix fallback for CI_JOB_NAME) - #143825 (clippy: fix test filtering when TESTNAME is empty) - #143826 (Fix command trace) r? `@ghost` `@rustbot` modify labels: rollup

…ings, r=petrochenkov Resolve: merge `source_bindings` and `target_bindings` into `bindings` Attempts to merge the 2 fields `source_bindings` and `target_bindings` of `ImportKind::Single` into 1 field called `bindings`. r? ```@petrochenkov```

Rollup of 11 pull requests Successful merges: - #143301 (`tests/ui`: A New Order [26/N]) - #143519 (Check assoc consts and tys later like assoc fns) - #143554 (slice: Mark `rotate_left`, `rotate_right` unstably const) - #143634 (interpret/allocation: expose init + write_wildcards on a range) - #143685 (Resolve: merge `source_bindings` and `target_bindings` into `bindings`) - #143734 (Refactor resolve resolution bindings) - #143774 (constify `From` and `Into`) - #143785 (Add --compile-time-deps argument for x check) - #143786 (Fix fallback for CI_JOB_NAME) - #143825 (clippy: fix test filtering when TESTNAME is empty) - #143826 (Fix command trace) r? `@ghost` `@rustbot` modify labels: rollup

LorrensP-2158466 · 2025-07-13T18:33:02Z

r=me after addressing ...

I think you can do @bors2 delegate+ to give me this permission.

Rollup merge of #143685 - LorrensP-2158466:merge-import-bindings, r=petrochenkov Resolve: merge `source_bindings` and `target_bindings` into `bindings` Attempts to merge the 2 fields `source_bindings` and `target_bindings` of `ImportKind::Single` into 1 field called `bindings`. r? ````@petrochenkov````

Kobzol · 2025-07-13T20:11:18Z

@rust-timer build cb87a24

Checking for #143888.

rust-timer · 2025-07-14T00:43:54Z

Finished benchmarking commit (cb87a24): comparison URL.

Overall result: ❌ regressions - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.6%	[0.6%, 0.6%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (primary 0.1%, secondary 4.1%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	1.0%	[0.9%, 1.2%]	2
Regressions ❌ (secondary)	4.1%	[4.1%, 4.1%]	1
Improvements ✅ (primary)	-1.6%	[-1.6%, -1.6%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	0.1%	[-1.6%, 1.2%]	3

Cycles

Results (secondary 6.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	12.4%	[2.1%, 16.2%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.0%	[-5.8%, -2.3%]	2
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 465.776s -> 465.241s (-0.11%)
Artifact size: 374.73 MiB -> 374.70 MiB (-0.01%)

Rollup of 11 pull requests Successful merges: - rust-lang/rust#143301 (`tests/ui`: A New Order [26/N]) - rust-lang/rust#143519 (Check assoc consts and tys later like assoc fns) - rust-lang/rust#143554 (slice: Mark `rotate_left`, `rotate_right` unstably const) - rust-lang/rust#143634 (interpret/allocation: expose init + write_wildcards on a range) - rust-lang/rust#143685 (Resolve: merge `source_bindings` and `target_bindings` into `bindings`) - rust-lang/rust#143734 (Refactor resolve resolution bindings) - rust-lang/rust#143774 (constify `From` and `Into`) - rust-lang/rust#143785 (Add --compile-time-deps argument for x check) - rust-lang/rust#143786 (Fix fallback for CI_JOB_NAME) - rust-lang/rust#143825 (clippy: fix test filtering when TESTNAME is empty) - rust-lang/rust#143826 (Fix command trace) r? `@ghost` `@rustbot` modify labels: rollup

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 9, 2025

rustbot assigned petrochenkov Jul 9, 2025

This comment has been minimized.

Sign in to view

petrochenkov added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 9, 2025

petrochenkov reviewed Jul 9, 2025

View reviewed changes

compiler/rustc_resolve/src/ident.rs Outdated Show resolved Hide resolved

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 Jul 9, 2025

bjorn3 reviewed Jul 9, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

petrochenkov reviewed Jul 10, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

LorrensP-2158466 force-pushed the merge-import-bindings branch from e6d1789 to 564c205 Compare July 11, 2025 13:12

LorrensP-2158466 marked this pull request as ready for review July 11, 2025 13:13

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 Jul 11, 2025

LorrensP-2158466 changed the title ~~[WIP] Resolve: merge source_bindings and target_bindings into 1 field~~ Resolve: merge source_bindings and target_bindings into 1 field Jul 11, 2025

LorrensP-2158466 changed the title ~~Resolve: merge source_bindings and target_bindings into 1 field~~ Resolve: merge source_bindings and target_bindings into bindings Jul 11, 2025

This comment has been minimized.

Sign in to view

petrochenkov reviewed Jul 11, 2025

View reviewed changes

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 Jul 11, 2025

LorrensP-2158466 commented Jul 11, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

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 Jul 11, 2025

petrochenkov reviewed Jul 12, 2025

View reviewed changes

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

compiler/rustc_resolve/src/imports.rs Outdated Show resolved Hide resolved

petrochenkov removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 12, 2025

merge source and target bindings into single field

e3fc6e5

LorrensP-2158466 force-pushed the merge-import-bindings branch from 03effcd to e3fc6e5 Compare July 12, 2025 15:42

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 Jul 12, 2025

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 Jul 12, 2025

fmease mentioned this pull request Jul 13, 2025

Rollup of 14 pull requests #143866

Closed

matthiaskrgr mentioned this pull request Jul 13, 2025

Rollup of 13 pull requests #143876

Closed

This was referenced Jul 13, 2025

Rollup of 12 pull requests #143886

Closed

Rollup of 11 pull requests #143888

Merged

bors merged commit acbf5e4 into rust-lang:master Jul 13, 2025
11 checks passed

rustbot added this to the 1.90.0 milestone Jul 13, 2025

LorrensP-2158466 deleted the merge-import-bindings branch July 13, 2025 18:35

This comment has been minimized.

Sign in to view

Resolve: merge source_bindings and target_bindings into bindings #143685

Resolve: merge source_bindings and target_bindings into bindings #143685

Conversation

LorrensP-2158466 commented Jul 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

LorrensP-2158466 commented Jul 9, 2025

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

LorrensP-2158466 commented Jul 9, 2025

Uh oh!

This comment has been minimized.

Uh oh!

This comment was marked as resolved.

This comment has been minimized.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

LorrensP-2158466 commented Jul 11, 2025

Uh oh!

Uh oh!

Uh oh!

petrochenkov commented Jul 12, 2025

Uh oh!

LorrensP-2158466 commented Jul 12, 2025

Uh oh!

bors commented Jul 12, 2025

Uh oh!

LorrensP-2158466 commented Jul 12, 2025

Uh oh!

petrochenkov commented Jul 12, 2025

Uh oh!

bors commented Jul 12, 2025

Uh oh!

LorrensP-2158466 commented Jul 13, 2025

Uh oh!

Uh oh!

Kobzol commented Jul 13, 2025

Uh oh!

This comment has been minimized.

rust-timer commented Jul 14, 2025

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!

Resolve: merge `source_bindings` and `target_bindings` into `bindings` #143685

Resolve: merge `source_bindings` and `target_bindings` into `bindings` #143685

LorrensP-2158466 commented Jul 9, 2025 •

edited

Loading