Rollup of 5 pull requests by Dylan-DPC · Pull Request #101757 · rust-lang/rust

Dylan-DPC · 2022-09-13T11:21:33Z

Successful merges:

Streamline AttrAnnotatedTokenStream #101602 (Streamline AttrAnnotatedTokenStream)
Avoid Iterator::last #101690 (Avoid Iterator::last)
A SubstitutionPart is not considered a deletion if it replaces nothing with nothing #101700 (A SubstitutionPart is not considered a deletion if it replaces nothing with nothing)
Fix typo in concat_bytes documentation #101745 (Fix typo in concat_bytes documentation)
rustdoc: remove redundant CSS #source-sidebar, #sidebar-toggle #101748 (rustdoc: remove redundant CSS #source-sidebar, #sidebar-toggle)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

And into `AttrAnnotatedTokenTree::Token`. PR rust-lang#99887 did the same thing for `TokenStream`.

These two type names are long and have long matching prefixes. I find them hard to read, especially in combinations like `AttrAnnotatedTokenStream::new(vec![AttrAnnotatedTokenTree::Token(..)])`. This commit renames them as `AttrToken{Stream,Tree}`.

The `AttrTokenStream` is always immediately turned into a `TokenStream`.

`To` is better than `Create` for indicating that this is a non-consuming conversion, rather than creating something out of nothing. And the addition of `Attr` is because the current names makes them sound like they relate to `TokenStream`, but really they relate to `AttrTokenStream`.

This fixes the typo `&[u8, _]` -> `&[u8; _]`

These two elements are always nested below `<nav class="sidebar">`, and will inherit the font from their parent. These selectors were added in 93520d2, and became redundant in 07e3f99 when the source sidebar elements became nested below `nav.sidebar`.

…rochenkov Streamline `AttrAnnotatedTokenStream` r? ```@petrochenkov```

…-obk Avoid `Iterator::last` Adapters like `Filter` and `Map` use the default implementation of `Iterator::last` which is not short-circuiting (and so does `core::str::Split`). The predicate function will be run for every single item of the underlying iterator. I hope that removing those calls to `last` results in slight performance improvements.

…avidtwco A `SubstitutionPart` is not considered a deletion if it replaces nothing with nothing Fixesrust-lang#101689

Fix typo in concat_bytes documentation This fixes the typo `&[u8, _]` -> `&[u8; _]`

…-sidebar-toggle, r=GuillaumeGomez rustdoc: remove redundant CSS `#source-sidebar, #sidebar-toggle` These two elements are always nested below `<nav class="sidebar">`, and will inherit the font from their parent. These selectors were added in 93520d2, and became redundant in 07e3f99 when the source sidebar elements became nested below `nav.sidebar`.

Dylan-DPC · 2022-09-13T11:21:42Z

@bors r+ rollup=never p=5

bors · 2022-09-13T11:21:44Z

📌 Commit 1c74d50 has been approved by Dylan-DPC

It is now in the queue for this repository.

bors · 2022-09-13T12:35:59Z

⌛ Testing commit 1c74d50 with merge 5338f5f...

bors · 2022-09-13T15:32:59Z

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing 5338f5f to master...

rust-timer · 2022-09-13T15:34:44Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#101748	3cbc0773aa8b10687f322a8a418ad584d35fb613
#101745	c766d9a5e7ccbbbb3519dde64fc3a8144e447d87
#101700	919f462ddb3b7a1680bcb2c92293590879851e84
#101690	acbd4c548c8ce8a5c0f86f960d795cab4291070b
#101602	a1df0a91ef41be3df92b4b592ce1cbbe63bd5ff8

previous master: 7098c181f8

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2022-09-13T16:50:53Z

Finished benchmarking commit (5338f5f): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.6%	[2.6%, 2.6%]	1
Improvements ✅ (primary)	-4.0%	[-5.8%, -2.1%]	2
Improvements ✅ (secondary)	-1.9%	[-2.9%, -1.1%]	3
All ❌✅ (primary)	-4.0%	[-5.8%, -2.1%]	2

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean¹	range	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.2%	[-2.2%, -2.2%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.2%	[-2.2%, -2.2%]	1

the arithmetic mean of the percent change↩↩²
number of relevant changes↩↩²

nnethercoteand others added 17 commits September 9, 2022 12:00

Move Spacing out of AttrAnnotatedTokenStream.
890e759
And into `AttrAnnotatedTokenTree::Token`. PR rust-lang#99887 did the same thing for `TokenStream`.

Rename AttrAnnotatedToken{Stream,Tree}.
a56d345
These two type names are long and have long matching prefixes. I find them hard to read, especially in combinations like `AttrAnnotatedTokenStream::new(vec![AttrAnnotatedTokenTree::Token(..)])`. This commit renames them as `AttrToken{Stream,Tree}`.

Change return type of Attribute::tokens.
208ca93
The `AttrTokenStream` is always immediately turned into a `TokenStream`.

Tweak some formatting.
81eaf87

Inline and remove TokenStream::opt_from_ast.
f6c9e1d

Avoid Iterator::last
66211d8

A SubstitutionPart is not a deletion if it replaces nothing with nothing
370c816

Don't trim substitution if it's only whitespace
c2cff68

Fix typo in concat_bytes documentation
ba3b3bc
This fixes the typo `&[u8, _]` -> `&[u8; _]`

Don't render inline suggestions of only spaces
cd962e6

Rollup merge ofrust-lang#101602- nnethercote:AttrTokenStream, r=pet…
db75d7e
…rochenkov Streamline `AttrAnnotatedTokenStream` r? ```@petrochenkov```

Rollup merge ofrust-lang#101700- compiler-errors:deletion-span, r=d…
adcd1fb
…avidtwco A `SubstitutionPart` is not considered a deletion if it replaces nothing with nothing Fixesrust-lang#101689

Rollup merge ofrust-lang#101745- jay3332:patch-1, r=JohnTitor
95c9a7e
Fix typo in concat_bytes documentation This fixes the typo `&[u8, _]` -> `&[u8; _]`

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 13, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 13, 2022

bors merged commit 5338f5f into rust-lang:masterSep 13, 2022

rustbot added this to the 1.65.0 milestone Sep 13, 2022

This was referenced Sep 13, 2022
Manually cleanup token stream when macro expansion aborts. #100250
Merged
make mk_attr_id part of ParseSess#101313
Merged
Shrink ast::Expr harder #101562
Merged

matthiaskrgr mentioned this pull request Oct 30, 2023
ICE: failure to relate an opaque to itself should result in an error later on#117392
Open

Navigation Menu

Uh oh!

Uh oh!

Rollup of 5 pull requests - #101757

Rollup of 5 pull requests#101757
bors merged 17 commits into
rust-lang:masterfrom
Dylan-DPC:rollup-wkt6oe9

Dylan-DPC commented Sep 13, 2022

Uh oh!

Dylan-DPC commented Sep 13, 2022

Uh oh!

bors commented Sep 13, 2022

Uh oh!

bors commented Sep 13, 2022

Uh oh!

bors commented Sep 13, 2022

Uh oh!

rust-timer commented Sep 13, 2022

Uh oh!

rust-timer commented Sep 13, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Uh oh!

Uh oh!

Conversation

Dylan-DPC commented Sep 13, 2022

Uh oh!

Dylan-DPC commented Sep 13, 2022

Uh oh!

bors commented Sep 13, 2022

Uh oh!

bors commented Sep 13, 2022

Uh oh!

bors commented Sep 13, 2022

Uh oh!

rust-timer commented Sep 13, 2022

Uh oh!

rust-timer commented Sep 13, 2022

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants