Adjust `run_make_support::symbols` helpers #143837

jieyouxu · 2025-07-12T13:24:07Z

Massage the symbols helpers to fill out {match all, match any} x {substring match, exact match}:

	Substring match	Exact match
Match any	`object_contains_any_symbol_substring`	`object_contains_any_symbol`
Match all	`object_contains_all_symbol_substring`	`object_contains_all_symbols`

As I'd like to use object_contains_all_symbols for #143669.

As part of this:

Rename any_symbol_contains to object_contains_any_symbol_substring for accuracy, as any_symbol_contains is actually "contains any matching substring".
Remove with_symbol_iter.

Noticed while working on #143669.

r? @ChrisDenton (or compiler)

jieyouxu · 2025-07-12T13:29:26Z

tests/run-make/fmt-write-bloat/rmake.rs

(Obviously still broken)

Massage the `symbols` helpers to fill out {match all, match any} x {substring match, exact match}: | | Substring match | Exact match | |-----------|----------------------------------------|-------------------------------| | Match any | `object_contains_any_symbol_substring` | `object_contains_any_symbol` | | Match all | `object_contains_all_symbol_substring` | `object_contains_all_symbols` | As part of this, rename `any_symbol_contains` to `object_contains_any_symbol_substring` for accuracy.

jieyouxu · 2025-07-13T06:29:17Z

Added a meta test.

@rustbot review

ChrisDenton

Ok, feel free to r=me but I do have one nit that I don't think is worth blocking this improvement over.

When I was reading through the test cases, these function names seemed to blur into one another. object_contains_any_symbol_substring, object_contains_all_symbol_substring, object_contains_any_symbol and object_contains_all_symbols are all long names sometimes with only a few characters difference in the middle. So I could see mistakes being missed.

However, I don't have a clear idea of what would be an improvement here (hence why I don't want to block this). Maybe some more namespacing or an iterator type? Idk.

jieyouxu · 2025-07-14T16:04:23Z

However, I don't have a clear idea of what would be an improvement here (hence why I don't want to block this). Maybe some more namespacing or an iterator type? Idk.

Yeah, it was a symbol soup for me too. But they are hopelessly long because I couldn't come up with shorter names that aren't ambiguous, which is why they are named in a bikeshed_superlong_name format...

jieyouxu · 2025-07-14T16:07:21Z

Anyway, I opened #143933 to track the naming soup as a follow-up, at least the naming should be relatively easier...

@bors r=ChrisDenton rollup

bors · 2025-07-14T16:07:24Z

📌 Commit 1d0cbc6 has been approved by ChrisDenton

It is now in the queue for this repository.

Adjust `run_make_support::symbols` helpers Massage the `symbols` helpers to fill out {match all, match any} x {substring match, exact match}: | | Substring match | Exact match | |-----------|----------------------------------------|-------------------------------| | Match any | `object_contains_any_symbol_substring` | `object_contains_any_symbol` | | Match all | `object_contains_all_symbol_substring` | `object_contains_all_symbols` | As I'd like to use `object_contains_all_symbols` for rust-lang#143669. As part of this: - Rename `any_symbol_contains` to `object_contains_any_symbol_substring` for accuracy, as `any_symbol_contains` is actually "contains any matching substring". - Remove `with_symbol_iter`. Noticed while working on rust-lang#143669. r? `@ChrisDenton` (or compiler)

Adjust `run_make_support::symbols` helpers Massage the `symbols` helpers to fill out {match all, match any} x {substring match, exact match}: | | Substring match | Exact match | |-----------|----------------------------------------|-------------------------------| | Match any | `object_contains_any_symbol_substring` | `object_contains_any_symbol` | | Match all | `object_contains_all_symbol_substring` | `object_contains_all_symbols` | As I'd like to use `object_contains_all_symbols` for rust-lang#143669. As part of this: - Rename `any_symbol_contains` to `object_contains_any_symbol_substring` for accuracy, as `any_symbol_contains` is actually "contains any matching substring". - Remove `with_symbol_iter`. Noticed while working on rust-lang#143669. r? ``@ChrisDenton`` (or compiler)

Adjust `run_make_support::symbols` helpers Massage the `symbols` helpers to fill out {match all, match any} x {substring match, exact match}: | | Substring match | Exact match | |-----------|----------------------------------------|-------------------------------| | Match any | `object_contains_any_symbol_substring` | `object_contains_any_symbol` | | Match all | `object_contains_all_symbol_substring` | `object_contains_all_symbols` | As I'd like to use `object_contains_all_symbols` for rust-lang#143669. As part of this: - Rename `any_symbol_contains` to `object_contains_any_symbol_substring` for accuracy, as `any_symbol_contains` is actually "contains any matching substring". - Remove `with_symbol_iter`. Noticed while working on rust-lang#143669. r? ```@ChrisDenton``` (or compiler)

