Nicholas Nethercote
4c4a40f6df
Reorder ast::ItemKind::{Struct,Enum,Union} fields.
...
So they match the order of the parts in the source code, e.g.:
```
struct Foo<T, U> { t: T, u: U }
<-><----> <------------>
/ | \
ident generics variant_data
```
2025-05-28 15:48:45 +10:00
yukang
adcd0bf5c3
Fix ICE in tokenstream with contracts from parser recovery
2025-05-28 09:35:10 +08:00
Matthew Jasper
65bdb31a97
Report text_direction_codepoint_in_literal when parsing
...
- The lint is now reported in code that gets removed/modified/duplicated
by macro expansion.
- Spans are more accurate
- Fixes #140281
2025-05-27 15:57:41 +00:00
Folkert de Vries
c7c0194d98
move asm parsing code into rustc_parse
2025-05-27 09:44:10 +02:00
Nicholas Nethercote
991c91fdaa
Reduce P<T> to a typedef of Box<T>.
...
Keep the `P` constructor function for now, to minimize immediate churn.
All the `into_inner` calls are removed, which is nice.
2025-05-27 13:29:24 +10:00
Nicholas Nethercote
0f285e346f
Remove the one use of P<[T]>.
...
A `Vec` is fine, the additional word (vector vs. boxed slice) doesn't
matter here.
2025-05-27 02:54:18 +10:00
yukang
d3347bb32b
remove eq_unspanned from TokenStream
2025-05-26 17:02:51 +08:00
yukang
5f8954bc41
Fix the issue of typo of comma in arm parsing
2025-05-16 12:40:04 +02:00
Matthias Krüger
e53b9f8fdd
Rollup merge of #141003 - clubby789:ternary-improve, r=compiler-errors
...
Improve ternary operator recovery
This
- Improves the span of the error to not point at the next token
- Where possible, we use the span of the condition to further improve the span of the error to include the cond, and suggest a maybe-incorrect fix
Currently this works on free expressions, not let statements; some more refactoring would be needed to pass the span down, which I'm not sure is worth doing.
### Old
### New
2025-05-16 07:19:41 +02:00
Jamie
1267333ef1
Improve ternary operator recovery
2025-05-14 13:32:59 +01:00
Pietro Albini
2ce08ca5d6
update cfg(bootstrap)
2025-05-12 15:33:37 +02:00
Nicholas Nethercote
0984db553d
Remove Ident::empty.
...
All uses have been removed. And it's nonsensical: an identifier by
definition has at least one char.
The commits adds an is-non-empty assertion to `Ident::new` to enforce
this, and converts some `Ident` constructions to use `Ident::new`.
Adding the assertion requires making `Ident::new` and
`Ident::with_dummy_span` non-const, which is no great loss.
The commit amends a couple of places that do path splitting to ensure no
empty identifiers are created.
2025-05-09 13:57:49 +10:00
Guillaume Gomez
32325e1dec
Rollup merge of #140671 - xizheyin:issue-140169, r=petrochenkov
...
Parser: Recover error from named params while parse_path
Fixes #140169
I added test to the first commit and the second added the code and changes to test.
r? `@petrochenkov`
2025-05-07 18:19:06 +02:00
xizheyin
b922da3586
Use parse_param_general when parsing (T, U)->R in parse_path_segment
...
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
Co-authored-by: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
2025-05-07 22:56:14 +08:00
Stuart Cook
627873a078
Rollup merge of #140035 - fee1-dead-contrib:push-oszwkkvmpkks, r=jieyouxu,wesleywiser
...
Implement RFC 3503: frontmatters
Tracking issue: #136889
Supercedes #137193 . This implements [RFC 3503](https://github.com/rust-lang/rfcs/blob/master/text/3503-frontmatter.md ).
This might break rust-analyzer. Will look into how to fix that.
Suggestions welcome for how to improve diagnostics.
2025-05-06 16:28:39 +10:00
Deadbeef
662182637e
Implement RFC 3503: frontmatters
...
Supercedes #137193
2025-05-05 23:10:08 +08:00
Jieyou Xu
eb3a8e5b81
Make attribute safety validation logic more obvious
2025-05-04 21:44:50 +08:00
Urgau
f4e1ec111c
Report the unsafe_attr_outside_unsafe lint at the closest node
2025-05-03 16:10:25 +02:00
Matthias Krüger
a477172ced
Rollup merge of #140494 - ehuss:document-restrictions, r=traviscross,SparrowLii
...
Parser: Document restrictions
I had trouble easily understanding what these various flags do. This is my attempt to try to explain what these do.
2025-04-30 22:36:44 +02:00
Vadim Petrochenkov
6668d13de2
ast: Remove token visiting from AST visitor
...
It's no longer necessary after the removal of nonterminal tokens in #124141 .
2025-04-30 10:36:03 +03:00
Eric Huss
2b92f9fb98
Parser: Document restrictions
...
I had trouble easily understanding what these various flags do. This is
my attempt to try to explain what these do.
2025-04-29 18:05:45 -07:00
Nicholas Nethercote
880e6f716d
Use ThinVec to shrink LazyAttrTokenStreamInner.
2025-04-30 07:12:09 +10:00
Nicholas Nethercote
298c56f4ba
Simplify LazyAttrTokenStream.
...
This commit does the following.
- Changes it from `Lrc<Box<dyn ToAttrTokenStream>>` to
`Lrc<LazyAttrTokenStreamInner>`.
- Reworks `LazyAttrTokenStreamImpl` as `LazyAttrTokenStreamInner`, which
is a two-variant enum.
- Removes the `ToAttrTokenStream` trait and the two impls of it.
The recursion limit must be increased in some crates otherwise rustdoc
aborts.
2025-04-30 07:10:56 +10:00
Nicholas Nethercote
28236ab703
Move various token stream things from rustc_parse to rustc_ast.
...
Specifically: `TokenCursor`, `TokenTreeCursor`,
`LazyAttrTokenStreamImpl`, `FlatToken`, `make_attr_token_stream`,
`ParserRange`, `NodeRange`. `ParserReplacement`, and `NodeReplacement`.
These are all related to token streams, rather than actual parsing.
This will facilitate the simplifications in the next commit.
2025-04-29 12:14:27 +10:00
Matthias Krüger
6f6fa0f23a
Rollup merge of #140272 - Kivooeo:new-fix-four, r=est31
...
Improve error message for `||` (or) in let chains
**Description**
This PR improves the error message when using `||` in an if let chain expression, addressing #140263 .
**Changes**
1. Creates a dedicated error message specifically for `||` usage in let chains
2. Points the primary span directly at the `||` operator
3. Removes confusing secondary notes about "let statements" and unsupported contexts
5. Adds UI tests verifying the new error message and valid cases
**Before**
```rust
error: expected expression, found let statement
--> src/main.rs:2:8
|
2 | if let true = true || false {}
| ^^^^^^^^^^^^^^^
|
= note: only supported directly in conditions of if and while expressions
note: || operators are not supported in let chain expressions
--> src/main.rs:2:24
|
2 | if let true = true || false {}
|
```
**After**
```rust
error: `||` operators are not supported in let chain conditions
--> src/main.rs:2:24
|
2 | if let true = true || false {}
| ^^
```
**Implementation details**
1. Added new `OrInLetChain` diagnostic in errors.rs
2. Modified `CondChecker` in expr.rs to prioritize the `||` error
3. Updated fluent message definitions to use clearer wording
**Related issue**
Fixes #140263
cc ```@ehuss``` (issue author)
2025-04-26 07:13:08 +02:00
Kivooeo
f072d30741
resolved conflict
2025-04-25 17:02:59 +05:00
Matthias Krüger
564e5ccb5c
Rollup merge of #140202 - est31:let_chains_feature_compiler, r=lcnr
...
Make #![feature(let_chains)] bootstrap conditional in compiler/
Let chains have been stabilized recently in #132833 , so we can remove the gating from our uses in the compiler (as the compiler uses edition 2024).
2025-04-25 07:50:25 +02:00
Matthias Krüger
f45d2bd8ee
Rollup merge of #140228 - fmease:revert-overzealous-colon-recovery, r=jieyouxu
...
Revert overzealous parse recovery for single colons in paths
Basically manually reverts #136808 , cc ``@chenyukang`` ``@estebank.``
Reopens #129273 .
Fixes [after beta backport] #140227 .
2025-04-24 11:40:47 +02:00
León Orell Valerian Liehr
16da97be2f
Revert overzealous parse recovery for single colons
2025-04-24 02:57:10 +02:00
bors
553600e0f5
Auto merge of #140180 - ChrisDenton:rollup-5pvs08u, r=ChrisDenton
...
Rollup of 7 pull requests
Successful merges:
- #140142 (Some more graphviz tweaks)
- #140146 (Update `compiler_builtins` to 0.1.156)
- #140147 (Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.)
- #140160 (Use `is_lang_item` and `as_lang_item` instead of handrolling their logic)
- #140163 (Validate extension in `PathBuf::add_extension`)
- #140173 (Ping Mara when touching format_args!() internals.)
- #140175 (`rc""` more clear error message)
r? `@ghost`
`@rustbot` modify labels: rollup
2025-04-23 15:12:33 +00:00
est31
7493e1cdf6
Make #![feature(let_chains)] bootstrap conditional in compiler/
2025-04-23 16:40:30 +02:00
Chris Denton
ecb9775438
Rollup merge of #140175 - Kivooeo:new-fix-one, r=compiler-errors
...
`rc""` more clear error message
here is small fix that provides better error message when user is trying to use `rc""` the same way it was made for `rb""`
example of it's work
```rust
|
2 | rc"\n";
| ^^ unknown prefix
|
= note: prefixed identifiers and literals are reserved since Rust 2021
help: use `cr` for a raw C-string
|
2 - rc"\n";
2 + cr"\n";
|
```
**related issue**
fixes #140170
cc `@cyrgani` (issue author)
2025-04-23 00:43:08 +00:00
Chris Denton
090f6a9629
Rollup merge of #140147 - xizheyin:issue-138401-1, r=compiler-errors
...
Clean: rename `open_braces` to `open_delimiters` in lexer and move `make_unclosed_delims_error` into `diagnostics.rs`.
Clean code prepared for resolving #138401 . To avoid having too many extraneous changes in one PR, I cleaned up some of the naming and method placement in lexer in this PR.
1. For the make_unclosed_delims_error function defined in mod.rs is only used in lexer, so moved into lexer, which enhances encapsulation.
2. For open_braces in TokenTreeDiagInfo the naming is not canonical, as Brace refers to `{...} ` and this variable can store all kinds of different Delimiters. so I named it open_delimiters.
r? `@chenyukang`
2025-04-23 00:43:06 +00:00
Kivooeo
44b19e5fe7
rc and cr more clear error message
2025-04-23 03:15:43 +05:00
Chris Denton
15f8847a25
Rollup merge of #140144 - nnethercote:fix-140098, r=petrochenkov
...
Handle another negated literal in `eat_token_lit`.
Extends the change from #139653 , which was on expressions, to literals.
Fixes #140098 .
r? ``@petrochenkov``
2025-04-22 15:24:08 +00:00
bors
8bf5a8d12f
Auto merge of #132833 - est31:stabilize_let_chains, r=fee1-dead
...
Stabilize let chains in the 2024 edition
# Stabilization report
This proposes the stabilization of `let_chains` ([tracking issue], [RFC 2497]) in the [2024 edition] of Rust.
[tracking issue]: https://github.com/rust-lang/rust/issues/53667
[RFC 2497]: https://github.com/rust-lang/rfcs/pull/2497
[2024 edition]: https://doc.rust-lang.org/nightly/edition-guide/rust-2024/index.html
## What is being stabilized
The ability to `&&`-chain `let` statements inside `if` and `while` is being stabilized, allowing intermixture with boolean expressions. The patterns inside the `let` sub-expressions can be irrefutable or refutable.
```Rust
struct FnCall<'a> {
fn_name: &'a str,
args: Vec<i32>,
}
fn is_legal_ident(s: &str) -> bool {
s.chars()
.all(|c| ('a'..='z').contains(&c) || ('A'..='Z').contains(&c))
}
impl<'a> FnCall<'a> {
fn parse(s: &'a str) -> Option<Self> {
if let Some((fn_name, after_name)) = s.split_once("(")
&& !fn_name.is_empty()
&& is_legal_ident(fn_name)
&& let Some((args_str, "")) = after_name.rsplit_once(")")
{
let args = args_str
.split(',')
.map(|arg| arg.parse())
.collect::<Result<Vec<_>, _>>();
args.ok().map(|args| FnCall { fn_name, args })
} else {
None
}
}
fn exec(&self) -> Option<i32> {
let iter = self.args.iter().copied();
match self.fn_name {
"sum" => Some(iter.sum()),
"max" => iter.max(),
"min" => iter.min(),
_ => None,
}
}
}
fn main() {
println!("{:?}", FnCall::parse("sum(1,2,3)").unwrap().exec());
println!("{:?}", FnCall::parse("max(4,5)").unwrap().exec());
}
```
The feature will only be stabilized for the 2024 edition and future editions. Users of past editions will get an error with a hint to update the edition.
closes #53667
## Why 2024 edition?
Rust generally tries to ship new features to all editions. So even the oldest editions receive the newest features. However, sometimes a feature requires a breaking change so much that offering the feature without the breaking change makes no sense. This occurs rarely, but has happened in the 2018 edition already with `async` and `await` syntax. It required an edition boundary in order for `async`/`await` to become keywords, and the entire feature foots on those keywords.
In the instance of let chains, the issue is the drop order of `if let` chains. If we want `if let` chains to be compatible with `if let`, drop order makes it hard for us to [generate correct MIR]. It would be strange to have different behaviour for `if let ... {}` and `if true && let ... {}`. So it's better to [stay consistent with `if let`].
In edition 2024, [drop order changes] have been introduced to make `if let` temporaries be lived more shortly. These changes also affected `if let` chains. These changes make sense even if you don't take the `if let` chains MIR generation problem into account. But if we want to use them as the solution to the MIR generation problem, we need to restrict let chains to edition 2024 and beyond: for let chains, it's not just a change towards more sensible behaviour, but one required for correct function.
[generate correct MIR]: https://github.com/rust-lang/rust/issues/104843
[stay consistent with `if let`]: https://github.com/rust-lang/rust/pull/103293#issuecomment-1293408574
[drop order changes]: https://github.com/rust-lang/rust/issues/124085
## Introduction considerations
As edition 2024 is very new, this stabilization PR only makes it possible to use let chains on 2024 without that feature gate, it doesn't mark that feature gate as stable/removed. I would propose to continue offering the `let_chains` feature (behind a feature gate) for a limited time (maybe 3 months after stabilization?) on older editions to allow nightly users to adopt edition 2024 at their own pace. After that, the feature gate shall be marked as *stabilized*, not removed, and replaced by an error on editions 2021 and below.
## Implementation history
* History from before March 14, 2022 can be found in the [original stabilization PR] that was reverted.
* https://github.com/rust-lang/rust/pull/94927
* https://github.com/rust-lang/rust/pull/94951
* https://github.com/rust-lang/rust/pull/94974
* https://github.com/rust-lang/rust/pull/95008
* https://github.com/rust-lang/rust/pull/97295
* https://github.com/rust-lang/rust/pull/98633
* https://github.com/rust-lang/rust/pull/99731
* https://github.com/rust-lang/rust/pull/102394
* https://github.com/rust-lang/rust/pull/100526
* https://github.com/rust-lang/rust/pull/100538
* https://github.com/rust-lang/rust/pull/102998
* https://github.com/rust-lang/rust/pull/103405
* https://github.com/rust-lang/rust/pull/103293
* https://github.com/rust-lang/rust/pull/107251
* https://github.com/rust-lang/rust/pull/110568
* https://github.com/rust-lang/rust/pull/115677
* https://github.com/rust-lang/rust/pull/117743
* https://github.com/rust-lang/rust/pull/117770
* https://github.com/rust-lang/rust/pull/118191
* https://github.com/rust-lang/rust/pull/119554
* https://github.com/rust-lang/rust/pull/129394
* https://github.com/rust-lang/rust/pull/132828
* https://github.com/rust-lang/reference/pull/1179
* https://github.com/rust-lang/reference/pull/1251
* https://github.com/rust-lang/rustfmt/pull/5910
[original stabilization PR]: https://github.com/rust-lang/rust/pull/94927
## Adoption history
### In the compiler
* History before March 14, 2022 can be found in the [original stabilization PR].
* https://github.com/rust-lang/rust/pull/115983
* https://github.com/rust-lang/rust/pull/116549
* https://github.com/rust-lang/rust/pull/116688
### Outside of the compiler
* https://github.com/rust-lang/rust-clippy/pull/11750
* [rspack](https://github.com/web-infra-dev/rspack )
* [risingwave](https://github.com/risingwavelabs/risingwave )
* [dylint](https://github.com/trailofbits/dylint )
* [convex-backend](https://github.com/get-convex/convex-backend )
* [tikv](https://github.com/tikv/tikv )
* [Daft](https://github.com/Eventual-Inc/Daft )
* [greptimedb](https://github.com/GreptimeTeam/greptimedb )
## Tests
<details>
### Intentional restrictions
[`partially-macro-expanded.rs`](4adafcf40a/tests/ui/rfcs/rfc-2294-if-let-guard/partially-macro-expanded.rs4adafcf40a/tests/ui/rfcs/rfc-2294-if-let-guard/macro-expanded.rs4adafcf40a/tests/ui/rfcs/rfc-2294-if-let-guard/parens.rs4adafcf40a/tests/ui/rfcs/rfc-2497-if-let-chains/ensure-that-let-else-does-not-interact-with-let-chains.rs4adafcf40a/tests/ui/rfcs/rfc-2294-if-let-guard/move-guard-if-let-chain.rs4adafcf40a/tests/ui/rfcs/rfc-2294-if-let-guard/shadowing.rs4adafcf40a/tests/ui/rfcs/rfc-2497-if-let-chains/ast-validate-guards.rs#88642 has added some tests with very simple usages of `let else`, mostly as regression tests to early bugs.
[`then-else-blocks.rs`](4adafcf40a/tests/ui/rfcs/rfc-2497-if-let-chains/then-else-blocks.rs4adafcf40a/tests/ui/rfcs/rfc-2497-if-let-chains/ast-lowering-does-not-wrap-let-chains.rs4adafcf40a/tests/ui/rfcs/rfc-2497-if-let-chains/issue-90722.rs4adafcf40a/tests/ui/rfcs/rfc-2497-if-let-chains/issue-92145.rs4adafcf40a/tests/ui/drop/issue-100276.rs4adafcf40a/tests/ui/drop/drop_order.rs4adafcf40a/tests/ui/rfcs/rfc-2294-if-let-guard/scope.rs4adafcf40a/tests/ui/rfcs/rfc-2294-if-let-guard/drop-scope.rs4adafcf40a/tests/ui/drop/drop_order_if_let_rescope.rs4adafcf40a/tests/ui/mir/mir_let_chains_drop_order.rs4adafcf40a/tests/ui/rfcs/rfc-2497-if-let-chains/issue-99938.rs4adafcf40a/tests/ui/mir/issue-99852.rs#102394
### Linting
[`irrefutable-lets.rs`](4adafcf40a/tests/ui/rfcs/rfc-2497-if-let-chains/irrefutable-lets.rs4adafcf40a/tests/ui/lint/issue-121070-let-range.rs2128d8df0e/tests/ui/rfcs/rfc-2497-if-let-chains/disallowed-positions.rs4adafcf40a/tests/ui/rfcs/rfc-2497-if-let-chains/invalid-let-in-a-valid-let-context.rs4adafcf40a/tests/ui/parser/issues/issue-103381.rs4adafcf40a/tests/ui/parser/semi-in-let-chain.rs4adafcf40a/tests/ui/parser/deli-ident-issue-1.rs4adafcf40a/tests/ui/parser/brace-in-let-chain.rs4adafcf40a/tests/ui/pattern/usefulness/conflicting_bindings.rs4adafcf40a/tests/ui/expr/if/attrs/let-chains-attr.rs4adafcf40a/tests/coverage/branch/if-let.rs4adafcf40a/tests/mir-opt/building/logical_or_in_conditional.rs4adafcf40a/tests/ui/macros/stringify.rs4adafcf40a/tests/ui/unpretty/expanded-interpolation.rs4adafcf40a/tests/ui/unpretty/expanded-exhaustive.rs4adafcf40a/tests/ui/rfcs/rfc-0000-never_patterns/diverges-not.rshttps://github.com/rust-lang/lang-team/issues/297
* One could have similar chaining inside `let ... else` statements. There is no proposed RFC for this however, nor is it implemented on nightly.
* Match guards have the `if` keyword as well, but on stable Rust, they don't support `let`. The functionality is available via an unstable feature ([`if_let_guard` tracking issue]). Stabilization of let chains affects this feature in so far as match guards containing let chains now only need the `if_let_guard` feature gate be present instead of also the `let_chains` feature (NOTE: this PR doesn't implement this simplification, it's left for future work).
[RFC 3573]: https://github.com/rust-lang/rfcs/pull/3573
[`if_let_guard` tracking issue]: https://github.com/rust-lang/rust/issues/51114
## Open questions / blockers
- [ ] bad recovery if you don't put a `let` (I don't think this is a blocker): [#117977 ](https://github.com/rust-lang/rust/issues/117977 )
- [x] An instance where a temporary lives shorter than with nested ifs, breaking compilation: [#103476 ](https://github.com/rust-lang/rust/issues/103476 ). Personally I don't think this is a blocker either, as it's an edge case. Edit: turns out to not reproduce in edition 2025 any more, due to let rescoping. regression test added in #133093
- [x] One should probably extend the tests for `move-guard-if-let-chain.rs` and `conflicting_bindings.rs` to have chains with multiple let's: done in 133093
- [x] Parsing rejection tests: addressed by https://github.com/rust-lang/rust/pull/132828
- [x] [Style](https://rust-lang.zulipchat.com/#narrow/channel/346005-t-style/topic/let.20chains.20stabilization.20and.20formatting ): https://github.com/rust-lang/rust/pull/139456
- [x] https://github.com/rust-lang/rust/issues/86730 explicitly mentions `let_else`. I think we can live with `let pat = expr` not evaluating as `expr` for macro_rules macros, especially given that `let pat = expr` is not a legal expression anywhere except inside `if` and `while`.
- [x] Documentation in the reference: https://github.com/rust-lang/reference/pull/1740
- [x] Add chapter to the Rust 2024 [edition guide]: https://github.com/rust-lang/edition-guide/pull/337
- [x] Resolve open questions on desired drop order.
[original reference PR]: https://github.com/rust-lang/reference/pull/1179
[edition guide]: https://github.com/rust-lang/edition-guide
2025-04-22 07:54:10 +00:00
xizheyin
dce5d99ce8
Rename open_brace to open_delimiters
...
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
2025-04-22 14:37:26 +08:00
xizheyin
e827b17ddb
Move make_unclosed_delims_error to lexer/diagonostics.rs
...
Signed-off-by: xizheyin <xizheyin@smail.nju.edu.cn>
2025-04-22 14:37:26 +08:00
Nicholas Nethercote
6be270be0c
Handle another negated literal in eat_token_lit.
...
Extends the change from #139653 , which was on expressions, to literals.
Fixes #140098 .
2025-04-22 15:08:32 +10:00
bors
fae7785b60
Auto merge of #139897 - nnethercote:rm-OpenDelim-CloseDelim, r=petrochenkov
...
Remove `token::{Open,Close}Delim`
By replacing them with `{Open,Close}{Param,Brace,Bracket,Invisible}`.
PR #137902 made `ast::TokenKind` more like `lexer::TokenKind` by
replacing the compound `BinOp{,Eq}(BinOpToken)` variants with fieldless
variants `Plus`, `Minus`, `Star`, etc. This commit does a similar thing
with delimiters. It also makes `ast::TokenKind` more similar to
`parser::TokenType`.
This requires a few new methods:
- `TokenKind::is_{,open_,close_}delim()` replace various kinds of
pattern matches.
- `Delimiter::as_{open,close}_token_kind` are used to convert
`Delimiter` values to `TokenKind`.
Despite these additions, it's a net reduction in lines of code. This is
because e.g. `token::OpenParen` is so much shorter than
`token::OpenDelim(Delimiter::Parenthesis)` that many multi-line forms
reduce to single line forms. And many places where the number of lines
doesn't change are still easier to read, just because the names are
shorter, e.g.:
```
- } else if self.token != token::CloseDelim(Delimiter::Brace) {
+ } else if self.token != token::CloseBrace {
```
r? `@petrochenkov`
2025-04-22 01:15:06 +00:00
Nicholas Nethercote
bf8ce32558
Remove token::{Open,Close}Delim.
...
By replacing them with `{Open,Close}{Param,Brace,Bracket,Invisible}`.
PR #137902 made `ast::TokenKind` more like `lexer::TokenKind` by
replacing the compound `BinOp{,Eq}(BinOpToken)` variants with fieldless
variants `Plus`, `Minus`, `Star`, etc. This commit does a similar thing
with delimiters. It also makes `ast::TokenKind` more similar to
`parser::TokenType`.
This requires a few new methods:
- `TokenKind::is_{,open_,close_}delim()` replace various kinds of
pattern matches.
- `Delimiter::as_{open,close}_token_kind` are used to convert
`Delimiter` values to `TokenKind`.
Despite these additions, it's a net reduction in lines of code. This is
because e.g. `token::OpenParen` is so much shorter than
`token::OpenDelim(Delimiter::Parenthesis)` that many multi-line forms
reduce to single line forms. And many places where the number of lines
doesn't change are still easier to read, just because the names are
shorter, e.g.:
```
- } else if self.token != token::CloseDelim(Delimiter::Brace) {
+ } else if self.token != token::CloseBrace {
```
2025-04-21 07:35:56 +10:00
est31
5258cb76a5
Don't call ungate_last
2025-04-20 23:14:55 +02:00
bors
49e5e4e3a5
Auto merge of #140043 - ChrisDenton:rollup-vwf0s9j, r=ChrisDenton
...
Rollup of 8 pull requests
Successful merges:
- #138934 (support config extensions)
- #139091 (Rewrite on_unimplemented format string parser.)
- #139753 (Make `#[naked]` an unsafe attribute)
- #139762 (Don't assemble non-env/bound candidates if projection is rigid)
- #139834 (Don't canonicalize crate paths)
- #139868 (Move `pal::env` to `std::sys::env_consts`)
- #139978 (Add citool command for generating a test dashboard)
- #139995 (Clean UI tests 4 of n)
r? `@ghost`
`@rustbot` modify labels: rollup
2025-04-20 02:08:02 +00:00
Chris Denton
db98b72e34
Rollup merge of #137454 - mu001999-contrib:fix-137414, r=wesleywiser
...
not lint break with label and unsafe block
fixes #137414
we can't label unsafe blocks, so that we can do not lint them
2025-04-19 14:01:36 +00:00
Folkert de Vries
41ddf86722
Make #[naked] an unsafe attribute
2025-04-19 00:03:35 +02:00
est31
d75f8cde2f
Also allow let chains in match guards
2025-04-18 15:57:29 +02:00
est31
2e61af2fca
Stabilize let chains on edition 2024
2025-04-18 14:21:14 +02:00
bors
883f9f72e8
Auto merge of #139949 - matthiaskrgr:rollup-pxc5tsx, r=matthiaskrgr
...
Rollup of 8 pull requests
Successful merges:
- #138632 (Stabilize `cfg_boolean_literals`)
- #139416 (unstable book; document `macro_metavar_expr_concat`)
- #139782 (Consistent with treating Ctor Call as Struct in liveness analysis)
- #139885 (document RUSTC_BOOTSTRAP, RUSTC_OVERRIDE_VERSION_STRING, and -Z allow-features in the unstable book)
- #139904 (Explicitly annotate edition for `unpretty=expanded` and `unpretty=hir` tests)
- #139932 (transmutability: Refactor tests for simplicity)
- #139944 (Move eager translation to a method on Diag)
- #139948 (git: ignore `60600a6fa403216bfd66e04f948b1822f6450af7` for blame purposes)
r? `@ghost`
`@rustbot` modify labels: rollup
2025-04-17 11:21:54 +00:00
bors
15c4ccef03
Auto merge of #139940 - matthiaskrgr:rollup-rd4d3fn, r=matthiaskrgr
...
Rollup of 9 pull requests
Successful merges:
- #135340 (Add `explicit_extern_abis` Feature and Enforce Explicit ABIs)
- #139440 (rustc_target: RISC-V: feature addition batch 2)
- #139667 (cfi: Remove #[no_sanitize(cfi)] for extern weak functions)
- #139828 (Don't require rigid alias's trait to hold)
- #139854 (Improve parse errors for stray lifetimes in type position)
- #139889 (Clean UI tests 3 of n)
- #139894 (Fix `opt-dist` CLI flag and make it work without LLD)
- #139900 (stepping into impls for normalization is unproductive)
- #139915 (replace some #[rustc_intrinsic] usage with use of the libcore declarations)
r? `@ghost`
`@rustbot` modify labels: rollup
2025-04-17 04:52:34 +00:00
Jake Goulding
0117884917
Move eager translation to a method on Diag
...
This will allow us to eagerly translate messages on a top-level
diagnostic, such as a `LintDiagnostic`. As a bonus, we can remove the
awkward closure passed into Subdiagnostic and make better use of
`Into`.
2025-04-16 21:38:59 -04:00
