Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 6 pull requests #102666

Merged
merged 14 commits into from
Oct 4, 2022
Merged

Rollup of 6 pull requests #102666

merged 14 commits into from
Oct 4, 2022

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

compiler-errors and others added 14 commits September 29, 2022 21:22
`dist` creates a `rust-docs-json.tar.xz` tarfile. But build-manifest expected it to be named
`rust-docs-json-preview.tar.xz`. Change build-manifest to allow the name without the `-preview` suffix.

This also adds `rust-docs-json` to the `rust` component. I'm not quite sure why it exists,
but rustup uses it to determine which components are available.
…Simulacrum

Package `rust-docs-json` into nightly components (take 3)

`dist` creates a `rust-docs-json.tar.xz` tarfile. But build-manifest expected it to be named `rust-docs-json-preview.tar.xz`. Change build-manifest to allow the name without the `-preview` suffix.

I haven't actually tested this :( build-manifest is a pain to run locally.
… r=oli-obk

Check generic argument compatibility when projecting assoc ty

Fixes rust-lang#102114
…-dead

Only allow ~const bounds for traits with #[const_trait]

r? `@fee1-dead`
It's not about types or consts, but the lack of regions

pulled out of rust-lang#101900 which adds a fourth kind of non-lifetime generic parameter, and the naming of these methods would get ridiculous.
resolve instance: missing value to `delay_span_bug`
@rustbot rustbot added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. rollup A PR which is a rollup labels Oct 4, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Oct 4, 2022

📌 Commit db94aed 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
Contributor

bors commented Oct 4, 2022

⌛ Testing commit db94aed with merge 01af504...

@bors
Copy link
Contributor

bors commented Oct 4, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 4, 2022
@bors bors merged commit 01af504 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
#102653 b2ea0272340079ec42f814a83b6698d2527d2a35
#102651 d66e18ff57d2eaa1897ee01692e795ee1ee5ecce
#102648 0a5a424f6cf5c4a0b4a6307c16d3a33bae637078
#102647 38e2c0c2f82cdab3d6ccf829d482ff4a20c561a7
#102488 88e4cbc81700743c1dc41360ba362b665265c567
#102241 d6ed2b2d834d22eb38456cec2b1a5a8321bbffb4

previous master: 02cd79afb8

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 (01af504): 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.

mean1 range count2
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
4.4% [2.3%, 9.9%] 4
Improvements ✅
(primary)
-0.9% [-0.9%, -0.9%] 1
Improvements ✅
(secondary)
-1.8% [-2.3%, -1.4%] 4
All ❌✅ (primary) -0.9% [-0.9%, -0.9%] 1

Cycles

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

Footnotes

  1. the arithmetic mean of the percent change

  2. number of relevant changes

@matthiaskrgr matthiaskrgr deleted the rollup-tuge18t 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants