Rollup of 8 pull requests by matthiaskrgr · Pull Request #108586 · rust-lang/rust

matthiaskrgr · 2023-03-01T00:20:27Z

Successful merges:

Exit when there are unmatched delims to avoid noisy diagnostics #108297 (Exit when there are unmatched delims to avoid noisy diagnostics)
rustdoc: Show that repeated expression arrays can be made with constant values #108531 (rustdoc: Show that repeated expression arrays can be made with constant values)
Update books #108536 (Update books)
Remove the capture_disjoint_fields feature #108550 (Remove the capture_disjoint_fields feature)
Descriptive error when users try to combine RPITIT/AFIT with specialization #108551 (Descriptive error when users try to combine RPITIT/AFIT with specialization)
Only look for param in item's generics if it actually comes from generics #108554 (Only look for param in item's generics if it actually comes from generics)
Fix a race in the query system #108555 (Fix a race in the query system)
add missing feature in core/tests #108558 (add missing feature in core/tests)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

…zation

…, r=petrochenkov Exit when there are unmatched delims to avoid noisy diagnostics From rust-lang#104012 (comment) r? ``@petrochenkov``

…, r=thomcc rustdoc: Show that repeated expression arrays can be made with constant values The [rust reference](https://doc.rust-lang.org/reference/expressions/array-expr.html) currently says that repeated values for arrays can be constant or `Copy` > repeat operand is [Copy](https://doc.rust-lang.org/reference/special-types-and-traits.html#copy) or that it must be a [path](https://doc.rust-lang.org/reference/expressions/path-expr.html) to a constant item This updates the rust documentation on primitive arrays to reflect what the rust reference says (and also compiler suggestions if you do not use a `const` item)

Update books ## rust-lang/book 1 commits in d94e03a18a2590ed3f1c67b859cb11528d2a2d5c..21a2ed14f4480dab62438dcc1130291bebc65379 2023-02-13 19:45:29 UTC to 2023-02-13 19:45:29 UTC - Removed "," typo on ch03-01 line 85 (rust-lang/book#3537) ## rust-lang/reference 1 commits in e5adb99c04817b7fbe08f4ffce5b36702667345f..a9afb04b47a84a6753e4dc657348c324c876102c 2023-02-14 14:57:15 UTC to 2023-02-14 14:57:15 UTC - Document the `efiapi` ABI (rust-lang/reference#1309) ## rust-lang/rust-by-example 1 commits in efe23c4fe12e06351b8dc8c3d18312c761455109..af0998b7473839ca75563ba3d3e7fd0160bef235 2023-02-15 18:17:20 UTC to 2023-02-15 18:17:20 UTC - Typographical mistake in tuples.md (rust-lang/rust-by-example#1685) ## rust-lang/rustc-dev-guide 30 commits in 41a96ab..b06dab8 2023-02-26 22:30:52 UTC to 2023-02-14 05:16:01 UTC - Fixed typing errors (rust-lang/rustc-dev-guide#1622) - this remains true (rust-lang/rustc-dev-guide#1620) - diagnostics: small fixes/improvements (rust-lang/rustc-dev-guide#1618) - typo (rust-lang/rustc-dev-guide#1616) - typo (rust-lang/rustc-dev-guide#1617) - keep "grey area" lint summary green (rust-lang/rustc-dev-guide#1619) - new solver: write canonicalization chapter (rust-lang/rustc-dev-guide#1595) - bootstrap now creates a usable toolchain when building stage0 std (rust-lang/rustc-dev-guide#1615) - llvm 13 is now not supported (rust-lang/rustc-dev-guide#1612) - enable AND search (rust-lang/rustc-dev-guide#1607) - Vetting deps datecheck (rust-lang/rustc-dev-guide#1614) - mention Dev desktops, to help with LLVM builds (rust-lang/rustc-dev-guide#1613) - fix and clarify llvm bugfix policy (rust-lang/rustc-dev-guide#1611) - lower-case "Compiler" in headings, for consistency (and looks) (rust-lang/rustc-dev-guide#1605) - Explain what the rest of the backend agnostic page is about (rust-lang/rustc-dev-guide#1609) - Bump dependencies to fix CI (rust-lang/rustc-dev-guide#1610) - rustc_codegen_ssa feels permanent enough not to need date-check (rust-lang/rustc-dev-guide#1606) - make use of the `host` symlink in the build directory, to ease things (rust-lang/rustc-dev-guide#1608) - have checkboxes only point to date-check lines in files (rust-lang/rustc-dev-guide#1603) - remove stray text (rust-lang/rustc-dev-guide#1604) - Typo (rust-lang/rustc-dev-guide#1601) - Typo (rust-lang/rustc-dev-guide#1602) - Add link to vscode settings in Rust repo (rust-lang/rustc-dev-guide#1591) - avoid code duplication by including files in docs (rust-lang/rustc-dev-guide#1598) - howto run the examples (rust-lang/rustc-dev-guide#1593) - Add sample CodeLLDB launch.json (rust-lang/rustc-dev-guide#1482) - typo (rust-lang/rustc-dev-guide#1600) - use actual names (rust-lang/rustc-dev-guide#1594) - Fix a typo (rust-lang/rustc-dev-guide#1597) - Add Neovim configuration information (rust-lang/rustc-dev-guide#1545)

…ler-errors Remove the `capture_disjoint_fields` feature As best I can tell, this was stabilized for Edition 2021 in rust-lang#88126 but the feature was never removed.

…=oli-obk Descriptive error when users try to combine RPITIT/AFIT with specialization Previously we failed with some esoteric error like: ``` error[E0053]: method `foo` has an incompatible type for trait --> $DIR/dont-project-to-specializable-projection.rs:14:35 | LL | default async fn foo(_: T) -> &'static str { | ^^^^^^^^^^^^ expected associated type, found future | note: type in trait --> $DIR/dont-project-to-specializable-projection.rs:10:27 | LL | async fn foo(_: T) -> &'static str; | ^^^^^^^^^^^^ = note: expected signature `fn(_) -> impl Future<Output = &'static str>` found signature `fn(_) -> impl Future<Output = &'static str>` ``` Now we error like: ``` error: async associated function in trait cannot be specialized --> $DIR/dont-project-to-specializable-projection.rs:14:5 | LL | default async fn foo(_: T) -> &'static str { | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | = note: specialization behaves in inconsistent and surprising ways with `#![feature(async_fn_in_trait)]`, and for now is disallowed ```

…default, r=oli-obk Only look for param in item's generics if it actually comes from generics Record whether a `hir::GenericParam` comes from an item's generics, or from a `for<...>` binder. Then, only look for the param in `object_lifetime_default` if it actually comes from the item's generics. Fixesrust-lang#108177

Fix a race in the query system This fixes an issue where in between the `job` removal and `complete` call the query neither has a job nor a result, allowing another thread to start executing it again. r? ``@cjgillot``

add missing feature in core/tests rust-lang#104265 introduced the `ip_in_core` feature. For some reason core tests seem to still build without that feature -- no idea how that is possible. Might be related to rust-lang#15702? I was under the impression that `pub use` with different stability doesn't actually work. That's why `intrinsics::transmute` is stable, for example. Either way, core tests fail to build in miri-test-libstd, and adding the feature fixes that. r? ```@thomcc```

matthiaskrgr · 2023-03-01T00:20:59Z

@bors r+ rollup=never p=8

bors · 2023-03-01T00:21:01Z

📌 Commit 3abc41a has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-03-01T03:11:47Z

⌛ Testing commit 3abc41a with merge 5983a3a...

bors · 2023-03-01T06:22:59Z

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

rust-timer · 2023-03-01T06:25:20Z

📌 Perf builds for each rolled up PR:

PR#	Perf Build Sha
#108558	aebb2a977ce22614d5c3ca4875f6d3453ab0ba7b
#108555	c1e6f2f9384590e312d85e9c2d08a12287899eb6
#108554	d2dbe105a9ada89cb369b1c9bf61b7d0bda4a2ef
#108551	b15ef7f46515cd4139514af33eea7021b28283c0
#108550	3320954f759a4578767be4e7ce4cf284b1f544d3
#108536	d523ad136d7e4eb74f7d4008894ebe48fd7651d5
#108531	c29ea9c1e2c3f5707c9b96a4275727dd10ee0656
#108297	c94697b3b05b1c17ff62dda3eb2160c20ab85c19

previous master: ca1bc7f1f6

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-03-01T08:23:34Z

Finished benchmarking commit (5983a3a): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	0.9%	[0.9%, 0.9%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

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)	2.4%	[1.8%, 3.0%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-1.9%	[-3.1%, -0.8%]	2
All ❌✅ (primary)	-	-	0

Cycles

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

Coca162and others added 21 commits February 27, 2023 13:51

Update docs to show [expr; N] can repeat const expr
dc97326

Clarify that Copy is a trait in array docs
22b65fc

Update books
8732fcd

Remove the capture_disjoint_fields feature
f83ce99

Descriptive error when users try to combine RPITIT/AFIT with speciali…
ecac8fd
…zation

Only look for param in generics if it actually comes from generics
f851a8a

Fix a race in the query system
10b08e3

Exit when there are unmatched delims to avoid noisy diagnostics
f01d0c0

remove duplicated diagnostic for unclosed delimiter
65ad5f8

rename unmatched_braces to unmatched_delims
9ce7472

no need to return unmatched_delims from tokentrees
88de2e1

refactor parse_token_trees to not return unmatched_delims
f808877

add missing feature in core/tests
229aef1

Rollup merge ofrust-lang#108297- chenyukang:yukang/delim-error-exit…
371904b
…, r=petrochenkov Exit when there are unmatched delims to avoid noisy diagnostics From rust-lang#104012 (comment) r? ``@petrochenkov``

Rollup merge ofrust-lang#108550- clubby789:remove-disjoint, r=compi…
78f9bb1
…ler-errors Remove the `capture_disjoint_fields` feature As best I can tell, this was stabilized for Edition 2021 in rust-lang#88126 but the feature was never removed.

Rollup merge ofrust-lang#108555- Zoxc:par-fix, r=cjgillot
a51006b
Fix a race in the query system This fixes an issue where in between the `job` removal and `complete` call the query neither has a job nor a result, allowing another thread to start executing it again. r? ``@cjgillot``

bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 1, 2023

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 1, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 1, 2023

bors merged commit 5983a3a into rust-lang:masterMar 1, 2023

rustbot added this to the 1.69.0 milestone Mar 1, 2023

This was referenced Mar 1, 2023
Fake capture closures if typeck results are empty #100452
Closed
Remove box_syntax#108471
Merged
Make associated_item_def_ids for traits use an unstable option to also return associated types for RPITITs #108568
Merged

matthiaskrgr deleted the rollup-ry9u2ou branch March 16, 2024 18:19

Navigation Menu

Uh oh!

Uh oh!

Rollup of 8 pull requests - #108586

Rollup of 8 pull requests#108586
bors merged 21 commits into
rust-lang:masterfrom
matthiaskrgr:rollup-ry9u2ou

matthiaskrgr commented Mar 1, 2023

Uh oh!

matthiaskrgr commented Mar 1, 2023

Uh oh!

bors commented Mar 1, 2023

Uh oh!

bors commented Mar 1, 2023

Uh oh!

bors commented Mar 1, 2023

Uh oh!

rust-timer commented Mar 1, 2023

Uh oh!

rust-timer commented Mar 1, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Uh oh!

Conversation

matthiaskrgr commented Mar 1, 2023

Uh oh!

matthiaskrgr commented Mar 1, 2023

Uh oh!

bors commented Mar 1, 2023

Uh oh!

bors commented Mar 1, 2023

Uh oh!

bors commented Mar 1, 2023

Uh oh!

rust-timer commented Mar 1, 2023

Uh oh!

rust-timer commented Mar 1, 2023

Overall result: ❌ regressions - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants