Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 16 commits October 2, 2022 06:32
… to unwrap_or instead of suggesting calling it
This rule became irrelevant since c58246e
made it so that the `summary::before` pseudo-element contains an SVG instead
of text.
…se, r=compiler-errors

Suggest unwrap_or_else when a closure is given

Fixes rust-lang#102320

r? `@compiler-errors`
…earch-result, r=notriddle,jsha

Migrate CSS theme for search results

Part of rust-lang#98460.

Just like rust-lang#102237, I unified theme to how the `ayu` handles this one: only one color for the background when search results are focused or hovered.

You can test it [here](https://rustdoc.crud.net/imperio/migrate-css-theme-search-result/lib2/index.html?search=coo).

cc `@jsha`
r? `@notriddle`

PS: The repetition in GUI tests is getting out of hand so I opened GuillaumeGomez/browser-UI-test#363 to think about adding possibility to declare functions so we can greatly improve this.
…vidtwco

Delay evaluating lint primary message until after it would be suppressed

Fixes rust-lang#102561
Fixes rust-lang#102572
…, r=GuillaumeGomez

rustdoc: remove font family CSS on `.rustdoc-toggle summary::before`

This rule became irrelevant since c58246e made it so that the `summary::before` pseudo-element contains an SVG instead of text.
Change the parameter name of From::from to `value`

The `From` trait is currently defined as:
```rust
pub trait From<T>: Sized {
    fn from(_: T) -> Self;
}
```

The name of the argument is `_`. I am proposing to change it to `value`, ie.
```rust
pub trait From<T>: Sized {
    fn from(value: T) -> Self;
}
```

This would be more consistent with the `TryFrom`, which looks like this:
```rust
pub trait TryFrom<T>: Sized {
    type Error;
    fn try_from(value: T) -> Result<Self, Self::Error>;
}
```

The reason for this proposal is twofold:
1. Consistency with the rest of the standard library. The `TryFrom` trait uses `value`, and no `From` implementation uses the default name (as it is quite useless).
2. When generating trait implementations with rust-analyzer/IntelliJ, the parameter name is copied, and it always has to be changed.

Optionally, another name like `x` could be used. I only propose `value` for consistency with `TryFrom`.

Changing parameter names is not a breaking change.

Note: this was originally posted as an internals thread [here](https://internals.rust-lang.org/t/change-the-argument-name-of-from-from/17480)
…ests, r=tmandry

Ignore fuchsia on two compiler tests

Adding `ignore-fuchsia` to two irrelevant compiler tests

cc. `@djkoloski`

r? `@tmandry`
…g, r=Aaron1011

Improve spans when splitting multi-char operator tokens for proc macros.

When a two-char (or three-char) operator token is split into single-char operator tokens before being passed to a proc macro, the single-char tokens are given the original span of length two (or three). This PR gives them more accurate spans.

r? `@Aaron1011`
cc `@petrochenkov`
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Oct 4, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Oct 4, 2022

📌 Commit 185ca0f has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 4, 2022
@bors
Copy link
Collaborator

bors commented Oct 4, 2022

⌛ Testing commit 185ca0f with merge f111209...

@bors
Copy link
Collaborator

bors commented Oct 4, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing f111209 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 4, 2022
@bors bors merged commit f111209 into rust-lang:master Oct 4, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 4, 2022
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#102639 a7ce2ecf35ff9d759c54099a003f0703d0bf37cf
#102637 2d58aaa045861a547569d36d025808c68de430e1
#102628 18bbb68bdb5954c2548293ddacc576b549cce5fc
#102624 1ddea99513bee91ea27ab712b8812395b65d9648
#102567 578a7c22c15c4366bbc546d39481da9ef94b2108
#102547 4018bbfce9dcf8664dc5ee0097f0716fec33aeab
#102441 c2990d33616bad10ac3bf0342c93296fa22908f5

previous master: d9f8b4b985

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
Copy link
Collaborator

Finished benchmarking commit (f111209): comparison URL.

Overall result: ❌✅ regressions and improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
1.2% [1.2%, 1.2%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.2% [-0.2%, -0.2%] 1
All ❌✅ (primary) - - 0

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.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.2% [1.4%, 3.4%] 7
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.5% [-5.5%, -2.2%] 6
All ❌✅ (primary) - - 0

Cycles

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

Footnotes

  1. the arithmetic mean of the percent change 2

  2. number of relevant changes 2

@matthiaskrgr matthiaskrgr deleted the rollup-rg0sw41 branch October 9, 2022 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants