Rollup of 9 pull requests #110976

matthiaskrgr · 2023-04-29T05:22:07Z

Successful merges:

Tweak borrow suggestion span #110504 (Tweak borrow suggestion span)
Clear response values for overflow in new solver #110614 (Clear response values for overflow in new solver)
Update tests for libtest --format json #110644 (Update tests for libtest --format json)
Bump libffi-sys to 2.3.0 #110894 (Bump libffi-sys to 2.3.0)
include source error for LoadLibraryExW #110932 (include source error for LoadLibraryExW)
Add support for LibreSSL 3.7.x #110951 (Add support for LibreSSL 3.7.x)
Make sure that some stdlib method signatures aren't accidental refinements #110958 (Make sure that some stdlib method signatures aren't accidental refinements)
Make drop_flags an IndexVec. #110962 (Make drop_flags an IndexVec.)
Don't duplicate anonymous lifetimes for async fn in traits #110965 (Don't duplicate anonymous lifetimes for async fn in traits)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

We really shouldn't be naming functions `fn check_*` unless they're doing *typechecking*. It's especially misleading when we're doing this inside of HIR typeck.

This updates the `openssl-sys` crate to 0.9.87 to support building the toolchain against the system libraries provided by LibreSSL version 3.7.x. LibreSSL 3.7.x has been supported since `openssl-sys` version 0.9.85.

… r=cjgillot Tweak borrow suggestion span Avoids a `span_to_snippet` call when we don't need to surround the expression in parentheses. The fact that the suggestion was using the whole span of the expression rather than just appending a `&` was prevented me from using `// run-rustfix` in another PR (rust-lang#110432 (comment)). Also some drive-by renames of functions that have been annoying me for a bit.

…w-response, r=lcnr Clear response values for overflow in new solver When we have an overflow, return a trivial query response. This fixes an ICE with the code described in rust-lang#110544: ```rust trait Trait {} struct W<T>(T); impl<T, U> Trait for W<(W<T>, W<U>)> where W<T>: Trait, W<U>: Trait, {} fn impls<T: Trait>() {} fn main() { impls::<W<_>>() } ``` Where, while proving `W<?0>: Trait`, we overflow but still apply the query response of `?0 = (W<?1>, W<?2>)`. Then while re-processing the query to validate that our evaluation result was stable, we get a different query response that looks like `?1 = (W<?3>, W<?4>), ?2 = (W<?5>, W<?6>)`, and so we trigger the ICE. Also, by returning a trivial query response we also avoid the infinite-loop/OOM behavior of the old solver. r? `@lcnr`

…sts, r=Mark-Simulacrum Update tests for libtest `--format json` This PR makes the test work on beta and stable, and adds a test ensuring the option is not available on beta and stable. Backported these commits from rust-lang#110414.

…rk-Simulacrum Bump libffi-sys to 2.3.0 Bump libffi-sys to 2.3.0 that includes LoongArch support. Thanks Related: rust-lang/miri#2858

include source error for LoadLibraryExW In rust-lang#107595, we added retry behavior for LoadLibraryExW on Windows. If it fails we do not print the underlying error that Windows returned. This made rust-lang#110889 a little harder to debug. In this PR I am adding the source error in the message if it is available.

…crum Add support for LibreSSL 3.7.x This updates the `openssl-sys` crate to 0.9.87 to support building the toolchain against the system libraries provided by LibreSSL version 3.7.x. LibreSSL 3.7.x has been supported since `openssl-sys` version 0.9.85.

… r=cuviper Make sure that some stdlib method signatures aren't accidental refinements In the process of implementing https://rust-lang.github.io/rfcs/3245-refined-impls.html, I found a bunch of stdlib implementations that accidentally "refined" their method signatures by dropping (unnecessary) bounds. This isn't currently a problem, but may become one if/when method signature refining is stabilized in the future. Shouldn't hurt to make these signatures a bit more accurate anyways. NOTE (just to be clear lol): This does not affect behavior at all, since we don't actually take advantage of refined implementations yet!

