Rollup of 8 pull requests by compiler-errors · Pull Request #100516 · rust-lang/rust

compiler-errors · 2022-08-14T04:06:54Z

Successful merges:

Only point out a single function parameter if we have a single arg incompatibility #99646 (Only point out a single function parameter if we have a single arg incompatibility)
make clean::Item::span return Option instead of dummy span #100299 (make clean::Item::span return Option instead of dummy span)
Rustdoc-Json: Add Path type for traits. #100335 (Rustdoc-Json: Add Path type for traits.)
Suggest the path separator when a dot is used on a trait #100367 (Suggest the path separator when a dot is used on a trait)
Enum variant ctor inherits the stability of the enum variant #100431 (Enum variant ctor inherits the stability of the enum variant)
Suggest removing a semicolon after impl/trait items #100446 (Suggest removing a semicolon after impl/trait items)
Use an extensionless x script for non-Windows #100468 (Use an extensionless x script for non-Windows)
Argument type error improvements #100479 (Argument type error improvements)

Failed merges:

Point to generic or arg if it's the self type of unsatisfied projection predicate #100483 (Point to generic or arg if it's the self type of unsatisfied projection predicate)

r? @ghost
@rustbot modify labels: rollup

…-arg-label, r=estebank Only point out a single function parameter if we have a single arg incompatibility Fixes rust-lang#99635

…triddle make `clean::Item::span` return `Option` instead of dummy span Fixes rust-lang#100283

…=GuillaumeGomez Rustdoc-Json: Add `Path` type for traits. Avoids using `Type` for trait fields, as a trait must always be a path, and not any other kind of type. ``@rustbot`` modify labels: +A-rustdoc-json +T-rustdoc Closes rust-lang#100106

Suggest the path separator when a dot is used on a trait Fixes rust-lang#100365. `@rustbot` label A-diagnostics r? diagnostics

…stab, r=estebank Enum variant ctor inherits the stability of the enum variant Fixes rust-lang#100399 Fixes rust-lang#100420 Context rust-lang#71481 for why enum variants don't need stability

…-after-impl-trait-items, r=compiler-errors Suggest removing a semicolon after impl/trait items fixes rust-lang#99822

Use an extensionless `x` script for non-Windows rust-lang#99992 added `x.sh` and `x.ps1`, but this broke my lazy `./xTAB` habit that used to get me to `./x.py`. If we rename `x.sh` to `x`, then I can adjust to `./xSPACE` for the same number of characters typed. r? `@jyn514`

