Rollup of 15 pull requests #122008

jhpratt · 2024-03-05T02:50:37Z

Successful merges:

Add basic i18n guidance for Display #121065 (Add basic i18n guidance for Display)
Limit the number of names and values in check-cfg diagnostics #121202 (Limit the number of names and values in check-cfg diagnostics)
Add an example to demonstrate how Rc::into_inner works #121213 (Add an example to demonstrate how Rc::into_inner works)
Add vector time complexity #121262 (Add vector time complexity)
Clarify/add must_use message for Rc/Arc/Weak::into_raw. #121287 (Clarify/add must_use message for Rc/Arc/Weak::into_raw.)
Adjust error yield/await lowering #121664 (Adjust error yield/await lowering)
Use the correct logic for nested impl trait in assoc types #121838 (Use the correct logic for nested impl trait in assoc types)
Add a tidy check that checks whether the fluent slugs only appear once #121860 (Add a tidy check that checks whether the fluent slugs only appear once)
Don't panic when waiting on poisoned queries #121913 (Don't panic when waiting on poisoned queries)
Removing absolute path in proc-macro #121959 (Removing absolute path in proc-macro)
hir_analysis: enums return None in find_field #121975 (hir_analysis: enums return None in find_field)
Fix duplicated path in the "not found dylib" error #121978 (Fix duplicated path in the "not found dylib" error)
pattern analysis: abort on arity mismatch #121987 (pattern analysis: abort on arity mismatch)
Avoid using unnecessary queries when printing the query stack in panics #121993 (Avoid using unnecessary queries when printing the query stack in panics)
interpret/cast: make more matches on FloatTy properly exhaustive #121997 (interpret/cast: make more matches on FloatTy properly exhaustive)

r? @ghost
@rustbot modify labels: rollup

Copying is O(n)—not the memory allocation

With rust 1.75 the absolute build path is embedding into '.rustc' section and which causes reproducibility issues. Detailed issue is here. rust-lang#120825 (comment) With this change the 'absolute path' changed back to '/rust/$hash' format.

…lector and use a runtime switch instead

Unnamed union fields with enums are checked for, but if `find_field` causes an ICE then the compiler won't get to that point. Signed-off-by: David Wood <david@davidtw.co>

As this can cause panics on array accesses later.

Co-authored-by: Rémy Rakic <remy.rakic+github@gmail.com>

Co-authored-by: Simon Farnsworth <simon@farnz.org.uk>

Add basic i18n guidance for `Display` I've tried to be relatively noncommittal here. The part I think is most important is to mention the concept of "display adapters" *somewhere* in the `std::fmt` documentation that has some chance of being discovered when people go looking for ways to provide context when `Display`ing their type. Rendered: > ### Internationalization > > Because a type can only have one `Display` implementation, it is often preferable to only implement `Display` when there is a single most "obvious" way that values can be formatted as text. This could mean formatting according to the "invariant" culture and "undefined" locale, or it could mean that the type display is designed for a specific culture/locale, such as developer logs. > > If not all values have a justifiably canonical textual format or if you want to support alternative formats not covered by the standard set of possible [formatting traits], the most flexible approach is display adapters: methods like [`str::escape_default`] or [`Path::display`] which create a wrapper implementing `Display` to output the specific display format. > > [formatting traits]: https://doc.rust-lang.org/nightly/std/fmt/index.html#formatting-traits > [`str::escape_default`]: https://doc.rust-lang.org/nightly/std/primitive.str.html#method.escape_default > [`Path::display`]: https://doc.rust-lang.org/nightly/std/path/struct.Path.html#method.display The module docs do already have a [localization header](https://doc.rust-lang.org/nightly/std/fmt/index.html#localization), so maybe this header should be l10n instead of i18n, or maybe this information should live under that header? I'm not sure, but here on the `Display` trait at least isn't a *bad* spot to put it. The other side of this that comes up a lot is `FromStr` compatibility, but that's for a different PR.

