https://github.com/rust-lang/rust http://git.dreamy.place/mirrors/rust/atom?h=try 2025-07-18T17:49:19+00:00 2025-07-18T17:49:19+00:00 xizheyin xizheyin@smail.nju.edu.cn 2025-07-18T17:49:19+00:00 urn:sha1:c58e0bd09368a96dbde1ec1f30e36764e1431125 Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn> 2025-07-11T05:35:20+00:00 Matthias Krüger 476013+matthiaskrgr@users.noreply.github.com 2025-07-11T05:35:20+00:00 urn:sha1:140f2fa5ae32814cd3915adbb86af8b93efce9c4 chore: Improve how the other suggestions message gets rendered Note: This change is part of my ongoing work to use `annotate-snippets` as `rustc`'s emitter This change started as a way to remove some specialty code paths from `annotate-snippets`, by making the "and {} other candidates" message get rendered like a secondary message with no level, but turned into a fix for the message's Unicode output. Before this change, when using the Unicode output, the other suggestions message would get rendered outside of the main suggestion block, making it feel disconnected from what it was referring to. This change makes it so that the message is on the last line of the block, aligning its rendering with other secondary messages, and making it clear what the message is referring to. Before: ``` error[E0433]: failed to resolve: use of undeclared type `IntoIter` ╭▸ $DIR/issue-82956.rs:28:24 │ LL │ let mut iter = IntoIter::new(self); │ ━━━━━━━━ use of undeclared type `IntoIter` ╰╴ help: consider importing one of these structs ╭╴ LL + use std::array::IntoIter; ├╴ LL + use std::collections::binary_heap::IntoIter; ├╴ LL + use std::collections::btree_map::IntoIter; ├╴ LL + use std::collections::btree_set::IntoIter; ╰╴ and 9 other candidates ``` After: ``` error[E0433]: failed to resolve: use of undeclared type `IntoIter` ╭▸ $DIR/issue-82956.rs:28:24 │ LL │ let mut iter = IntoIter::new(self); │ ━━━━━━━━ use of undeclared type `IntoIter` ╰╴ help: consider importing one of these structs ╭╴ LL + use std::array::IntoIter; ├╴ LL + use std::collections::binary_heap::IntoIter; ├╴ LL + use std::collections::btree_map::IntoIter; ├╴ LL + use std::collections::btree_set::IntoIter; │ ╰ and 9 other candidates ``` 2025-07-10T17:23:29+00:00 Esteban Küber esteban@kuber.com.ar 2025-07-10T17:21:59+00:00 urn:sha1:0674eca2f0c4ac45b7cf1a66fd4df44dfc603e7e 2025-07-10T14:00:20+00:00 Scott Schafer schaferjscott@gmail.com 2025-07-02T01:09:45+00:00 urn:sha1:d67bf6095a9a3f278a223a20b316c235360c1c90 2025-07-10T01:25:56+00:00 yukang moorekang@gmail.com 2025-06-29T03:40:59+00:00 urn:sha1:93db9e7ee01d61cb97b4f7b3d61903477910cae2 2025-07-07T20:30:53+00:00 bors bors@rust-lang.org 2025-07-07T20:30:53+00:00 urn:sha1:a2d45f73c70d9dec57140c9412f83586eda895f8 Rollup of 9 pull requests Successful merges: - rust-lang/rust#132469 (Do not suggest borrow that is already there in fully-qualified call) - rust-lang/rust#143340 (awhile -> a while where appropriate) - rust-lang/rust#143438 (Fix the link in `rustdoc.md`) - rust-lang/rust#143539 (Regression tests for repr ICEs) - rust-lang/rust#143566 (Fix `x86_64-unknown-netbsd` platform support page) - rust-lang/rust#143572 (Remove unused allow attrs) - rust-lang/rust#143583 (`loop_match`: fix 'no terminator on block') - rust-lang/rust#143584 (make `Machine::load_mir` infallible) - rust-lang/rust#143591 (Fix missing words in future tracking issue) r? `@ghost` `@rustbot` modify labels: rollup 2025-07-07T12:58:16+00:00 Yotam Ofek yotamofek@microsoft.com 2025-06-28T23:40:02+00:00 urn:sha1:3b48407f93abd565b24d138cc7df56ee37855d82 2025-07-07T07:04:53+00:00 Edoardo Marangoni edoardo.marangoni@scisemi.com 2025-06-29T10:11:51+00:00 urn:sha1:93f1201c0616672d71e640a0ad600d029448c40a 2025-07-04T14:22:37+00:00 Matthias Krüger 476013+matthiaskrgr@users.noreply.github.com 2025-07-04T14:22:37+00:00 urn:sha1:8e4cca85b51e951bfa0e9f9be8a99adfcceb067f bump termize dep Bumps termize to drop one more winapi dep. Only change is really moving from winapi: https://github.com/JohnTitor/termize/releases/tag/v0.2.0 Clippy depends on termize 0.1.1, https://github.com/rust-lang/rust-clippy/pull/15207 2025-07-04T14:22:35+00:00 Matthias Krüger 476013+matthiaskrgr@users.noreply.github.com 2025-07-04T14:22:35+00:00 urn:sha1:324aa5d4baebcd925a18f2dc784f8a0d90c6ec77 Make -Ztrack-diagnostics emit like a note [#t-compiler/diagnostics > Rendering -Ztrack-diagnostics like a note](https://rust-lang.zulipchat.com/#narrow/channel/147480-t-compiler.2Fdiagnostics/topic/Rendering.20-Ztrack-diagnostics.20like.20a.20note/with/526608647) As discussed on the Zulip thread above, I want to make `-Ztrack-diagnostics` emit like a `note`. This is because I find its current output jarring, and the fact that it gets rendered completely left-aligned, [even in the middle of a snippet](https://github.com/rust-lang/rust/blob/86e05cd300fac9e83e812c4d46582b48db780d8f/tests/ui/track-diagnostics/track6.stderr), seems like something that should be changed. Turning it into a `note` seems like the best choice, as it would align it with the rest of the output, and `note` is already used for somewhat similar things, like seeing why a lint was fired. --- Note: turning `-Ztrack-diagnostics` into a `note` will also make `annotate-snippets` API a bit cleaner