Skip to content

Some small nits for supertrait_item_shadowing, and additional testing#155172

Merged
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
jackh726:supertrait-shadowing-cleanup
Apr 15, 2026
Merged

Some small nits for supertrait_item_shadowing, and additional testing#155172
rust-bors[bot] merged 2 commits intorust-lang:mainfrom
jackh726:supertrait-shadowing-cleanup

Conversation

@jackh726
Copy link
Copy Markdown
Member

@jackh726 jackh726 commented Apr 11, 2026

cc #89151

r? types

@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 Apr 11, 2026
Comment on lines +26 to +27
//[off_normal,off_shadowing]~^ WARN a method with this name may be added
//[off_normal,off_shadowing]~| WARN once this associated item is added
Copy link
Copy Markdown
Member Author

@jackh726 jackh726 Apr 11, 2026

Choose a reason for hiding this comment

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

View changes since the review

So, looking at this, we may want to not lint when shadowing is enabled. Though, maybe we do, because behavior will change.

Copy link
Copy Markdown
Contributor

@lcnr lcnr left a comment

Choose a reason for hiding this comment

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

instead of println and having separate test files, can you return a &str` and add asserts?

View changes since this review

@jackh726
Copy link
Copy Markdown
Member Author

@lcnr indeed that would be better imo. But this was the style that errs used for the rest of these tests.

I'm happy to add a new commit that changes the entire set of tests for this feature to use asserts.

@lcnr
Copy link
Copy Markdown
Contributor

lcnr commented Apr 13, 2026

would be happy about this, yeah

@jackh726 jackh726 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 Apr 13, 2026
@jackh726
Copy link
Copy Markdown
Member Author

Done.

@lcnr
Copy link
Copy Markdown
Contributor

lcnr commented Apr 14, 2026

thx

@bors r+ rollup

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented Apr 14, 2026

📌 Commit c681ae6 has been approved by lcnr

It is now in the queue for this repository.

@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 Apr 14, 2026
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Apr 14, 2026
…nup, r=lcnr

Some small nits for supertrait_item_shadowing, and additional testing

cc rust-lang#89151

r? types
JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Apr 14, 2026
…nup, r=lcnr

Some small nits for supertrait_item_shadowing, and additional testing

cc rust-lang#89151

r? types
rust-bors Bot pushed a commit that referenced this pull request Apr 14, 2026
…uwer

Rollup of 9 pull requests

Successful merges:

 - #153536 (Add `const_param_ty_unchecked` gate)
 - #153815 (Fix ICE when Self is used in enum discriminant of a generic enum)
 - #154882 (Gate tuple const params behind `min_adt_const_params` feature)
 - #155293 (fix arch names in cfg pretty printer)
 - #154765 (Clarify ascii whitespace exclusion of vertical tab in the doc)
 - #155172 (Some small nits for supertrait_item_shadowing, and additional testing)
 - #155279 (Test/lexer unicode pattern white space)
 - #155280 (Tests for precise-capture through RPIT and TAIT)
 - #155304 (remove PointeeParser)
rust-bors Bot pushed a commit that referenced this pull request Apr 15, 2026
Rollup of 13 pull requests

Successful merges:

 - #154882 (Gate tuple const params behind `min_adt_const_params` feature)
 - #155259 (explicit-tail-calls: disable two tests on LoongArch)
 - #155293 (fix arch names in cfg pretty printer)
 - #155314 (`BorrowedBuf`: Update outdated safety comments in `set_init` users.)
 - #153469 (docs: clarify path search behavior in std::process::Command::new)
 - #154765 (Clarify ascii whitespace exclusion of vertical tab in the doc)
 - #155172 (Some small nits for supertrait_item_shadowing, and additional testing)
 - #155279 (Test/lexer unicode pattern white space)
 - #155280 (Tests for precise-capture through RPIT and TAIT)
 - #155301 (Delete unused `rustc_trait_selection` errors.)
 - #155303 (remove ibraheemdev from review rotation)
 - #155304 (remove PointeeParser)
 - #155319 (Remove dead diagnostic structs.)
@rust-bors rust-bors Bot merged commit 5cff48a into rust-lang:main Apr 15, 2026
11 checks passed
@rustbot rustbot added this to the 1.97.0 milestone Apr 15, 2026
rust-timer added a commit that referenced this pull request Apr 15, 2026
Rollup merge of #155172 - jackh726:supertrait-shadowing-cleanup, r=lcnr

Some small nits for supertrait_item_shadowing, and additional testing

cc #89151

r? types
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.

3 participants