Rollup of 9 pull requests #107309

matthiaskrgr · 2023-01-25T21:19:56Z

Successful merges:

Add hint for missing lifetime bound on trait object when type alias is used #105345 (Add hint for missing lifetime bound on trait object when type alias is used)
Tweak E0597 #106897 (Tweak E0597)
Suggest using a lock for *Cell: Sync bounds #106944 (Suggest using a lock for *Cell: Sync bounds)
Bring tests back into rustc source tarball #107239 (Bring tests back into rustc source tarball)
rustdoc: rearrange HTML in primitive reference links #107244 (rustdoc: rearrange HTML in primitive reference links)
add test where we ignore hr implied bounds #107255 (add test where we ignore hr implied bounds)
Delete SimplifyArmIdentity and SimplifyBranchSame mir opts #107256 (Delete SimplifyArmIdentity and SimplifyBranchSame mir opts)
rustdoc: prohibit scroll bar on source viewer in Safari #107266 (rustdoc: prohibit scroll bar on source viewer in Safari)
erica solver: implement builtin Pointee trait impl candidates #107282 (erica solver: implement builtin Pointee trait impl candidates)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

CC rust-lang#99430

… in expression

Suggest using a lock instead.

…s used

They were missing after recent move from src/test to tests.

This patch avoids hard-to-click single character links by making the generic part of the link: Before: <a href="#">&</a>T After: <a href="#">&T</a>

…ckh726 Add hint for missing lifetime bound on trait object when type alias is used Fix issue rust-lang#103582. The problem: When a type alias is used to specify the return type of the method in a trait impl, the suggestion for fixing the problem of "missing lifetime bound on trait object" of the trait impl will not be created. The issue caused by the code which searches for the return trait objects when constructing the hint suggestion is not able to find the trait objects since they are specified in the type alias path instead of the return path of the trait impl. The solution: Trace the trait objects in the type alias path and provide them along with the alias span to generate the suggestion in case the type alias is used in return type of the method in the trait impl.

Tweak E0597 CC rust-lang#99430

…tic, r=WaffleLapkin Suggest using a lock for `*Cell: Sync` bounds I mostly did this for `OnceCell<T>` at first because users will be confused to see that the `OnceCell<T>` in `std` isn't `Sync` but then extended it to `Cell<T>` and `RefCell<T>` as well.

Bring tests back into rustc source tarball They were missing after recent move from src/test to tests. cc ```@albertlarsan68``` Fixes rust-lang#107081

…rence-link, r=GuillaumeGomez rustdoc: rearrange HTML in primitive reference links This patch avoids hard-to-click single character links by making the generic part of the link: Before: <a href="#">&</a>T After: <a href="#">&T</a>

add test where we ignore hr implied bounds r? types

Delete `SimplifyArmIdentity` and `SimplifyBranchSame` mir opts I had attempted to fix the first of these opts in rust-lang#94177 . However, despite that PR already being a full re-write, it still did not fix some of the core soundness issues. The optimizations that are attempted here are likely to be desirable, but I do not expect any of the currently written code to survive into a sound implementation. Deleting the code keeps us from having to maintain the passes in the meantime. Closes rust-lang#77359 , closes rust-lang#72800 , closes rust-lang#78628 r? ```@cjgillot```

…=notriddle rustdoc: prohibit scroll bar on source viewer in Safari Fixes rust-lang#106455.

…s, r=compiler-errors erica solver: implement builtin `Pointee` trait impl candidates r? ```@compiler-errors```

matthiaskrgr · 2023-01-25T21:20:08Z

@bors r+ rollup=never p=9

bors · 2023-01-25T21:20:11Z

📌 Commit a20b86f has been approved by matthiaskrgr

It is now in the queue for this repository.

kadiwa4 · 2023-01-25T21:52:07Z

I thought #107244 made the previous rollup fail? (#107244 (comment))

matthiaskrgr · 2023-01-25T22:08:38Z

So did I, but it turned out to be #107284 🙃

bors · 2023-01-25T23:39:55Z

⌛ Testing commit a20b86f with merge 2a17174...

bors · 2023-01-26T03:10:29Z

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

rust-timer · 2023-01-26T03:13:03Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#107282	b2c3cdf64f23fe682a0b93ceeb7508f8a2ca4cc2
#107266	29ee27134b45553dbd69ce8ad988db900d84401d
#107256	7d192e86c3ddcee722360ebb6cc5e58f8ec69285
#107255	7f37562faa2b16386bb86b19733cef6fdbafcd44
#107244	ea6bf4c925e4487da4de6874b18e83abb24b6168
#107239	ba068b364b1b2ba594a1783a14d5a372a4594e69
#106944	a7f5c0f69bcf76725379242cca403a3e09550f7a
#106897	d18d5f86d5436b97d963a49a302c7956de679991
#105345	3f4f7aa655eda81f352c07023a05ef3ce3e34f73

previous master: c18a5e8a5b

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 · 2023-01-26T05:12:24Z

Finished benchmarking commit (2a17174): 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)	4.4%	[4.4%, 4.4%]	1
Regressions ❌ (secondary)	3.5%	[3.5%, 3.5%]	1
Improvements ✅ (primary)	-2.3%	[-2.3%, -2.3%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	1.1%	[-2.3%, 4.4%]	2

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)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-2.4%	[-2.4%, -2.4%]	1
All ❌✅ (primary)	-	-	0

estebank and others added 25 commits January 15, 2023 19:46

Tweak E0597

656db98

CC rust-lang#99430

Fix fulldeps-ui tests

e4f61af

Account for * when looking for inner-most path in expression

be2ec32

Account for field access when looking for inner-most path in expression

c6111e8

Account for method call and indexing when looking for inner-most path…

7b8251e

… in expression

Add OnceCell<T>: !Sync impl for diagnostics

e1f630f

Add rustc_on_unimplemented on Sync for cell types

6d0c91f

Suggest using a lock instead.

Add hint for missing lifetime bound on trait object when type alias i…

62a1e76

…s used

Bring tests back into rustc source tarball

7f5ce94

They were missing after recent move from src/test to tests.

rustdoc: rearrange HTML in primitive reference links

e65b361

This patch avoids hard-to-click single character links by making the generic part of the link: Before: <a href="#">&</a>T After: <a href="#">&T</a>

add test where we ignore hr implied bounds

e6e93e0

Delete SimplifyArmIdentity and SimplifyBranchSame mir opts

ad73936

rustdoc: prevent scroll bar on source viewer

11a94f2

implement builtin candidate

430dab0

sorry erica

2f924b0

no without_constness

a418e39

Rollup merge of rust-lang#106897 - estebank:issue-99430, r=davidtwco

9e3f330

Tweak E0597 CC rust-lang#99430

Rollup merge of rust-lang#107239 - tmiasko:tests, r=Mark-Simulacrum

b7baa9f

Bring tests back into rustc source tarball They were missing after recent move from src/test to tests. cc ```@albertlarsan68``` Fixes rust-lang#107081

Rollup merge of rust-lang#107255 - lcnr:implied-b-hr, r=oli-obk

c20e0da

add test where we ignore hr implied bounds r? types

Rollup merge of rust-lang#107266 - kadiwa4:source_viewer_scrollbar, r…

f268c7b

…=notriddle rustdoc: prohibit scroll bar on source viewer in Safari Fixes rust-lang#106455.

Rollup merge of rust-lang#107282 - BoxyUwU:erica_builtin_pointee_impl…

a20b86f

…s, r=compiler-errors erica solver: implement builtin `Pointee` trait impl candidates r? ```@compiler-errors```

rustbot added WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Jan 25, 2023

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 Jan 25, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 26, 2023

bors merged commit 2a17174 into rust-lang:master Jan 26, 2023

rustbot added this to the 1.69.0 milestone Jan 26, 2023

matthiaskrgr deleted the rollup-0wgq6be branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #107309

Rollup of 9 pull requests #107309

matthiaskrgr commented Jan 25, 2023

matthiaskrgr commented Jan 25, 2023

bors commented Jan 25, 2023

kadiwa4 commented Jan 25, 2023 •

edited

Loading

matthiaskrgr commented Jan 25, 2023

bors commented Jan 25, 2023

bors commented Jan 26, 2023

rust-timer commented Jan 26, 2023

rust-timer commented Jan 26, 2023

Rollup of 9 pull requests #107309

Rollup of 9 pull requests #107309

Conversation

matthiaskrgr commented Jan 25, 2023

matthiaskrgr commented Jan 25, 2023

bors commented Jan 25, 2023

kadiwa4 commented Jan 25, 2023 • edited Loading

matthiaskrgr commented Jan 25, 2023

bors commented Jan 25, 2023

bors commented Jan 26, 2023

rust-timer commented Jan 26, 2023

rust-timer commented Jan 26, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

kadiwa4 commented Jan 25, 2023 •

edited

Loading