Rollup of 11 pull requests by matthiaskrgr · Pull Request #98632 · rust-lang/rust

matthiaskrgr · 2022-06-28T16:34:37Z

Successful merges:

rustdoc-json: Add assoc type ICE regression test #98548 (rustdoc-json: Allow Typedef to be different in sanity assert)
Add regression test for #85907 #98560 (Add regression test for ICE: const_panic panics in some cases #85907)
Remove references to ./tmp in-tree #98564 (Remove references to ./tmp in-tree)
Add regression test for #80074 #98602 (Add regression test for ICE: Missing span for DefIndex(3) in compiler/rustc_metadata/src/rmeta/decoder.rs:749 #80074)
⬆️ rust-analyzer #98606 (:arrow_up: rust-analyzer)
Fix ICE for associated constant generics #98609 (Fix ICE for associated constant generics)
Fix glob import ICE in rustdoc JSON format #98611 (Fix glob import ICE in rustdoc JSON format)
Remove feature const_option from std #98617 (Remove feature const_option from std)
Fix mir-opt wg name #98619 (Fix mir-opt wg name)
llvm-wrapper: adapt for removal of the ASanGlobalsMetadataAnalysis LLVM API #98621 (llvm-wrapper: adapt for removal of the ASanGlobalsMetadataAnalysis LLVM API)
fix typo in comment #98623 (fix typo in comment)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

These used to be used by codegen-units tests, but were switched from manually specifying directories to just using `// incremental` in rust-lang#89101. Remove the old references.

…ICEs

This adapts llvm-wrapper for llvm/llvm-project@dacfa24, which removed ASanGlobalsMetadataAnalysis.

…doc-json, r=GuillaumeGomez rustdoc-json: Allow Typedef to be different in sanity assert Closesrust-lang#98547 This fix is a natural extension of rust-lang#98053. r? `@notriddle` (Since you reviewed the other PR.) CC `@GuillaumeGomez` `@rustbot` labels +A-rustdoc-json +T-rustdoc

…07, r=Mark-Simulacrum Add regression test for rust-lang#85907closesrust-lang#85907

…acrum Remove references to `./tmp` in-tree These used to be used by codegen-units tests, but were switched from manually specifying directories to just using `// incremental` in rust-lang#89101. Remove the old references. Fixesrust-lang#34586.

…ue-80074, r=Mark-Simulacrum Add regression test for rust-lang#80074closesrust-lang#80074

…=lnicola ⬆️ rust-analyzer r? ``@ghost``

…tant-generics, r=lcnr Fix ICE for associated constant generics Fixesrust-lang#98432

…e, r=notriddle Fix glob import ICE in rustdoc JSON format Fixesrust-lang#98003. r? `@notriddle`

…mulacrum Remove feature `const_option` from std This is part of the effort to reduce the number of unstable features used by std. This one is easy as it's only used in one place.

…lan-DPC Fix mir-opt wg name r? ``@ehuss``

llvm-wrapper: adapt for removal of the ASanGlobalsMetadataAnalysis LLVM API No functional changes intended. This adapts llvm-wrapper for llvm/llvm-project@dacfa24, which removed `ASanGlobalsMetadataAnalysis`. Found via our experimental rust + HEAD llvm bot: https://buildkite.com/llvm-project/rust-llvm-integrate-prototype/builds/11565#0181a72f-75bb-4378-88f0-4c0bca7d03fa/231-505.

fix typo in comment

rustbot · 2022-06-28T16:34:41Z

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then
please comment with @rustbot label +T-libs-api -T-libs to tag it
appropriately. If this PR contains changes to any unstable APIs please edit
the PR description to add a link to the relevant API Change
Proposal
or create one
if you haven't already. If you're unsure where your change falls no worries,
just leave it as is and the reviewer will take a look and make a decision to
forward on if necessary.

Examples of T-libs-api changes:

Stabilizing library features
Introducing insta-stable changes such as new implementations of existing
stable traits on existing stable types
Introducing new or changing existing unstable library APIs (excluding
permanently unstable features / features without a tracking issue)
Changing public documentation in ways that create new stability guarantees
Changing observable runtime behavior of library APIs

Some changes occurred in src/librustdoc/clean/types.rs

cc @camelid

matthiaskrgr · 2022-06-28T16:35:05Z

@bors r+ rollup=never p=11

bors · 2022-06-28T16:35:08Z

📌 Commit 164c98e has been approved by matthiaskrgr

bors · 2022-06-28T18:36:45Z

⌛ Testing commit 164c98e with merge 8308806...

bors · 2022-06-28T21:17:20Z

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

rust-timer · 2022-06-29T01:25:28Z

Finished benchmarking commit (8308806): comparison url.

Instruction count

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

Max RSS (memory usage)

Results

Primary benchmarks: no relevant changes found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	N/A	N/A	0
Regressions 😿 (secondary)	2.6%	3.4%	3
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-3.5%	-3.6%	2
All 😿🎉 (primary)	N/A	N/A	0

Cycles

Results

Primary benchmarks: 😿 relevant regressions found
Secondary benchmarks: 🎉 relevant improvement found

	mean¹	max	count²
Regressions 😿 (primary)	2.3%	2.7%	3
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	-2.7%	-2.7%	1
All 😿🎉 (primary)	2.3%	2.7%	3

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

@rustbot label: -perf-regression

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

TaKO8Kiand others added 25 commits June 27, 2022 10:07

add regression test forrust-lang#85907
89a23bf

Remove references to ./tmp in-tree
d16187c
These used to be used by codegen-units tests, but were switched from manually specifying directories to just using `// incremental` in rust-lang#89101. Remove the old references.

add regression test forrust-lang#80074
05263f0

⬆️ rust-analyzer
396342a

rustdoc-json: Add assoc type ICE regression test
ae4b929

test/rustdoc-json/assoc_type.rs: Maximize chance of detecting future …
2888e76
…ICEs

fix ice for associated constant generics
8c7d9f6

Fix glob import ICE in rustdoc JSON format
b7e6200

Add regression test for glob import ICE in rustdoc JSON
c2221ef

Remove feature const_option from std
2ee9241

Add a fixme comment
720c430

Fix mir-opt wg name
d6b9c10

llvm-wrapper: adapt for an LLVM API change
fe02ee8
This adapts llvm-wrapper for llvm/llvm-project@dacfa24, which removed ASanGlobalsMetadataAnalysis.

fix typo in comment
8c22b6b

Rollup merge ofrust-lang#98560- TaKO8Ki:add-regression-test-for-859…
5c7a045
…07, r=Mark-Simulacrum Add regression test for rust-lang#85907closesrust-lang#85907

Rollup merge ofrust-lang#98602- TaKO8Ki:add-regression-test-for-iss…
70b4e04
…ue-80074, r=Mark-Simulacrum Add regression test for rust-lang#80074closesrust-lang#80074

Rollup merge ofrust-lang#98606- lnicola:rust-analyzer-2022-06-28, r…
28d2c4b
…=lnicola ⬆️ rust-analyzer r? ``@ghost``

Rollup merge ofrust-lang#98609- TaKO8Ki:fix-ice-for-associated-cons…
a1b0638
…tant-generics, r=lcnr Fix ICE for associated constant generics Fixesrust-lang#98432

Rollup merge ofrust-lang#98611- GuillaumeGomez:rustdoc-json-glob-ic…
956a9f5
…e, r=notriddle Fix glob import ICE in rustdoc JSON format Fixesrust-lang#98003. r? `@notriddle`

Rollup merge ofrust-lang#98617- ChrisDenton:const-unwrap, r=Mark-Si…
a3bdd46
…mulacrum Remove feature `const_option` from std This is part of the effort to reduce the number of unstable features used by std. This one is easy as it's only used in one place.

Rollup merge ofrust-lang#98619- Mark-Simulacrum:fix-triagebot, r=Dy…
62a787c
…lan-DPC Fix mir-opt wg name r? ``@ehuss``

Rollup merge ofrust-lang#98623- pro465:patch-1, r=Dylan-DPC
164c98e
fix typo in comment

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. labels Jun 28, 2022

rustbot added the rollup A PR which is a rollup label Jun 28, 2022

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 28, 2022

Dylan-DPC mentioned this pull request Jun 28, 2022
Rollup of 7 pull requests #98630
Closed

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 28, 2022

bors merged commit 8308806 into rust-lang:masterJun 28, 2022

rustbot added this to the 1.64.0 milestone Jun 28, 2022

matthiaskrgr deleted the rollup-peg868d branch July 30, 2022 10:32

This was referenced Sep 18, 2022
Latest Rust will not compile venomlinux/ports#1676
Closed
Build fails mrk-its/rust-mos#9
Closed
Build error using llvm-15.0.0 (released version) mystor/synstructure#55
Closed

Navigation Menu

Uh oh!

Uh oh!

Rollup of 11 pull requests - #98632

Rollup of 11 pull requests#98632
bors merged 25 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-peg868d

matthiaskrgr commented Jun 28, 2022

Uh oh!

rustbot commented Jun 28, 2022

Uh oh!

matthiaskrgr commented Jun 28, 2022

Uh oh!

bors commented Jun 28, 2022

Uh oh!

bors commented Jun 28, 2022

Uh oh!

bors commented Jun 28, 2022

Uh oh!

rust-timer commented Jun 29, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Jun 28, 2022

Uh oh!

rustbot commented Jun 28, 2022

Uh oh!

matthiaskrgr commented Jun 28, 2022

Uh oh!

bors commented Jun 28, 2022

Uh oh!

bors commented Jun 28, 2022

Uh oh!

bors commented Jun 28, 2022

Uh oh!

rust-timer commented Jun 29, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants