Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-07 01:05:39 +03:00
Code Issues Packages Projects Releases Wiki Activity
262,500 Commits 10 Branches 157 Tags
dee57ce043ffedd51ade01195829cead783a1a7e
Commit Graph

2016 Commits

Author SHA1 Message Date
Matthias Krüger dee57ce043 Rollup merge of #128483 - nnethercote:still-more-cfg-cleanups, r=petrochenkov 
Still more `cfg` cleanups

Found while looking closely at `cfg`/`cfg_attr` processing code.

r? `````````@petrochenkov`````````
 2024-08-03 11:17:44 +02:00
Matthias Krüger 29cd3103a1 Rollup merge of #128496 - clubby789:box-syntax-multipart, r=compiler-errors 
Fix removed `box_syntax` diagnostic if source isn't available

Fix #128442
 2024-08-01 18:43:41 +02:00
clubby789 e157954cce Fix removed box_syntax diagnostic if source isn't available 2024-08-01 13:11:24 +00:00
bors c0e32983f5 Auto merge of #127543 - carbotaniuman:more_unsafe_attr_verification, r=estebank,traviscross 
More unsafe attr verification

This code denies unsafe on attributes such as `#[test]` and `#[ignore]`, while also changing the `MetaItem` parsing so `unsafe` in args like `#[allow(unsafe(dead_code))]` is not accidentally allowed.

Tracking:

- https://github.com/rust-lang/rust/issues/123757
 2024-08-01 10:40:45 +00:00
Nicholas Nethercote d1f05fd184 Distinguish the two kinds of token range. 
When collecting tokens there are two kinds of range:
- a range relative to the parser's full token stream (which we get when
  we are parsing);
- a range relative to a single AST node's token stream (which we use
  within `LazyAttrTokenStreamImpl` when replacing tokens).

These are currently both represented with `Range<u32>` and it's easy to
mix them up -- until now I hadn't properly understood the difference.

This commit introduces `ParserRange` and `NodeRange` to distinguish
them. This also requires splitting `ReplaceRange` in two, giving the new
types `ParserReplacement` and `NodeReplacement`. (These latter two names
reduce the overloading of the word "range".)

The commit also rewrites some comments to be clearer.

The end result is a little more verbose, but much clearer.
 2024-08-01 19:30:40 +10:00
Nicholas Nethercote 9d77d17f71 Move a comment to a better spot. 2024-08-01 19:30:39 +10:00
Nicholas Nethercote 2eb2ef1684 Streamline attribute stitching on AST nodes. 
It can be done more concisely.
 2024-08-01 19:30:32 +10:00
Matthias Krüger 3acd910036 Rollup merge of #126697 - vincenzopalazzo:macros/find_the_expression_tok, r=eholk,compiler-errors 
[RFC] mbe: consider the `_` in 2024 an expression

This commit is adding the possibility to parse the `_` as an expression inside the esition 2024.

Link: https://rust-lang.zulipchat.com/#narrow/stream/404510-wg-macros/topic/supporting.20.60_.60.20expressions

Issue https://github.com/rust-lang/rust/issues/123742

r? `@eholk`
 2024-07-31 23:20:09 +02:00
Michael Goulet 79ef91e879 tweak comment on NonterminalKind::Expr 
Co-authored-by: Eric Holk <eric@theincredibleholk.org>
 2024-07-31 15:37:55 -04:00
Vincenzo Palazzo 276fa19c0a rustc_parser: consider the in 2024 an expression 
This commit is adding the possibility to parse the `_` as
an expression inside the esition 2024.

Link: https://rust-lang.zulipchat.com/#narrow/stream/404510-wg-macros/topic/supporting.20.60_.60.20expressions
Co-authored-by: Eric Holk <eric@theincredibleholk.org>
Signed-off-by: Vincenzo Palazzo <vincenzopalazzodev@gmail.com>
 2024-07-31 18:34:22 +00:00
Nicholas Nethercote fe647f0538 Remove LhsExpr. 
`parse_expr_assoc_with` has an awkward structure -- sometimes the lhs is
already parsed. This commit splits the post-lhs part into a new method
`parse_expr_assoc_rest_with`, which makes everything shorter and
simpler.
 2024-07-31 12:56:25 +10:00
Nicholas Nethercote 281c2fd5bf Inline and remove parse_local_mk. 
It has a single use. This makes the `let` handling case in
`parse_stmt_without_recovery` more similar to the statement path and
statement expression cases.
 2024-07-31 12:08:55 +10:00
