https://github.com/rust-lang/rust http://git.dreamy.place/mirrors/rust/atom?h=1.81.0 2024-08-15T16:15:58+00:00 2024-08-15T16:15:58+00:00 Nicholas Nethercote n.nethercote@gmail.com 2024-08-12T00:27:19+00:00 urn:sha1:ef56e6fe483d736ced737629245931c92aeddad7 The special case was failing to handle invisible delimiters on one path. Fixes #128895. (cherry picked from commit 46b4c5adc5698c3e9543e17a1ed0f8073bafd1d3) 2024-07-19T13:39:12+00:00 bors bors@rust-lang.org 2024-07-19T13:39:12+00:00 urn:sha1:3811f40d2701b3a8923d2d46e36dd3a93a824b49 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-19T08:48:05+00:00 Matthias Krüger matthias.krueger@famsik.de 2024-07-19T08:48:05+00:00 urn:sha1:9ada89d9a1d19d8c852bf7e959e45ca1b63d9714 `force_collect` improvements Yet more cleanups relating to `cfg_attr` processing. r? ````@petrochenkov```` 2024-07-19T08:48:03+00:00 Matthias Krüger matthias.krueger@famsik.de 2024-07-19T08:48:03+00:00 urn:sha1:c86e13f330b8689d21bc258f50e96d36196733b3 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-19T05:25:55+00:00 Nicholas Nethercote n.nethercote@gmail.com 2024-07-15T00:37:27+00:00 urn:sha1:1dd566a6d099aba748d0ff758df2db8446d4f941 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-19T05:25:55+00:00 Nicholas Nethercote n.nethercote@gmail.com 2024-07-17T07:59:05+00:00 urn:sha1:ca6649516f24fcfabeeee07e287d4de8958e83fe 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-19T05:25:54+00:00 Nicholas Nethercote n.nethercote@gmail.com 2024-07-15T00:33:21+00:00 urn:sha1:f9c7ca70cb3a10e0113113d054b9214b98455ae5 This puts it just before the `replace_ranges` initialization, which makes sense because the two variables are closely related. 2024-07-19T05:25:54+00:00 Nicholas Nethercote n.nethercote@gmail.com 2024-07-12T06:03:51+00:00 urn:sha1:1f67cf9e63258c57d35e8d75a2dcfa5f2e4b5cf3 It's no shorter than `ret.attrs()`, and `ret.attrs()` is used multiple times earlier in the function. 2024-07-19T05:25:54+00:00 Nicholas Nethercote n.nethercote@gmail.com 2024-07-12T05:47:16+00:00 urn:sha1:757f73f506a48ff96de54c0cb8c79a25ffbc70d9 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-18T22:42:33+00:00 Nicholas Nethercote n.nethercote@gmail.com 2024-07-17T04:02:37+00:00 urn:sha1:4158a1c48fb19bfce31e4001593faa2353b7201b 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.