Rollup of 16 pull requests Successful merges: - #142301 (tests: Fix duplicated-path-in-error fail with musl) - #142936 (rustdoc-json: Structured attributes) - #143355 (wrapping shift: remove first bitmask and table) - #143630 (Drop `./x suggest`) - #143738 (Move several float tests to floats/mod.rs) - #143752 (Don't panic if WASI_SDK_PATH not set when detecting compiler) - #143820 (Fixed a core crate compilation failure when enabling the `optimize_for_size` feature on some targets) - #143837 (Adjust `run_make_support::symbols` helpers) - #143878 (Port `#[pointee]` to the new attribute parsing infrastructure) - #143907 (core: make `str::split_at_unchecked()` inline) - #143910 (Add experimental `backtrace-trace-only` std feature) - #143927 (Preserve constness in trait objects up to hir ty lowering) - #143935 (rustc_type_ir/walk: move docstring to `TypeWalker` itself) - #143938 (Update books) - #143941 (update `cfg_select!` documentation) - #143948 (Update mdbook to 0.4.52) Failed merges: - #143926 (Remove deprecated fields in bootstrap) r? `@ghost` `@rustbot` modify labels: rollup

Rollup of 13 pull requests Successful merges: - #142301 (tests: Fix duplicated-path-in-error fail with musl) - #143630 (Drop `./x suggest`) - #143736 (Give all bytes of TypeId provenance) - #143752 (Don't panic if WASI_SDK_PATH not set when detecting compiler) - #143837 (Adjust `run_make_support::symbols` helpers) - #143878 (Port `#[pointee]` to the new attribute parsing infrastructure) - #143905 (Recover and suggest to use `;` to construct array type) - #143907 (core: make `str::split_at_unchecked()` inline) - #143910 (Add experimental `backtrace-trace-only` std feature) - #143927 (Preserve constness in trait objects up to hir ty lowering) - #143935 (rustc_type_ir/walk: move docstring to `TypeWalker` itself) - #143938 (Update books) - #143941 (update `cfg_select!` documentation) Failed merges: - #143926 (Remove deprecated fields in bootstrap) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of #143837 - jieyouxu:symbol-apis, r=ChrisDenton Adjust `run_make_support::symbols` helpers Massage the `symbols` helpers to fill out {match all, match any} x {substring match, exact match}: | | Substring match | Exact match | |-----------|----------------------------------------|-------------------------------| | Match any | `object_contains_any_symbol_substring` | `object_contains_any_symbol` | | Match all | `object_contains_all_symbol_substring` | `object_contains_all_symbols` | As I'd like to use `object_contains_all_symbols` for #143669. As part of this: - Rename `any_symbol_contains` to `object_contains_any_symbol_substring` for accuracy, as `any_symbol_contains` is actually "contains any matching substring". - Remove `with_symbol_iter`. Noticed while working on #143669. r? ``@ChrisDenton`` (or compiler)

Rollup of 13 pull requests Successful merges: - rust-lang/rust#142301 (tests: Fix duplicated-path-in-error fail with musl) - rust-lang/rust#143630 (Drop `./x suggest`) - rust-lang/rust#143736 (Give all bytes of TypeId provenance) - rust-lang/rust#143752 (Don't panic if WASI_SDK_PATH not set when detecting compiler) - rust-lang/rust#143837 (Adjust `run_make_support::symbols` helpers) - rust-lang/rust#143878 (Port `#[pointee]` to the new attribute parsing infrastructure) - rust-lang/rust#143905 (Recover and suggest to use `;` to construct array type) - rust-lang/rust#143907 (core: make `str::split_at_unchecked()` inline) - rust-lang/rust#143910 (Add experimental `backtrace-trace-only` std feature) - rust-lang/rust#143927 (Preserve constness in trait objects up to hir ty lowering) - rust-lang/rust#143935 (rustc_type_ir/walk: move docstring to `TypeWalker` itself) - rust-lang/rust#143938 (Update books) - rust-lang/rust#143941 (update `cfg_select!` documentation) Failed merges: - rust-lang/rust#143926 (Remove deprecated fields in bootstrap) r? `@ghost` `@rustbot` modify labels: rollup

Adjust `run_make_support::symbols` helpers Massage the `symbols` helpers to fill out {match all, match any} x {substring match, exact match}: | | Substring match | Exact match | |-----------|----------------------------------------|-------------------------------| | Match any | `object_contains_any_symbol_substring` | `object_contains_any_symbol` | | Match all | `object_contains_all_symbol_substring` | `object_contains_all_symbols` | As I'd like to use `object_contains_all_symbols` for rust-lang#143669. As part of this: - Rename `any_symbol_contains` to `object_contains_any_symbol_substring` for accuracy, as `any_symbol_contains` is actually "contains any matching substring". - Remove `with_symbol_iter`. Noticed while working on rust-lang#143669. r? ``@ChrisDenton`` (or compiler)

