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 25 commits June 3, 2022 13:14
…am-ty, r=oli-obk

Normalize consts' tys when relating with `adt_const_params`

Fixes rust-lang#97007
…requirements, r=pnkfelix

Remove the `infer_static_outlives_requirements` feature

Closes rust-lang#54185
r? ``@pnkfelix``
interpret: unify offset_from check with offset check

`offset` does the check with a single `check_ptr_access` call while `offset_from` used two calls. Make them both just one one call.

I originally intended to actually factor this into a common function, but I am no longer sure if that makes a lot of sense... the two functions start with pretty different precondition (e.g. `offset` *knows* that the 2nd pointer has the same provenance).

I also reworded the UB messages a little. Saying it "cannot" do something is not how we usually phrase UB (as far as I know). Instead it's not *allowed* to do that.

r? ``````@oli-obk``````
…_update_is_probably_complete, r=oli-obk

Make `type_changing_struct_update` no longer an incomplete feature

After rust-lang#97705, I don't see what would make it incomplete anymore. `check_expr_struct_fields` seems to now implement the RFC to the letter.

r? ``````@nikomatsakis``````
cc ``````@rust-lang/types``````
…g, r=davidtwco

Remove unnecessary `to_string` and `String::new`

rust-lang@73fa217 changed the type of the `suggestion` argument to `impl ToString`. This patch removes unnecessary `to_string` and `String::new`.

cc: `````@davidtwco`````
[issues:97981] del unrelated comment

fixes rust-lang#97981
summary: del unrelated comment
Document an edge case of `str::split_once`
…rrors

Add some more regression tests for rust-lang#67945

Closes rust-lang#67945, added two tests from rust-lang#67945 (comment), other snippets were already added in rust-lang#71952 and rust-lang#77439
r? `@compiler-errors`
…es, r=jyn514

Fix error message for `download-ci-llvm`

The error message when `download-ci-llvm` fails includes too many newlines right now:

```
curl: (22) The requested URL returned error: 404

error: failed to download llvm from ci

help: old builds get deleted after a certain time

help: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:

[llvm]

download-ci-llvm = false

Build completed unsuccessfully in 0:01:15
```

This PR fixes the message to include the right amount of newlines:

```
curl: (22) The requested URL returned error: 404

error: failed to download llvm from ci

help: old builds get deleted after a certain time
help: if trying to compile an old commit of rustc, disable `download-ci-llvm` in config.toml:

[llvm]
download-ci-llvm = false

Build completed unsuccessfully in 0:00:07
```

r? `@jyn514`
@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 Jun 13, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=10

@bors
Copy link
Collaborator

bors commented Jun 13, 2022

📌 Commit af1f614 has been approved by matthiaskrgr

@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 Jun 13, 2022
@bors
Copy link
Collaborator

bors commented Jun 13, 2022

⌛ Testing commit af1f614 with merge ca122c7...

@bors
Copy link
Collaborator

bors commented Jun 13, 2022

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 13, 2022
@bors bors merged commit ca122c7 into rust-lang:master Jun 13, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 13, 2022
@rust-highfive
Copy link
Contributor

📣 Toolstate changed by #98066!

Tested on commit ca122c7.
Direct link to PR: #98066

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Jun 13, 2022
Tested on commit rust-lang/rust@ca122c7.
Direct link to PR: <rust-lang/rust#98066>

🎉 miri on windows: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb).
🎉 miri on linux: build-fail → test-pass (cc @oli-obk @RalfJung @eddyb).
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (ca122c7): comparison url.

Instruction count

  • Primary benchmarks: 😿 relevant regressions found
  • Secondary benchmarks: mixed results
mean1 max count2
Regressions 😿
(primary)
0.5% 0.6% 4
Regressions 😿
(secondary)
0.4% 0.5% 11
Improvements 🎉
(primary)
N/A N/A 0
Improvements 🎉
(secondary)
-0.3% -0.3% 4
All 😿🎉 (primary) 0.5% 0.6% 4

Max RSS (memory usage)

Results
  • Primary benchmarks: 😿 relevant regression found
  • Secondary benchmarks: 😿 relevant regression found
mean1 max count2
Regressions 😿
(primary)
2.2% 2.2% 1
Regressions 😿
(secondary)
4.7% 4.7% 1
Improvements 🎉
(primary)
N/A N/A 0
Improvements 🎉
(secondary)
N/A N/A 0
All 😿🎉 (primary) 2.2% 2.2% 1

Cycles

Results
  • Primary benchmarks: 🎉 relevant improvement found
  • Secondary benchmarks: no relevant changes found
mean1 max count2
Regressions 😿
(primary)
N/A N/A 0
Regressions 😿
(secondary)
N/A N/A 0
Improvements 🎉
(primary)
-2.3% -2.3% 1
Improvements 🎉
(secondary)
N/A N/A 0
All 😿🎉 (primary) -2.3% -2.3% 1

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

Next Steps: If you can justify the regressions found in this perf run, please indicate this with @rustbot label: +perf-regression-triaged along with sufficient written justification. If you cannot justify the regressions please open an issue or create a new PR that fixes the regressions, add a comment linking to the newly created issue or PR, and then add the perf-regression-triaged label to this PR.

@rustbot label: +perf-regression

Footnotes

  1. the arithmetic mean of the percent change 2 3

  2. number of relevant changes 2 3

@rustbot rustbot added the perf-regression Performance regression. label Jun 13, 2022
@pnkfelix
Copy link
Contributor

  • diesel-1.4.8 regressed by 0.5% for variations on check/debug/opt and incr-full/full. That's the only primary regression, and its within the noise level that we're currently associating with diesel, I think.
  • The other regressions are wf-projection-stress-65510, projection-caching, regression-31157, and wg-grammar.
  • wf-projection-stress-65510 and regression-31157 are canaries where we are trying to catch a massive regression, not a minor one like the ones presented here.
  • given that this is a rollup and the remaining regressions are well under 0.5%, I think that's the limit to the amount of investigation I want to do here.

@rustbot label: +perf-regression-triaged

@rustbot rustbot added the perf-regression-triaged The performance regression has been triaged. label Jun 14, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-wb9gs92 branch July 30, 2022 10:33
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. perf-regression Performance regression. perf-regression-triaged The performance regression has been triaged. 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.