Skip to content

Rollup of 8 pull requests #134458

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 31 commits into from
Closed

Rollup of 8 pull requests #134458

Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
7eb0d84
refactor: replace &PathBuf with &Path to enhance generality
Integral-Tech Dec 17, 2024
a676872
Clarify the match ergonomics 2024 migration lint's output
dianne Dec 16, 2024
70b8527
Correctly check the edition of subpatterns in the pattern migration 2…
dianne Dec 17, 2024
77e9051
Improve the pattern migration 2024 migration lint's message
dianne Dec 17, 2024
28c6d0b
Add the edition guide link from the match 2024 migration lint to the …
dianne Dec 17, 2024
0bf6e82
Change the lookahead in `MacroParser::new`.
nnethercote Dec 11, 2024
3575e79
Simplify `RefTokenTreeCursor::look_ahead`.
nnethercote Dec 11, 2024
809975c
Rename `RefTokenTreeCursor`.
nnethercote Dec 11, 2024
c82d586
Remove `Peekable<TokenStreamIter>` uses.
nnethercote Dec 11, 2024
fd83954
Factor out repeated code from `eat_dollar`.
nnethercote Dec 11, 2024
39305bf
Fix `x build --stage 1 std` when using cg_cranelift as the default ba…
jyn514 Dec 17, 2024
2903356
Overhaul `TokenTreeCursor`.
nnethercote Dec 10, 2024
4977640
Fix const conditions for RPITITs
compiler-errors Dec 5, 2024
8a85bdc
Remove a comment that shouldn't have been committed.
nnethercote Dec 18, 2024
20bff63
fix(LazyCell): documentation of get[_mut] was wrong
jalil-salame Dec 18, 2024
64abe8b
Simplify `AllKeywords`.
nnethercote Dec 13, 2024
1564318
Only have one source of truth for keywords.
nnethercote Dec 13, 2024
ed5b91a
Move `gen` in the keyword list.
nnethercote Dec 13, 2024
6de550c
Improve comments on `Keywords`.
nnethercote Dec 17, 2024
21de42b
Variants::Single: do not use invalid VariantIdx for uninhabited enums
RalfJung Dec 1, 2024
e023590
make no-variant types a dedicated Variants variant
RalfJung Dec 1, 2024
85f0138
add comment explaining why ty_and_layout_field is not used
RalfJung Dec 2, 2024
397ae3c
fix outdated comment
RalfJung Dec 7, 2024
d97ab9d
Rollup merge of #133702 - RalfJung:single-variant, r=oli-obk
jieyouxu Dec 18, 2024
df5e242
Rollup merge of #133926 - compiler-errors:const-conditions, r=lcnr
jieyouxu Dec 18, 2024
78e269b
Rollup merge of #134161 - nnethercote:overhaul-token-cursors, r=spast…
jieyouxu Dec 18, 2024
e552264
Rollup merge of #134253 - nnethercote:overhaul-keywords, r=petrochenkov
jieyouxu Dec 18, 2024
e7b22a1
Rollup merge of #134394 - dianne:clarify-pat-2024-migration, r=compil…
jieyouxu Dec 18, 2024
94c399e
Rollup merge of #134420 - Integral-Tech:pathbuf-refactor, r=compiler-…
jieyouxu Dec 18, 2024
332a0b4
Rollup merge of #134444 - jyn514:cranelift-std, r=bjorn3
jieyouxu Dec 18, 2024
855f5c6
Rollup merge of #134452 - jalil-salame:fix-lazy-cell-docs, r=tgross35
jieyouxu Dec 18, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Factor out repeated code from eat_dollar.
  • Loading branch information
@nnethercote
nnethercote committed Dec 17, 2024
commit fd83954d66411d0ecc0cdac9e78923c01749eb0f
3 changes: 1 addition & 2 deletions compiler/rustc_expand/src/mbe/metavar_expr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,8 +275,7 @@ fn eat_dollar<'psess>(
psess: &'psess ParseSess,
span: Span,
) -> PResult<'psess, ()> {
if let Some(TokenTree::Token(Token { kind: token::Dollar, .. }, _)) = iter.peek() {
let _ = iter.next();
if try_eat_dollar(iter) {
return Ok(());
}
Err(psess.dcx().struct_span_err(
Expand Down