… r=pnkfelix Limit the number of names and values in check-cfg diagnostics The Rust for Linux [feedback](rust-lang#82450 (comment)) to the check-cfg Call for Testing, revealed a weakness in the check-cfg. They are unbounded and in the case RfL they have ~20k cfgs and having them printed (even once) is unbearable. This PR limits it to 35 (28 rustc well known + `feature` + `docsrs` + 5 custom) which feels like a good middle ground for regular users (i.e. Cargo users). When it goes over that limit print the N first with " and X more". ``@rustbot`` label +F-check-cfg

…c-into-inner, r=cuviper Add an example to demonstrate how Rc::into_inner works This PR adds an example to Rc::into_inner, since it didn't have one previously.

jhpratt · 2024-03-05T02:52:55Z

@bors r+ rollup=never p=15

bors · 2024-03-05T02:52:57Z

📌 Commit 4a65a53 has been approved by jhpratt

It is now in the queue for this repository.

bors · 2024-03-05T02:54:07Z

⌛ Testing commit 4a65a53 with merge 76f9fb4...

Rollup of 15 pull requests Successful merges: - rust-lang#121065 (Add basic i18n guidance for `Display`) - rust-lang#121202 (Limit the number of names and values in check-cfg diagnostics) - rust-lang#121213 (Add an example to demonstrate how Rc::into_inner works) - rust-lang#121262 (Add vector time complexity) - rust-lang#121287 (Clarify/add `must_use` message for Rc/Arc/Weak::into_raw.) - rust-lang#121664 (Adjust error `yield`/`await` lowering) - rust-lang#121838 (Use the correct logic for nested impl trait in assoc types) - rust-lang#121860 (Add a tidy check that checks whether the fluent slugs only appear once) - rust-lang#121913 (Don't panic when waiting on poisoned queries) - rust-lang#121959 (Removing absolute path in proc-macro) - rust-lang#121975 (hir_analysis: enums return `None` in `find_field`) - rust-lang#121978 (Fix duplicated path in the "not found dylib" error) - rust-lang#121987 (pattern analysis: abort on arity mismatch) - rust-lang#121993 (Avoid using unnecessary queries when printing the query stack in panics) - rust-lang#121997 (interpret/cast: make more matches on FloatTy properly exhaustive) r? `@ghost` `@rustbot` modify labels: rollup

rust-log-analyzer · 2024-03-05T02:57:11Z

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

bors · 2024-03-05T02:57:27Z

💔 Test failed - checks-actions

jhpratt · 2024-03-05T02:58:28Z

@bors retry

tgross35 · 2024-03-05T03:16:19Z

FYI #121262 could use a squash, last 4 commits are fixups

jhpratt · 2024-03-05T03:22:45Z

I can do a rollup without that PR if you'd prefer? I quickly looked at the overall diff, not the actual commits.

tgross35 · 2024-03-05T03:28:42Z

I have no say, just happened to come across that one and notice the commits are redundant. About two hours until the current job finishes so no rush either way 🙂

jhpratt · 2024-03-05T03:30:25Z

I know it'll be a bit, which is why I asked. Personally I don't really care, but I'm also a new reviewer.

tgross35 · 2024-03-05T03:33:45Z

I'm not a reviewer at all so also not sure what the process is. I guess it doesn't hurt to drop that one if you get the chance, a cleaner commit history is never a bad thing

bors · 2024-03-05T05:27:49Z

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout rollup-g08ehpt (switch to your branch)
git fetch upstream master (retrieve the latest master)
git rebase upstream/master -p (rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self rollup-g08ehpt --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging compiler/rustc_session/src/session.rs
Auto-merging compiler/rustc_lint/src/context/diagnostics.rs
CONFLICT (content): Merge conflict in compiler/rustc_lint/src/context/diagnostics.rs
Automatic merge failed; fix conflicts and then commit the result.

tgross35 · 2024-03-05T05:30:13Z

Well, guess that's an answer 😆

jhpratt · 2024-03-05T05:58:44Z

To be fair, the merge conflict isn't related to the the extraneous commits 😛

bors · 2024-03-05T06:20:46Z

☔ The latest upstream changes (presumably #121780) made this pull request unmergeable. Please resolve the merge conflicts.

Takashiidobe and others added 30 commits February 16, 2024 20:21

Add an example to demonstrate how Rc::into_inner works

1f2db3d

time complexity for push

cb8ce9d

time complexity for push_within_capacity

bb6dca0

time complexity for pop

0a5d684

time complexity for insert

d2f825f

intradoc link for vec

ef1a584

fix typo in push documentation

a9cfeb3

Fix error in push docs

bc52e5d

Copying is O(n)—not the memory allocation

Clarify/add must_use message for Rc/Arc/Weak::into_raw.

261da5f

Make push docs more vague

74151cb

Adjust error yield/await lowering

e0a726c

Limit the number of names and values in check-cfg diagnostics

91322f4

Add regression test

f5f11e1

Add a tidy check that checks whether the fluent slugs only appear once

c3954b3

Remove unused fluent messages

d88c7ff

Don't panic when waiting on poisoned queries

dd0004a

Removing absolute path in proc-macro

a9a9798

With rust 1.75 the absolute build path is embedding into '.rustc' section and which causes reproducibility issues. Detailed issue is here. rust-lang#120825 (comment) With this change the 'absolute path' changed back to '/rust/$hash' format.

Merge the impl trait in assoc type collector into the opaque type col…

8364a06

…lector and use a runtime switch instead

hir_analysis: enums return None in find_field

4e03c51

Unnamed union fields with enums are checked for, but if `find_field` causes an ICE then the compiler won't get to that point. Signed-off-by: David Wood <david@davidtw.co>

Fix duplicated path in the "not found dylib" error

640e99c

Add regression ui test for duplicated path in dylib error

5e6e140

Abort on arity mismatch

2af01a2

As this can cause panics on array accesses later.

Avoid using unnecessary queries when printing the query stack in panics

fb91610

interpret/cast: make more matches on FloatTy properly exhaustive

86e88fc

typo

681dc38

Co-authored-by: Rémy Rakic <remy.rakic+github@gmail.com>

Explain use of display adapters

4dbd256

doc wording improvements

215a4b6

Co-authored-by: Simon Farnsworth <simon@farnz.org.uk>

Rollup merge of rust-lang#121213 - Takashiidobe:takashi/example-for-r…

7852ee9

…c-into-inner, r=cuviper Add an example to demonstrate how Rc::into_inner works This PR adds an example to Rc::into_inner, since it didn't have one previously.

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 Mar 5, 2024

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 5, 2024

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 Mar 5, 2024

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 5, 2024

jhpratt closed this Mar 5, 2024

jhpratt deleted the rollup-g08ehpt branch March 5, 2024 05:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 15 pull requests #122008

Rollup of 15 pull requests #122008

jhpratt commented Mar 5, 2024

jhpratt commented Mar 5, 2024

bors commented Mar 5, 2024

bors commented Mar 5, 2024

rust-log-analyzer commented Mar 5, 2024

bors commented Mar 5, 2024

jhpratt commented Mar 5, 2024

tgross35 commented Mar 5, 2024 •

edited

Loading

jhpratt commented Mar 5, 2024

tgross35 commented Mar 5, 2024

jhpratt commented Mar 5, 2024

tgross35 commented Mar 5, 2024

bors commented Mar 5, 2024

tgross35 commented Mar 5, 2024

jhpratt commented Mar 5, 2024

bors commented Mar 5, 2024

Rollup of 15 pull requests #122008

Rollup of 15 pull requests #122008

Conversation

jhpratt commented Mar 5, 2024

jhpratt commented Mar 5, 2024

bors commented Mar 5, 2024

bors commented Mar 5, 2024

rust-log-analyzer commented Mar 5, 2024

bors commented Mar 5, 2024

jhpratt commented Mar 5, 2024

tgross35 commented Mar 5, 2024 • edited Loading

jhpratt commented Mar 5, 2024

tgross35 commented Mar 5, 2024

jhpratt commented Mar 5, 2024

tgross35 commented Mar 5, 2024

bors commented Mar 5, 2024

tgross35 commented Mar 5, 2024

jhpratt commented Mar 5, 2024

bors commented Mar 5, 2024

tgross35 commented Mar 5, 2024 •

edited

Loading