…-errors Make drop_flags an IndexVec. Fixes rust-lang#91943

… r=cjgillot Don't duplicate anonymous lifetimes for async fn in traits `record_lifetime_params_for_async` needs to be called outside of the scope of the function, or else it'll end up collecting anonymous lifetimes twice (those on the function and those within the `AnonymousCreateParameter` rib). This matches how `record_lifetime_params_for_async` is being used for functions with bodies below. This fixes (partially) rust-lang#110963 when the lifetimes are late-bound, but does not do so when the lifetimes are early-bound (as seen from the known-bug that I added).

matthiaskrgr · 2023-04-29T05:23:02Z

@bors r+ rollup=never p=9

bors · 2023-04-29T05:23:04Z

📌 Commit e8a3d8c has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-04-29T05:26:00Z

⌛ Testing commit e8a3d8c with merge 927ab3c2f491ec8eff16974a00da72ab6e3d9bbb...

rust-log-analyzer · 2023-04-29T05:40:55Z

The job x86_64-gnu-llvm-14 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


---- [ui] tests/ui/typeck/bad-index-due-to-nested.rs stdout ----
diff of stderr:

36 LL | fn index<'a, K, V>(map: &'a HashMap<K, V>, k: K) -> &'a V {
38 LL |     map[k]
-    |         ^
-    |         |
-    |         |
-    |         expected `&K`, found type parameter `K`
-    |         help: consider borrowing here: `&k`
+    |         ^ expected `&K`, found type parameter `K`
44    = note:   expected reference `&K`
45            found type parameter `K`

+ help: consider borrowing here
+ help: consider borrowing here
+    |
+ LL |     map[&k]
46 
47 error[E0308]: mismatched types
48   --> $DIR/bad-index-due-to-nested.rs:20:5


50 LL | fn index<'a, K, V>(map: &'a HashMap<K, V>, k: K) -> &'a V {
51    |                 - this type parameter               ----- expected `&'a V` because of return type
52 LL |     map[k]
-    |     |
-    |     |
-    |     expected `&V`, found type parameter `V`
-    |     help: consider borrowing here: `&map[k]`
+    |     ^^^^^^ expected `&V`, found type parameter `V`
58    = note:   expected reference `&'a V`
59            found type parameter `V`

+ help: consider borrowing here
+ help: consider borrowing here
+    |
+ LL |     &map[k]
60 
61 error: aborting due to 4 previous errors
62 

---
To only update this specific test, also pass `--test-args typeck/bad-index-due-to-nested.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/typeck/bad-index-due-to-nested.rs" "-Zthreads=1" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--remap-path-prefix=/checkout/tests/ui=fake-test-src-base" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/typeck/bad-index-due-to-nested" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/typeck/bad-index-due-to-nested/auxiliary"
stdout: none
--- stderr -------------------------------
error[E0277]: the trait bound `K: Hash` is not satisfied
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:20:5
LL |     map[k]
LL |     map[k]
   |     ^^^ the trait `Hash` is not implemented for `K`
   |
note: required by a bound in `<HashMap<K, V> as Index<&K>>`
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:9:8
LL |     K: Hash,
LL |     K: Hash,
   |        ^^^^ required by this bound in `<HashMap<K, V> as Index<&K>>`
help: consider restricting type parameter `K`
   |
LL | fn index<'a, K: std::hash::Hash, V>(map: &'a HashMap<K, V>, k: K) -> &'a V {


error[E0277]: the trait bound `V: Copy` is not satisfied
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:20:5
LL |     map[k]
   |     ^^^ the trait `Copy` is not implemented for `V`
   |
   |
note: required by a bound in `<HashMap<K, V> as Index<&K>>`
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:10:8
LL |     V: Copy,
LL |     V: Copy,
   |        ^^^^ required by this bound in `<HashMap<K, V> as Index<&K>>`
help: consider restricting type parameter `V`
   |
LL | fn index<'a, K, V: std::marker::Copy>(map: &'a HashMap<K, V>, k: K) -> &'a V {

error[E0308]: mismatched types
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:20:9
   |
   |
LL | fn index<'a, K, V>(map: &'a HashMap<K, V>, k: K) -> &'a V {
LL |     map[k]
LL |     map[k]
   |         ^ expected `&K`, found type parameter `K`
   = note:   expected reference `&K`
           found type parameter `K`
help: consider borrowing here
   |
   |
LL |     map[&k]
   |         +

error[E0308]: mismatched types
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:20:5
   |
LL | fn index<'a, K, V>(map: &'a HashMap<K, V>, k: K) -> &'a V {
   |                 - this type parameter               ----- expected `&'a V` because of return type