carbotaniuman 49db8a5a99 Add toggle for parse_meta_item unsafe parsing 
This makes it possible for the `unsafe(...)` syntax to only be
valid at the top level, and the `NestedMetaItem`s will automatically
reject `unsafe(...)`.
 2024-07-30 18:28:43 -05:00
Matthias Krüger 6f0b237c72 Rollup merge of #128376 - compiler-errors:finish-ur-vegetables, r=jieyouxu 
Mark `Parser::eat`/`check` methods as `#[must_use]`

These methods return a `bool`, but we probably should either use these values or explicitly throw them away (e.g. when we just want to unconditionally eat a token if it exists).

I changed a few places from `eat` to `expect`, but otherwise I tried to leave a comment explaining why the `eat` was okay.

This also adds a test for the `pattern_type!` macro, which used to silently accept a missing `is` token.
 2024-07-30 22:51:38 +02:00
bors f8060d282d Auto merge of #128083 - Mark-Simulacrum:bump-bootstrap, r=albertlarsan68 
Bump bootstrap compiler to new beta

https://forge.rust-lang.org/release/process.html#master-bootstrap-update-t-2-day-tuesday
 2024-07-30 17:49:08 +00:00
bors 595316b400 Auto merge of #127955 - chenyukang:yukang-fix-mismatched-delimiter-issue-12786, r=nnethercote 
Add limit for unclosed delimiters in lexer diagnostic

Fixes #127868

The first commit shows the original diagnostic, and the second commit shows the changes.
 2024-07-30 13:02:16 +00:00
carbotaniuman d8bc8761a5 Deny unsafe on more builtin attributes 2024-07-29 21:00:09 -05:00
Michael Goulet e4076e34f8 Mark Parser::eat/check methods as must_use 2024-07-29 21:29:08 -04:00
Nicholas Nethercote 84ac80f192 Reformat use declarations. 
The previous commit updated `rustfmt.toml` appropriately. This commit is
the outcome of running `x fmt --all` with the new formatting options.
 2024-07-29 08:26:52 +10:00
Mark Rousskov 5eca36d27a step cfg(bootstrap) 2024-07-28 14:46:29 -04:00
Trevor Gross 9164dbd48c Rollup merge of #128207 - folkertdev:asm-parser-generalize, r=Amanieu 
improve error message when `global_asm!` uses `asm!` options

specifically, what was

    error: expected one of `)`, `att_syntax`, or `raw`, found `preserves_flags`
      --> $DIR/bad-options.rs:45:25
       |
    LL | global_asm!("", options(preserves_flags));
       |                         ^^^^^^^^^^^^^^^ expected one of `)`, `att_syntax`, or `raw`

is now

    error: the `preserves_flags` option cannot be used with `global_asm!`
      --> $DIR/bad-options.rs:45:25
       |
    LL | global_asm!("", options(preserves_flags));
       |                         ^^^^^^^^^^^^^^^ the `preserves_flags` option is not meaningful for global-scoped inline assembly