…r-improvements, r=lcnr Argument type error improvements Motivated by this interesting code snippet: ```rust #[derive(Copy, Clone)] struct Wrapper<T>(T); fn foo(_: fn(i32), _: Wrapper<i32>) {} fn f(_: u32) {} fn main() { let w = Wrapper::<isize>(1isize); foo(f, w); } ``` Which currently errors like: ``` error[E0308]: arguments to this function are incorrect --> src/main.rs:10:5 | 10 | foo(f, w); | ^^^ - - expected `i32`, found `isize` | | | expected `i32`, found `u32` | = note: expected fn pointer `fn(i32)` found fn item `fn(u32) {f}` = note: expected struct `Wrapper<i32>` found struct `Wrapper<isize>` note: function defined here --> src/main.rs:4:4 | 4 | fn foo(_: fn(i32), _: Wrapper<i32>) {} | ^^^ ---------- --------------- ``` Specifically, that double `expected .. found ..` which is very difficult to correlate to the types in the arguments. Also, the fact that "expected `i32`, found `isize`" and the other argument mismatch label don't even really explain what's going on here. After this PR: ``` error[E0308]: arguments to this function are incorrect --> $DIR/two-mismatch-notes.rs:10:5 | LL | foo(f, w); | ^^^ | note: expected fn pointer, found fn item --> $DIR/two-mismatch-notes.rs:10:9 | LL | foo(f, w); | ^ = note: expected fn pointer `fn(i32)` found fn item `fn(u32) {f}` note: expected struct `Wrapper`, found a different struct `Wrapper` --> $DIR/two-mismatch-notes.rs:10:12 | LL | foo(f, w); | ^ = note: expected struct `Wrapper<i32>` found struct `Wrapper<isize>` note: function defined here --> $DIR/two-mismatch-notes.rs:4:4 | LL | fn foo(_: fn(i32), _: Wrapper<i32>) {} | ^^^ ---------- --------------- error: aborting due to previous error For more information about this error, try `rustc --explain E0308`. ``` Yeah, it's a bit verbose, but much clearer IMO. --- Open to discussions about how this could be further improved. Motivated by `@jyn514's` [tweet](https://mobile.twitter.com/joshuayn514/status/1558042020601634816) here.

compiler-errors · 2022-08-14T04:07:09Z

@bors r+ rollup=never p=8

bors · 2022-08-14T04:07:11Z

📌 Commit b3e76aa has been approved by compiler-errors

It is now in the queue for this repository.

bors · 2022-08-14T06:41:02Z

⌛ Testing commit b3e76aa with merge 2fbc08e...

bors · 2022-08-14T09:21:41Z

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing 2fbc08e to master...

rust-timer · 2022-08-14T09:23:58Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#100479	99601b308a21ec5155e34749b5f482793bc19259
#100468	32a8983738d844a4fc2a1bc4be55c7ca7dd9248d
#100446	98a9b810ef4c0dca121e48c9930d88447a77ce44
#100431	902f96f6a76e0c40e7f7f9680e5c2640d81350c3
#100367	6eaa550849ffa26bff38f98c6ffdb99d2e10ce41
#100335	2d300501b31bc4733d50d6150c2bfa011483325e
#100299	e3353e710383ce845fa76625d8035e908e42772f
#99646	6afb416a996f90e346af48809243307f8c004043

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 · 2022-08-14T11:23:38Z

Finished benchmarking commit (2fbc08e): comparison url.

Instruction count

Primary benchmarks: no relevant changes found
Secondary benchmarks: ❌ relevant regression found

	mean¹	max	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.0%	2.0%	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results

Primary benchmarks: ✅ relevant improvements found
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	3.1%	3.1%	2
Improvements ✅ (primary)	-1.5%	-2.2%	2
Improvements ✅ (secondary)	-1.5%	-1.5%	1
All ❌✅ (primary)	-1.5%	-2.2%	2

Cycles

Results

Primary benchmarks: ❌ relevant regression found
Secondary benchmarks: no relevant changes found

	mean¹	max	count²
Regressions ❌ (primary)	3.1%	3.1%	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.1%	3.1%	1

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 ↩ ↩² ↩³

aDotInTheVoid and others added 22 commits August 10, 2022 10:21

Rustdoc-Json: Add Path type for traits.

86bdb3e

Closes rust-lang#100106

Suggest path separator when a dot is used on a trait

0fb4ef6

suggest removing a semicolon after impl/trait items

48c0341

enum variant ctor inherits stability of variant

b821ce6

Check ctor for missing stability

6925f41

Point out a single arg if we have a single arg incompatibility

20121fa

And for closures

262644d

Adjust span of closure param

237cbe9

Address nit

c608918

Use an extensionless x script for non-Windows

de8dedb

use span_suggestion instead of span_suggestion_verbose

d47df26

Label argument coercion errors

b0cd1e1

Do not inline non-simple argument type errors into labels

aa1a07f

make clean::Item::span return option instead of dummy span

752b0e0

Rollup merge of rust-lang#99646 - compiler-errors:arg-mismatch-single…

2af3445

…-arg-label, r=estebank Only point out a single function parameter if we have a single arg incompatibility Fixes rust-lang#99635

Rollup merge of rust-lang#100299 - compiler-errors:issue-100283, r=no…

d496c4e

…triddle make `clean::Item::span` return `Option` instead of dummy span Fixes rust-lang#100283

Rollup merge of rust-lang#100367 - fmease:fix-100365, r=compiler-errors

e248c7f

Suggest the path separator when a dot is used on a trait Fixes rust-lang#100365. `@rustbot` label A-diagnostics r? diagnostics

Rollup merge of rust-lang#100431 - compiler-errors:enum-ctor-variant-…

d46451c

…stab, r=estebank Enum variant ctor inherits the stability of the enum variant Fixes rust-lang#100399 Fixes rust-lang#100420 Context rust-lang#71481 for why enum variants don't need stability

Rollup merge of rust-lang#100446 - TaKO8Ki:suggest-removing-semicolon…

86e1d1e

…-after-impl-trait-items, r=compiler-errors Suggest removing a semicolon after impl/trait items fixes rust-lang#99822

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Aug 14, 2022

bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 14, 2022

bors merged commit 2fbc08e into rust-lang:master Aug 14, 2022

rustbot added this to the 1.65.0 milestone Aug 14, 2022

This was referenced Aug 14, 2022

Parse unnamed struct and union fields #99754

Closed

Update the minimum external LLVM to 13 #100460

Merged

compiler-errors deleted the rollup-fgrfeb3 branch August 11, 2023 20:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 8 pull requests#100516

Rollup of 8 pull requests#100516
bors merged 22 commits intorust-lang:masterfrom
compiler-errors:rollup-fgrfeb3

compiler-errors commented Aug 14, 2022

Uh oh!

compiler-errors commented Aug 14, 2022

Uh oh!

bors commented Aug 14, 2022

Uh oh!

bors commented Aug 14, 2022

Uh oh!

bors commented Aug 14, 2022

Uh oh!

rust-timer commented Aug 14, 2022

Uh oh!

rust-timer commented Aug 14, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Conversation

compiler-errors commented Aug 14, 2022

Uh oh!

compiler-errors commented Aug 14, 2022

Uh oh!

bors commented Aug 14, 2022

Uh oh!

bors commented Aug 14, 2022

Uh oh!

bors commented Aug 14, 2022

Uh oh!

rust-timer commented Aug 14, 2022

Uh oh!

rust-timer commented Aug 14, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants