Skip to content

Rollup of 8 pull requests#110375

Merged
bors merged 29 commits intorust-lang:masterfrom
JohnTitor:rollup-ghvdaxm
Apr 16, 2023
Merged

Rollup of 8 pull requests#110375
bors merged 29 commits intorust-lang:masterfrom
JohnTitor:rollup-ghvdaxm

Conversation

@JohnTitor
Copy link
Member

@JohnTitor JohnTitor commented Apr 15, 2023

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

cuviper and others added 29 commits April 6, 2023 17:41
@cuviper
Add 1.69.0 release notes
af3bf85
@cuviper @Muscraft
Cargo only suggests fixes for warnings
21f10dd 
Co-authored-by: Scott Schafer <scott@scottschafer.dev>
@cuviper @slanterns
core::net is not stable yet
6b33156 
Co-authored-by: Slanterns <slanterns.w@gmail.com>
@cuviper @Mark-Simulacrum
Rephrase the analysis removal
f6a47f3 
Co-authored-by: Mark Rousskov <mark.simulacrum@gmail.com>
@cuviper
Remove empty "Misc" section
c21b104
@cuviper @Noratrieb
Avoid normalization/projection jargon
361b453 
Co-authored-by: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com>
@cuviper
Apply code formatting
02b3165
@cuviper @ehuss
Apply suggestions from code review
f9f2516 
Co-authored-by: Eric Huss <eric@huss.org>
@cuviper @est31
Apply suggestions from code review
c9358e9 
Co-authored-by: est31 <est31@users.noreply.github.com>
@cuviper @ehuss
Cargo '-C' was reverted
ae60b36 
Co-authored-by: Eric Huss <eric@huss.org>
@Ezrashaw
fix: skip implied bounds if unconstrained lifetime exists
ecf2a9b
@cuviper
Update the mingw version note
617648c
@est31
Allow everyone to set the beta-nominated label
0aa958b 
It is allowed both in cargo and clippy's triagebot.toml,
and nomination does not automatically mean that the PR
will be backported.
@Ezrashaw
implement review suggestions
b506d96
@SparkyPotato
add UI test for rust-lang#79605
714c276
@est31
Add intra-doc links to size_of_* functions
504a47b
@aliemjay
Update compiler/rustc_trait_selection/src/traits/outlives_bounds.rs
4c80f58
@jyn514
Fix x test rust-installer when cargo is set to a relative path
b1feb45 
Previously, this would give an error because the shell script had a
different working directory:

```
test: basic_install
$ sh /home/jyn/src/rust/src/tools/rust-installer/gen-installer.sh --image-dir=/home/jyn/src/rust/src/tools/rust-installer/test/image1 --work-dir=/home/jyn/src/rust/build/x86_64-unknown-linux-gnu/test/rust-installer/workdir --output-dir=/home/jyn/src/rust/build/x86_64-unknown-linux-gnu/test/rust-installer/outdir
/home/jyn/src/rust/src/tools/rust-installer/gen-installer.sh: 15: ../rust3/build/host/stage2-tools-bin/cargo: not found

TEST FAILED!
```
@matthiaskrgr
remove redundant clones
1077d57
@matthiaskrgr
fix clippy::{filter_map_identiy, map_identity, manual_flatten}
d666f6b
@matthiaskrgr
fix clippy::{clone_on_copy, useless_conversion}
bcd79c2
@JohnTitor
Rollup merge of rust-lang#110033 - cuviper:relnotes-1.69.0, r=pietroa…
7e6983e 
…lbini

Add 1.69.0 release notes

cc ````@rust-lang/release````
r? ````@Mark-Simulacrum````
@JohnTitor
Rollup merge of rust-lang#110272 - Ezrashaw:fix-unconned-lt-in-implbo…
52d23c9 
…unds, r=aliemjay

fix: skip implied bounds if unconstrained lifetime exists

Fixes rust-lang#110161

r? ````@aliemjay````
@JohnTitor
Rollup merge of rust-lang#110307 - est31:beta_nominated_unauthenticat…
a484f22 
…ed, r=Mark-Simulacrum

Allow everyone to set the beta-nominated label

It is allowed both in cargo and clippy's triagebot.toml, and nomination does not automatically mean that the PR will be backported.
@JohnTitor
Rollup merge of rust-lang#110347 - est31:size_of_links, r=jyn514
1c228d1 
Add intra-doc links to size_of_* functions

Also some smaller doc improvements.
@JohnTitor
Rollup merge of rust-lang#110350 - SparkyPotato:test-79605, r=cjgillot
724da5c 
Add a UI test for rust-lang#79605

rust-lang#79605 was fixed somewhere between December 2020 and now, but it did not have a UI test.

This PR adds a UI test for the error.
@JohnTitor
Rollup merge of rust-lang#110356 - jyn514:rust-installer-tests, r=ozk…
be2e807 
…anonur

Fix `x test rust-installer` when `cargo` is set to a relative path

Previously, this would give an error because the shell script had a different working directory:

```
test: basic_install
$ sh /home/jyn/src/rust/src/tools/rust-installer/gen-installer.sh --image-dir=/home/jyn/src/rust/src/tools/rust-installer/test/image1 --work-dir=/home/jyn/src/rust/build/x86_64-unknown-linux-gnu/test/rust-installer/workdir --output-dir=/home/jyn/src/rust/build/x86_64-unknown-linux-gnu/test/rust-installer/outdir
/home/jyn/src/rust/src/tools/rust-installer/gen-installer.sh: 15: ../rust3/build/host/stage2-tools-bin/cargo: not found

TEST FAILED!
```
@JohnTitor
Rollup merge of rust-lang#110364 - matthiaskrgr:anti_clone, r=Nilstrieb
99e59db 
remove redundant clones
@JohnTitor
Rollup merge of rust-lang#110366 - matthiaskrgr:compl_123, r=Nilstrieb
a898374 
fix some clippy::complexity

r? `@Nilstrieb`
@rustbot rustbot added the A-meta Area: Issues & PRs about the rust-lang/rust repository itself label Apr 15, 2023
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. T-release Relevant to the release subteam, 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 Apr 15, 2023
@JohnTitor
Copy link
Member Author

JohnTitor commented Apr 15, 2023

@bors r+ rollup=never p=8

@bors
Copy link
Collaborator

bors commented Apr 15, 2023

📌 Commit a898374 has been approved by JohnTitor

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 15, 2023
@bors
Copy link
Collaborator

bors commented Apr 16, 2023

⌛ Testing commit a898374 with merge c6fb7b9...

@bors
Copy link
Collaborator

bors commented Apr 16, 2023

☀️ Test successful - checks-actions
Approved by: JohnTitor
Pushing c6fb7b9 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 16, 2023
@bors bors merged commit c6fb7b9 into rust-lang:master Apr 16, 2023
@rustbot rustbot added this to the 1.71.0 milestone Apr 16, 2023
@rust-timer
Copy link
Collaborator

rust-timer commented Apr 16, 2023

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#110366 6233d2a8697299ea6b64036a5ea4acd74a3d43ce
#110364 e24427e7be972e1f53aa4fc62225f6b06d9fff62
#110356 faa4f44d091b5c4632660b1989b6d91d6c9f5782
#110350 ee0de181593a49be11dd817dd78d0a1d6a9d25f0
#110347 cd1832567b7a013352cef6fd1eceb2860ddd0ae9
#110307 73bea8204d30b6b15f1e7b6879d8e9956327cf6c
#110272 3cb7fedb669d04383f1cb9da572b62f94339fd04
#110033 e5d334a57d25006e6836c8ac1cc6608dda0b38d4

previous master: 50b816f71f

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

@JohnTitor JohnTitor deleted the rollup-ghvdaxm branch April 16, 2023 03:57
@rust-timer
Copy link
Collaborator

rust-timer commented Apr 16, 2023

Finished benchmarking commit (c6fb7b9): 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)		 - - 0
Improvements ✅
(primary)		 -0.6% [-0.6%, -0.6%] 1
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) -0.6% [-0.6%, -0.6%] 1

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)		 2.2% [1.7%, 3.1%] 11
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) 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. T-release Relevant to the release subteam, 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

Milestone

1.71.0

Development

Successfully merging this pull request may close these issues.