LL |     map[k]
   |     ^^^^^^ expected `&V`, found type parameter `V`
   = note:   expected reference `&'a V`
           found type parameter `V`
help: consider borrowing here
   |

rust-log-analyzer · 2023-04-29T05:44:08Z

The job x86_64-gnu-llvm-14-stage1 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)


---- [ui] tests/ui/typeck/bad-index-due-to-nested.rs stdout ----
diff of stderr:

36 LL | fn index<'a, K, V>(map: &'a HashMap<K, V>, k: K) -> &'a V {
38 LL |     map[k]
-    |         ^
-    |         |
-    |         |
-    |         expected `&K`, found type parameter `K`
-    |         help: consider borrowing here: `&k`
+    |         ^ expected `&K`, found type parameter `K`
44    = note:   expected reference `&K`
45            found type parameter `K`

+ help: consider borrowing here
+ help: consider borrowing here
+    |
+ LL |     map[&k]
46 
47 error[E0308]: mismatched types
48   --> $DIR/bad-index-due-to-nested.rs:20:5


50 LL | fn index<'a, K, V>(map: &'a HashMap<K, V>, k: K) -> &'a V {
51    |                 - this type parameter               ----- expected `&'a V` because of return type
52 LL |     map[k]
-    |     |
-    |     |
-    |     expected `&V`, found type parameter `V`
-    |     help: consider borrowing here: `&map[k]`
+    |     ^^^^^^ expected `&V`, found type parameter `V`
58    = note:   expected reference `&'a V`
59            found type parameter `V`

+ help: consider borrowing here
+ help: consider borrowing here
+    |
+ LL |     &map[k]
60 
61 error: aborting due to 4 previous errors
62 

---
To only update this specific test, also pass `--test-args typeck/bad-index-due-to-nested.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1/bin/rustc" "/checkout/tests/ui/typeck/bad-index-due-to-nested.rs" "-Zthreads=1" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--remap-path-prefix=/checkout/tests/ui=fake-test-src-base" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/typeck/bad-index-due-to-nested" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/typeck/bad-index-due-to-nested/auxiliary"
stdout: none
--- stderr -------------------------------
error[E0277]: the trait bound `K: Hash` is not satisfied
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:20:5
LL |     map[k]
LL |     map[k]
   |     ^^^ the trait `Hash` is not implemented for `K`
   |
note: required by a bound in `<HashMap<K, V> as Index<&K>>`
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:9:8
LL |     K: Hash,
LL |     K: Hash,
   |        ^^^^ required by this bound in `<HashMap<K, V> as Index<&K>>`
help: consider restricting type parameter `K`
   |
LL | fn index<'a, K: std::hash::Hash, V>(map: &'a HashMap<K, V>, k: K) -> &'a V {


error[E0277]: the trait bound `V: Copy` is not satisfied
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:20:5
LL |     map[k]
   |     ^^^ the trait `Copy` is not implemented for `V`
   |
   |
note: required by a bound in `<HashMap<K, V> as Index<&K>>`
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:10:8
LL |     V: Copy,
LL |     V: Copy,
   |        ^^^^ required by this bound in `<HashMap<K, V> as Index<&K>>`
help: consider restricting type parameter `V`
   |
LL | fn index<'a, K, V: std::marker::Copy>(map: &'a HashMap<K, V>, k: K) -> &'a V {

error[E0308]: mismatched types
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:20:9
   |
   |
LL | fn index<'a, K, V>(map: &'a HashMap<K, V>, k: K) -> &'a V {
LL |     map[k]
LL |     map[k]
   |         ^ expected `&K`, found type parameter `K`
   = note:   expected reference `&K`
           found type parameter `K`
help: consider borrowing here
   |
   |
LL |     map[&k]
   |         +

error[E0308]: mismatched types
  --> fake-test-src-base/typeck/bad-index-due-to-nested.rs:20:5
   |
LL | fn index<'a, K, V>(map: &'a HashMap<K, V>, k: K) -> &'a V {
   |                 - this type parameter               ----- expected `&'a V` because of return type
LL |     map[k]
   |     ^^^^^^ expected `&V`, found type parameter `V`
   = note:   expected reference `&'a V`
           found type parameter `V`
help: consider borrowing here
   |

bors · 2023-04-29T05:44:31Z

💔 Test failed - checks-actions

compiler-errors and others added 24 commits April 18, 2023 19:44

Tweak borrow suggestion

4f7b895

Rename some suggestion/note functions

ab99cdf

We really shouldn't be naming functions `fn check_*` unless they're doing *typechecking*. It's especially misleading when we're doing this inside of HIR typeck.

Make suggest_deref_or_ref return a multipart suggestion

cf24419

treat the dev channel as nightly in compiletest

2bf5f77

add support for // unset-exec-env in compiletest

4edba55

update tests for the test harness's json formatting

eb00459

Clear response values for overflow in new solver

5fa8209

Split out make_ambiguous_response_no_constraints

ee89421

Bump libffi-sys to 2.3.0

c7b7248

Add support for LibreSSL 3.7.x

21ae5bd

This updates the `openssl-sys` crate to 0.9.87 to support building the toolchain against the system libraries provided by LibreSSL version 3.7.x. LibreSSL 3.7.x has been supported since `openssl-sys` version 0.9.85.

include source error for LoadLibraryExW

24adb1f

bless line changes in tests-listing-format-json.run.stdout

dc94522

Make sure that signatures aren't accidental refinements

33871c9

Make drop_flags an IndexVec.

7f26191

Don't duplicate anonymous lifetimes for async fn in traits

4e05cfb

Rollup merge of rust-lang#110894 - loongarch-rs:bump-libffi-sys, r=Ma…

f0ebc03

…rk-Simulacrum Bump libffi-sys to 2.3.0 Bump libffi-sys to 2.3.0 that includes LoongArch support. Thanks Related: rust-lang/miri#2858

Rollup merge of rust-lang#110962 - cjgillot:no-hash-drops, r=compiler…

862d50c

…-errors Make drop_flags an IndexVec. Fixes rust-lang#91943

rustbot added the rollup A PR which is a rollup label Apr 29, 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 Apr 29, 2023

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

matthiaskrgr closed this Apr 29, 2023

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 9 pull requests #110976

Rollup of 9 pull requests #110976

matthiaskrgr commented Apr 29, 2023

matthiaskrgr commented Apr 29, 2023

bors commented Apr 29, 2023

bors commented Apr 29, 2023

rust-log-analyzer commented Apr 29, 2023

rust-log-analyzer commented Apr 29, 2023

bors commented Apr 29, 2023

Rollup of 9 pull requests #110976

Rollup of 9 pull requests #110976

Conversation

matthiaskrgr commented Apr 29, 2023

matthiaskrgr commented Apr 29, 2023

bors commented Apr 29, 2023

bors commented Apr 29, 2023

rust-log-analyzer commented Apr 29, 2023

rust-log-analyzer commented Apr 29, 2023

bors commented Apr 29, 2023