…eltardieu Rollup of 13 pull requests Successful merges: - rust-lang#142301 (tests: Fix duplicated-path-in-error fail with musl) - rust-lang#143630 (Drop `./x suggest`) - rust-lang#143736 (Give all bytes of TypeId provenance) - rust-lang#143752 (Don't panic if WASI_SDK_PATH not set when detecting compiler) - rust-lang#143837 (Adjust `run_make_support::symbols` helpers) - rust-lang#143878 (Port `#[pointee]` to the new attribute parsing infrastructure) - rust-lang#143905 (Recover and suggest to use `;` to construct array type) - rust-lang#143907 (core: make `str::split_at_unchecked()` inline) - rust-lang#143910 (Add experimental `backtrace-trace-only` std feature) - rust-lang#143927 (Preserve constness in trait objects up to hir ty lowering) - rust-lang#143935 (rustc_type_ir/walk: move docstring to `TypeWalker` itself) - rust-lang#143938 (Update books) - rust-lang#143941 (update `cfg_select!` documentation) Failed merges: - rust-lang#143926 (Remove deprecated fields in bootstrap) r? `@ghost` `@rustbot` modify labels: rollup

rustbot assigned ChrisDenton Jul 12, 2025

rustbot added A-run-make Area: port run-make Makefiles to rmake.rs 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 12, 2025

jieyouxu mentioned this pull request Jul 12, 2025

Make sure fmt-write-bloat doesn't vacuously pass on no symbols #143669

Open

jieyouxu commented Jul 12, 2025

View reviewed changes

tests/run-make/fmt-write-bloat/rmake.rs

Copy link

Member Author

jieyouxu Jul 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Obviously still broken)

ChrisDenton reacted with thumbs up emoji

This comment was marked as resolved.

Sign in to view

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

This comment was marked as resolved.

Sign in to view

jieyouxu force-pushed the symbol-apis branch from 0c9d61c to 1f8dbc1 Compare July 13, 2025 06:28

jieyouxu changed the title ~~Adjust run-make-support::symbols helpers~~ Adjust run_make_support::symbols helpers Jul 13, 2025

jieyouxu added 2 commits July 13, 2025 14:28

Update run-make tests to use adjusted symbols helpers

1d0cbc6

jieyouxu force-pushed the symbol-apis branch from 1f8dbc1 to 1d0cbc6 Compare July 13, 2025 06:29

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 13, 2025

ChrisDenton approved these changes Jul 14, 2025

View reviewed changes

jieyouxu mentioned this pull request Jul 14, 2025

Come up with better names for run_make_support symbol helpers #143933

Open

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 14, 2025

Kobzol mentioned this pull request Jul 14, 2025

Rollup of 14 pull requests #143946

Closed

Kobzol mentioned this pull request Jul 14, 2025

Rollup of 7 pull requests #143947

Closed

jhpratt mentioned this pull request Jul 15, 2025

Rollup of 16 pull requests #143951

Closed

samueltardieu mentioned this pull request Jul 15, 2025

Rollup of 13 pull requests #143958

Merged

bors merged commit b89c63d into rust-lang:master Jul 15, 2025
11 checks passed

rustbot added this to the 1.90.0 milestone Jul 15, 2025

jieyouxu deleted the symbol-apis branch July 15, 2025 14:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Adjust `run_make_support::symbols` helpers #143837

Adjust `run_make_support::symbols` helpers #143837

Uh oh!

jieyouxu commented Jul 12, 2025 •

edited by rustbot

Loading

Uh oh!

jieyouxu Jul 12, 2025

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

jieyouxu commented Jul 13, 2025 •

edited

Loading

Uh oh!

ChrisDenton left a comment

Uh oh!

jieyouxu commented Jul 14, 2025

Uh oh!

jieyouxu commented Jul 14, 2025 •

edited

Loading

Uh oh!

bors commented Jul 14, 2025

Uh oh!

Uh oh!

Uh oh!

Adjust run_make_support::symbols helpers #143837

Adjust run_make_support::symbols helpers #143837

Uh oh!

Conversation

jieyouxu commented Jul 12, 2025 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jieyouxu Jul 12, 2025

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

This comment was marked as resolved.

jieyouxu commented Jul 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ChrisDenton left a comment

Choose a reason for hiding this comment

Uh oh!

jieyouxu commented Jul 14, 2025

Uh oh!

jieyouxu commented Jul 14, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bors commented Jul 14, 2025

Uh oh!

Uh oh!

Uh oh!

Adjust `run_make_support::symbols` helpers #143837

Adjust `run_make_support::symbols` helpers #143837

jieyouxu commented Jul 12, 2025 •

edited by rustbot

Loading

jieyouxu commented Jul 13, 2025 •

edited

Loading

jieyouxu commented Jul 14, 2025 •

edited

Loading