mirroring the phrasing of the [reference](https://doc.rust-lang.org/reference/inline-assembly.html#options).

This is also a bit of a refactor for a future `naked_asm!` macro (for use in `#[naked]` functions). Currently this sort of error can come up when switching from inline to global asm, or when a user just isn't that experienced with assembly. With  `naked_asm!` added to the mix hitting this error is more likely.
 2024-07-27 13:32:56 -04:00
Trevor Gross 7eaf74743b Rollup merge of #128229 - tdittr:unsafe-extern-abi-error, r=compiler-errors 
Improve `extern "<abi>" unsafe fn()` error message

These errors were already reported in #87217, and fixed by #87235 but missed the case of an explicit ABI.

This PR does not cover multiple keywords like `extern "C" pub const unsafe fn()`, but I don't know what a good way to cover this  would be. It also seems rarer than `extern "C" unsafe` which I saw happen a few times in workshops.
 2024-07-26 19:03:08 -04:00
Trevor Gross af52be2cea Rollup merge of #128224 - nnethercote:fewer-replace_ranges, r=petrochenkov 
Remove unnecessary range replacements

This PR removes an unnecessary range replacement in `collect_tokens_trailing_token`, and does a couple of other small cleanups.

r? ````@petrochenkov````
 2024-07-26 19:03:06 -04:00
Trevor Gross 553a64f412 Rollup merge of #128223 - nnethercote:refactor-collect_tokens, r=petrochenkov 
Refactor complex conditions in `collect_tokens_trailing_token`

More readability improvements for this complicated function.

r? ````@petrochenkov````
 2024-07-26 19:03:06 -04:00
Tamme Dittrich 3fdc99193e Improve error message for extern "C" unsafe fn() 
This was handled correctly already for `extern unsafe fn()`.

Co-authored-by: Folkert <folkert@folkertdev.nl>
 2024-07-26 15:14:05 +02:00
Nicholas Nethercote 55d37ae711 Remove an unnecessary block. 2024-07-26 17:37:03 +10:00
Nicholas Nethercote 6ea2da5a28 Tweak a loop. 
A fully imperative style is easier to read than a half-iterator,
half-imperative style. Also, rename `inner_attr` as `attr` because it
might be an outer attribute.
 2024-07-26 17:37:03 +10:00
Nicholas Nethercote 6e87858f26 Fix a comment. 
Imagine you have replace ranges (2..20,X) and (5..15,Y), and these tokens:
```
a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x
```
If we replace (5..15,Y) first, then (2..20,X) we get this sequence
```
a,b,c,d,e,Y,_,_,_,_,_,_,_,_,_,p,q,r,s,t,u,v,w,x
a,b,X,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,u,v,w,x
```
which is what we want.

If we do it in the other order, we get this:
```
a,b,X,_,_,_,_,_,_,_,_,_,_,_,_,p,q,r,s,t,u,v,w,x
a,b,X,_,_,Y,_,_,_,_,_,_,_,_,_,_,_,_,_,_,u,v,w,x
```
which is wrong. So it's true that we need the `.rev()` but the comment
is wrong about why.
 2024-07-26 17:37:03 +10:00
Nicholas Nethercote a560810a69 Don't include inner attribute ranges in CaptureState. 
The current code is this:
```
self.capture_state.replace_ranges.push((start_pos..end_pos, Some(target)));
self.capture_state.replace_ranges.extend(inner_attr_replace_ranges);
```
What's not obvious is that every range in `inner_attr_replace_ranges`
must be a strict sub-range of `start_pos..end_pos`. Which means, in
`LazyAttrTokenStreamImpl::to_attr_token_stream`, they will be done
first, and then the `start_pos..end_pos` replacement will just overwrite
them. So they aren't needed.
 2024-07-26 14:18:20 +10:00
Nicholas Nethercote e631b1ebfa Invert the sense of is_complete and rename it as needs_tokens. 
I have always found `is_complete` an unhelpful name. The new name (and
inverted sense) fits in better with the conditions at its call sites.
 2024-07-26 09:58:34 +10:00
Nicholas Nethercote 3d363c3d99 Move is_complete to the module that uses it. 
And make it non-`pub`.
 2024-07-26 09:44:39 +10:00
Nicholas Nethercote 4288edb219 Inline and remove AttrWrapper::is_complete. 
It has a single call site. This change makes the two `needs_collect`
conditions more similar to each other, and therefore easier to
understand.
 2024-07-26 09:44:07 +10:00
Nicholas Nethercote caee195bdd Invert early exit conditions in collect_tokens_trailing_token. 
This has been bugging me for a while. I find complex "if any of these
are true" conditions easier to think about than complex "if all of these
are true" conditions, because you can stop as soon as one is true.
 2024-07-26 09:43:41 +10:00
Folkert d3858f7465 improve error message when global_asm! uses asm! options 2024-07-25 22:33:52 +02:00
surechen 4ac60601d3 Fix a span error when parsing a wrong param of function. 
fixes #128042
 2024-07-25 22:33:45 +08:00
yukang 94a3fd7678 add limit for unclosed delimiters in lexer diagnostic 2024-07-25 17:01:32 +08:00
Matthias Krüger cfc5f25b3d Rollup merge of #127054 - compiler-errors:bound-ordering, r=fmease 
Reorder trait bound modifiers *after* `for<...>` binder in trait bounds

This PR suggests changing the grammar of trait bounds from:

```
[CONSTNESS] [ASYNCNESS] [?] [BINDER] [TRAIT_PATH]

const async ? for<'a> Sized
```

to

```
([BINDER] [CONSTNESS] [ASYNCNESS] | [?]) [TRAIT_PATH]
```

i.e., either

```
? Sized
```

or

```
for<'a> const async Sized
```

(but not both)

### Why?

I think it's strange that the binder applies "more tightly" than the `?` trait polarity. This becomes even weirder when considering that we (or at least, I) want to have `async` trait bounds expressed like:

```
where T: for<'a> async Fn(&'a ()) -> i32,
```

and not:

```
where T: async for<'a> Fn(&'a ()) -> i32,
```

### Fallout

No crates on crater use this syntax, presumably because it's literally useless. This will require modifying the reference grammar, though.

### Alternatives

If this is not desirable, then we can alternatively keep parsing `for<'a>` after the `?` but deprecate it with either an FCW (or an immediate hard error), and begin parsing `for<'a>` *before* the `?`.
 2024-07-25 04:43:18 +02:00
León Orell Valerian Liehr 7da751a108 Apply suggestions from code review 2024-07-25 03:00:04 +02:00
Oli Scherer 8d290058c9 Always pass the visitor as the first argument to walk* functions 2024-07-22 14:01:24 +00:00
Oli Scherer 754bdef793 Sync mut_visit function names with immut visit ones (s/noop_visit/walk/) 2024-07-22 14:01:24 +00:00
bors 3811f40d27 Auto merge of #127957 - matthiaskrgr:rollup-1u5ivck, r=matthiaskrgr 
Rollup of 6 pull requests

Successful merges:

 - #127350 (Parser: Suggest Placing the Return Type After Function Parameters)
 - #127621 (Rewrite and rename `issue-22131` and `issue-26006` `run-make` tests to rmake)
 - #127662 (When finding item gated behind a `cfg` flag, point at it)
 - #127903 (`force_collect` improvements)
 - #127932 (rustdoc: fix `current` class on sidebar modnav)
 - #127943 (Don't allow unsafe statics outside of extern blocks)

r? `@ghost`
`@rustbot` modify labels: rollup
 2024-07-19 13:39:12 +00:00
Matthias Krüger 9ada89d9a1 Rollup merge of #127903 - nnethercote:force_collect-improvements, r=petrochenkov 
`force_collect` improvements

Yet more cleanups relating to `cfg_attr` processing.

r? ````@petrochenkov````
 2024-07-19 10:48:05 +02:00
Matthias Krüger c86e13f330 Rollup merge of #127350 - veera-sivarajan:bugfix-126311, r=lcnr 
Parser: Suggest Placing the Return Type After Function Parameters

Fixes #126311

This PR suggests placing the return type after the function parameters when it's misplaced after a `where` clause.

This also tangentially improves diagnostics for cases like [this](https://github.com/veera-sivarajan/rust/blob/86d6f1312a77997ef994240e716288d61a343a6d/tests/ui/parser/issues/misplaced-return-type-without-where-issue-126311.rs#L1C1-L1C28) and adds doc comments for `parser::AllowPlus`.
 2024-07-19 10:48:03 +02:00
Nicholas Nethercote 1dd566a6d0 Overhaul comments in collect_tokens_trailing_token. 
Adding details, clarifying lots of little things, etc. In particular,
the commit adds details of an example. I find this very helpful, because
it's taken me a long time to understand how this code works.
 2024-07-19 15:25:55 +10:00
Nicholas Nethercote ca6649516f Make Parser::num_bump_calls 0-indexed. 
Currently in `collect_tokens_trailing_token`, `start_pos` and `end_pos`
are 1-indexed by `replace_ranges` is 0-indexed, which is really
confusing. Making them both 0-indexed makes debugging much easier.
 2024-07-19 15:25:55 +10:00
Nicholas Nethercote f9c7ca70cb Move inner_attr code downwards. 
This puts it just before the `replace_ranges` initialization, which
makes sense because the two variables are closely related.
 2024-07-19 15:25:54 +10:00
Nicholas Nethercote 1f67cf9e63 Remove final_attrs local variable. 
It's no shorter than `ret.attrs()`, and `ret.attrs()` is used multiple
times earlier in the function.
 2024-07-19 15:25:54 +10:00
Nicholas Nethercote 757f73f506 Simplify CaptureState::inner_attr_ranges. 
The `Option`s within the `ReplaceRange`s within the hashmap are always
`None`. This PR omits them and inserts them when they are extracted from
the hashmap.
 2024-07-19 15:25:54 +10:00
Nicholas Nethercote 4158a1c48f Only check force_collect in collect_tokens_trailing_token. 
There are three places where we currently check `force_collect` and call
`collect_tokens_no_attrs` for `ForceCollect::Yes` and a vanilla parsing
function for `ForceCollect::No`.

But we can instead just pass in `force_collect` and let
`collect_tokens_trailing_token` do the appropriate thing.
 2024-07-19 08:42:33 +10:00
Nicholas Nethercote 9d908a2877 Use ForceCollect in parse_attr_item. 
Instead of a `bool`. Because `ForceCollect` is used in this way
everywhere else.
 2024-07-19 08:24:54 +10:00