Uh oh!
There was an error while loading. Please reload this page.
Rollup of 6 pull requests - #144740
Merged
Merged
Conversation
The macro was uniformed between rustc_const_eval and miri
Otherwise the field would be named "message" by default
There are identical definitions in `rustc_type_ir` and `rustc_ast`. This commit removes them and places a single definition in `rustc_ast_ir`. This requires adding `rust_span` as a dependency of `rustc_ast_ir`, but means a bunch of silly conversion functions can be removed. The one annoying wrinkle is that the old version had differences in their `Debug` impls, e.g. one printed `u32` while the other printed `U32`. Some compiler error messages rely on the former (yuk), and some clippy output depends on the latter. So the commit also changes clippy to not rely on `Debug` and just implement what it needs itself.
- Add some missing `tidy-alphabetical-*` markers. - Remove some unnecessary blank lines.
…RalfJung Uniform `enter_trace_span!` and add documentation 1. The latest changes to `enter_trace_span!` were ported from Miri (see rust-lang/miri#4452 (comment)), so now both the `rustc_const_eval` and the Miri macro accept the same syntax. Furthermore, the Miri macro was changed to just call rustc_const_eval`'s, to avoid duplication. 2. I made the `layout_of` (& friends) calls use that new syntax, e.g. `enter_trace_span!(layouting::layout_of, ...)` 3. I made sure the macro specifies all types/traits/macros it refers to using `$crate::`, so the macro works anywhere independently of which types/traits/macros are imported in the context it is used in. 4. I added documentation, examples and tips to the macro's doc. To make the rustdoc compile I had to add some hidden lines (`#`), but now it acts as a compilation test which will avoid reintroducing issue 3. in the future. I will also create a documentation file with everything one needs to know about tracing at a later point, but I figured adding some of that info directly on the tracing macro makes it more discoverable. 5. In `stack.rs` I made it so that the `"frame"` span has a field named "frame" (instead of "message") with the data about the frame. This field used to be called "message" (tracing's default) since it was previously formatted using `"{}", instance`, and now I replaced it with `frame = %instance`.
…s-type, r=lcnr stall `ConstArgHasType` in `compute_goal_fast_path` I'm having major deja-vu about this; I thought that already implemented this but 🤷 maybe not.
…enkov Consider operator's span when computing binop expr span When computing the span of a binop consisting of `lhs` and `rhs`, we previously just took the spans of `lhs.span.to(rhs.span)`. In the case that both `lhs` and `rhs` are both arguments to a macro, this can produce a wildly incorrect span. To fix this, first compute the span between `lhs` and the binary operator, which will cause `lhs` to possibly be adjusted to a relevant macro metavar, and then compute that span extended to `rhs`, which will cause it to also be adjusted to a relevant macro metavar. This coincidentally fixes a FIXME in `tests/ui/lint/wide_pointer_comparisons.rs` and suppresses a nonsense suggestion.
Deduplicate `IntTy`/`UintTy`/`FloatTy`. There are identical definitions in `rustc_type_ir` and `rustc_ast`. This commit removes them and places a single definition in `rustc_ast_ir`. This requires adding `rust_span` as a dependency of `rustc_ast_ir`, but means a bunch of silly conversion functions can be removed. r? `@fmease`
…ures, r=lcnr merge rustc_attr_data_structures into rustc_hir this move was discussed on zulip: [#t-compiler > attribute parsing rework @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/131828-t-compiler/topic/attribute.20parsing.20rework/near/528530091) Many PRs in the attribute rework depend on this move.
…ompiler-errors fix: Match width of ascii and unicode secondary file start The current [unicode secondary file start](https://github.com/rust-lang/rust/blob/64ca23b6235732fa61c0a2b957c5d7e591e7c972/compiler/rustc_errors/src/emitter.rs#L2991) is only three characters, whereas the ASCII variant and normal [file start](https://github.com/rust-lang/rust/blob/64ca23b6235732fa61c0a2b957c5d7e591e7c972/compiler/rustc_errors/src/emitter.rs#L2983-L2984) are four characters. This slight difference caused the paths following a Unicode secondary file start to not align with other structured elements.
jdonszelmann
commented
Jul 31, 2025
ContributorAuthor
@bors r+ rollup=never p=5 |
bors
commented
Jul 31, 2025
Collaborator
bors
commented
Jul 31, 2025
Collaborator
bors
commented
Jul 31, 2025
Collaborator
☀️ Test successful - checks-actions |
rust-timer
commented
Jul 31, 2025
Collaborator
📌 Perf builds for each rolled up PR:
previous master: 3fb1b53a9d In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
Contributor
What is this?This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.Comparing 3fb1b53 (parent) -> adcb3d3 (this PR) Test differencesShow 35 test diffs35 doctest diffs were found. These are ignored, as they are noisy. Test dashboardRun cargo run --manifest-path src/ci/citool/Cargo.toml -- \
test-dashboard adcb3d3b4cd3b7c4cde642f3ed537037f293738e --output-dir test-dashboardAnd then open Job duration changes
How to interpret the job duration changes?Job durations can vary a lot, based on the actual runner instance |
This was referenced Jul 31, 2025
rust-timer
commented
Jul 31, 2025
Collaborator
Finished benchmarking commit (adcb3d3): comparison URL. Overall result: ❌ regressions - no action needed@rustbot label: -perf-regression Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)Results (primary -4.2%)A less reliable metric. May be of interest, but not used to determine the overall result above.
CyclesResults (secondary 2.8%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeResults (secondary 0.0%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Bootstrap: 467.851s -> 468.61s (0.16%) |
makai410 pushed a commit
to makai410/rust
that referenced
this pull request
Nov 10, 2025
…zelmann Rollup of 6 pull requests Successful merges: - rust-lang#144688 (Uniform `enter_trace_span!` and add documentation) - rust-lang#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`) - rust-lang#144711 (Consider operator's span when computing binop expr span) - rust-lang#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.) - rust-lang#144726 (merge rustc_attr_data_structures into rustc_hir) - rust-lang#144733 (fix: Match width of ascii and unicode secondary file start) r? `@ghost` `@rustbot` modify labels: rollup
makai410 pushed a commit
to makai410/rust
that referenced
this pull request
Aug 31, 2026
…zelmann Rollup of 6 pull requests Successful merges: - rust-lang#144688 (Uniform `enter_trace_span!` and add documentation) - rust-lang#144702 (stall `ConstArgHasType` in `compute_goal_fast_path`) - rust-lang#144711 (Consider operator's span when computing binop expr span) - rust-lang#144712 (Deduplicate `IntTy`/`UintTy`/`FloatTy`.) - rust-lang#144726 (merge rustc_attr_data_structures into rustc_hir) - rust-lang#144733 (fix: Match width of ascii and unicode secondary file start) r? `@ghost` `@rustbot` modify labels: rollup
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Successful merges:
enter_trace_span!and add documentation #144688 (Uniformenter_trace_span!and add documentation)ConstArgHasTypeincompute_goal_fast_path#144702 (stallConstArgHasTypeincompute_goal_fast_path)IntTy/UintTy/FloatTy. #144712 (DeduplicateIntTy/UintTy/FloatTy.)r? @ghost
@rustbot modify labels: rollup
Create a similar rollup