Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 10 pull requests #100902

Closed
wants to merge 26 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jackh726 and others added 26 commits August 9, 2022 20:23
Rustfmt is no longer tracked in toolstate, so this isn't necessary.
They have not been involved in a while.
When running `x.py dist`, rustfmt was being allowed to fail when
missing-tools is true. This isn't much of an issue in practice
since other CI jobs will fail if rustfmt fails. This code was just
leftovers from when rustfmt was tracked in toolstate, and this removes
it to make it clear that it no longer works that way.
…r=compiler-errors

Make the GATS self outlives error take into GATs in the inputs

Before, the reasoning was that outlives should factor in to the outlives error, because that value is produced and inputs aren't. However, this is potentially confusing, and we can just require this for now and relax it later if we need. GATs in where clauses still don't count for the self outlives error, and I've added a test for that.

This now errors:
```rust
trait Input {
    type Item<'a>;
    //~^ missing required
    fn takes_item<'a>(&'a self, item: Self::Item<'a>);
}
```

I've also added a test that this does not:
```rust
trait WhereClause {
    type Item<'a>;
    fn takes_item<'a>(&'a self) where Self::Item<'a>: ;
}
```

r? `@compiler-errors`
…tch-err, r=oli-obk

Improve const mismatch `FulfillmentError`

Fixes rust-lang#100414
…icolon-before-item, r=compiler-errors

Suggest adding a missing semicolon before an item

fixes rust-lang#100533
…oli-obk

Add the armv4t-none-eabi target to the supported_targets

This target was added in rust-lang#100244 but forgot to add it to the macro in the `mod.rs` file.

`@Lokathor`
…storino

Use separate infcx to solve obligations during negative coherence

I feel like I fixed this already but I may have fixed it then forgot to push the branch...

Also fixes up some redundant param-envs being passed around (since they're already passed around in the `Obligation`)

Fixes rust-lang#99662

r? `@spastorino`
Some small bootstrap cleanup

This is a collection of a few small cleanups. See commits for more details.

* Remove some unused fields from the tool_extended macro.
* Remove rustfmt from publish_toolstate.
* Remove Steve from toolstate failure notices.
* Don't allow rustfmt to fail on dist.
…acrum

tidy: remove crossbeam-utils

crossbeam-utils is no longer needed now that scoped threads are available in 1.63.
…nup, r=fee1-dead

Refactor part of codegen_call_terminator

I was reading through this code and found the chain of `if let` and a nested match on the same value that was matched in the `if let` to be kind of hard to follow. This PR cleans it up by flattening the `if let` chain and nested match into a single `match` expression.
Remove out-of-context comment in `mem::MaybeUninit` documentation

Reverted the comment to an earlier version to avoid confusion: neither raw pointer assignment nor `ptr::write` is used inside the for loop.
@rustbot rustbot added 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. rollup A PR which is a rollup labels Aug 23, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=10

@bors
Copy link
Contributor

bors commented Aug 23, 2022

📌 Commit b1ad44c has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors 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 23, 2022
@rust-log-analyzer
Copy link
Collaborator

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

Click to see the possible cause of the failure (guessed by this bot)
........................................................................................ 1848/13426
........................................................................................ 1936/13426
.................................i...................................................... 2024/13426
........................................................................................ 2112/13426
..F.............................F.............................F......................... 2200/13426
.....................................................................................F.. 2288/13426
......F................................................................................. 2376/13426
........................................................................................ 2552/13426
........................................................................................ 2640/13426
........................................................................................ 2728/13426
........................................................................................ 2816/13426
---
---- [ui] src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs stdout ----
diff of stderr:

24    |
25    = note: expected constant `{ N as u128 }`
26               found constant `{ O as u128 }`
- note: required by a bound in `use_trait_impl::assert_impl`
-   --> $DIR/abstract-const-as-cast-3.rs:14:23
-    |
- LL |     fn assert_impl<T: Trait>() {}
-    |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
33 error: unconstrained generic constant
34   --> $DIR/abstract-const-as-cast-3.rs:20:19

56    |
56    |
57    = note: expected constant `{ N as _ }`
58               found constant `{ O as u128 }`
- note: required by a bound in `use_trait_impl::assert_impl`
-   --> $DIR/abstract-const-as-cast-3.rs:14:23
-    |
- LL |     fn assert_impl<T: Trait>() {}
-    |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
65 error[E0308]: mismatched types
66   --> $DIR/abstract-const-as-cast-3.rs:23:5

70    |
70    |
71    = note: expected constant `12`
72               found constant `13`
- note: required by a bound in `use_trait_impl::assert_impl`
-   --> $DIR/abstract-const-as-cast-3.rs:14:23
-    |
- LL |     fn assert_impl<T: Trait>() {}
-    |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
79 error[E0308]: mismatched types
80   --> $DIR/abstract-const-as-cast-3.rs:25:5

84    |
84    |
85    = note: expected constant `13`
86               found constant `14`
- note: required by a bound in `use_trait_impl::assert_impl`
-   --> $DIR/abstract-const-as-cast-3.rs:14:23
-    |
- LL |     fn assert_impl<T: Trait>() {}
-    |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
93 error: unconstrained generic constant
94   --> $DIR/abstract-const-as-cast-3.rs:35:19

116    |
116    |
117    = note: expected constant `{ N as u128 }`
118               found constant `{ O as u128 }`
- note: required by a bound in `use_trait_impl_2::assert_impl`
-   --> $DIR/abstract-const-as-cast-3.rs:32:23
-    |
- LL |     fn assert_impl<T: Trait>() {}
-    |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
125 error: unconstrained generic constant
126   --> $DIR/abstract-const-as-cast-3.rs:38:19

148    |
148    |
149    = note: expected constant `{ N as _ }`
150               found constant `{ O as u128 }`
- note: required by a bound in `use_trait_impl_2::assert_impl`
-   --> $DIR/abstract-const-as-cast-3.rs:32:23
-    |
- LL |     fn assert_impl<T: Trait>() {}
-    |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
157 error[E0308]: mismatched types
158   --> $DIR/abstract-const-as-cast-3.rs:41:5

162    |
162    |
163    = note: expected constant `12`
164               found constant `13`
- note: required by a bound in `use_trait_impl_2::assert_impl`
-   --> $DIR/abstract-const-as-cast-3.rs:32:23
-    |
- LL |     fn assert_impl<T: Trait>() {}
-    |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
171 error[E0308]: mismatched types
172   --> $DIR/abstract-const-as-cast-3.rs:43:5

176    |
176    |
Some tests failed in compiletest suite=ui mode=ui host=x86_64-unknown-linux-gnu target=x86_64-unknown-linux-gnu
177    = note: expected constant `13`
178               found constant `14`
- note: required by a bound in `use_trait_impl_2::assert_impl`
-   --> $DIR/abstract-const-as-cast-3.rs:32:23
-    |
- LL |     fn assert_impl<T: Trait>() {}
-    |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
185 error: aborting due to 12 previous errors
186 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3/abstract-const-as-cast-3.stderr
To only update this specific test, also pass `--test-args const-generics/generic_const_exprs/abstract-const-as-cast-3.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3" "-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/const-generics/generic_const_exprs/abstract-const-as-cast-3/auxiliary"
stdout: none
--- stderr -------------------------------
error: unconstrained generic constant
   |
   |
LL |     assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as u128 }>>();
   |
   |
   = help: try adding a `where` bound using this expression: `where [(); { O as u128 }]:`
note: required for `HasCastInTraitImpl<{ N + 1 }, { N as u128 }>` to implement `Trait`
   |
   |
LL | impl<const O: usize> Trait for HasCastInTraitImpl<O, { O as u128 }> {}
note: required by a bound in `use_trait_impl::assert_impl`
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:14:23
   |
   |
LL |     fn assert_impl<T: Trait>() {}
   |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
error[E0308]: mismatched types
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:17:5
   |
   |
LL |     assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as u128 }>>();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `{ N as u128 }`, found `{ O as u128 }`
   |
   = note: expected constant `{ N as u128 }`
              found constant `{ O as u128 }`
error: unconstrained generic constant
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:20:19
   |
   |
LL |     assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as _ }>>();
   |
   |
   = help: try adding a `where` bound using this expression: `where [(); { O as u128 }]:`
note: required for `HasCastInTraitImpl<{ N + 1 }, { N as _ }>` to implement `Trait`
   |
   |
LL | impl<const O: usize> Trait for HasCastInTraitImpl<O, { O as u128 }> {}
note: required by a bound in `use_trait_impl::assert_impl`
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:14:23
   |
   |
LL |     fn assert_impl<T: Trait>() {}
   |                       ^^^^^ required by this bound in `use_trait_impl::assert_impl`
error[E0308]: mismatched types
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:20:5
   |
   |
LL |     assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as _ }>>();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `{ N as _ }`, found `{ O as u128 }`
   |
   = note: expected constant `{ N as _ }`
              found constant `{ O as u128 }`
error[E0308]: mismatched types
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:23:5
   |
   |
LL |     assert_impl::<HasCastInTraitImpl<13, { 12 as u128 }>>();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `12`, found `13`
   = note: expected constant `12`
              found constant `13`

error[E0308]: mismatched types
error[E0308]: mismatched types
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:25:5
   |
LL |     assert_impl::<HasCastInTraitImpl<14, 13>>();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `13`, found `14`
   = note: expected constant `13`
              found constant `14`

error: unconstrained generic constant
error: unconstrained generic constant
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:35:19
   |
LL |     assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as u128 }>>();
   |
   |
   = help: try adding a `where` bound using this expression: `where [(); { O as u128 }]:`
note: required for `HasCastInTraitImpl<{ N + 1 }, { N as u128 }>` to implement `Trait`
   |
   |
LL | impl<const O: usize> Trait for HasCastInTraitImpl<O, { O as u128 }> {}
   |                      ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: required by a bound in `use_trait_impl_2::assert_impl`
   |
   |
LL |     fn assert_impl<T: Trait>() {}
   |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
error[E0308]: mismatched types
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:35:5
   |
   |
LL |     assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as u128 }>>();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `{ N as u128 }`, found `{ O as u128 }`
   |
   = note: expected constant `{ N as u128 }`
              found constant `{ O as u128 }`
error: unconstrained generic constant
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:38:19
   |
   |
LL |     assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as _ }>>();
   |
   |
   = help: try adding a `where` bound using this expression: `where [(); { O as u128 }]:`
note: required for `HasCastInTraitImpl<{ N + 1 }, { N as _ }>` to implement `Trait`
   |
   |
LL | impl<const O: usize> Trait for HasCastInTraitImpl<O, { O as u128 }> {}
   |                      ^^^^^     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
note: required by a bound in `use_trait_impl_2::assert_impl`
   |
   |
LL |     fn assert_impl<T: Trait>() {}
   |                       ^^^^^ required by this bound in `use_trait_impl_2::assert_impl`
error[E0308]: mismatched types
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:38:5
   |
   |
LL |     assert_impl::<HasCastInTraitImpl<{ N + 1 }, { N as _ }>>();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `{ N as _ }`, found `{ O as u128 }`
   |
   = note: expected constant `{ N as _ }`
              found constant `{ O as u128 }`
error[E0308]: mismatched types
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:41:5
   |
   |
LL |     assert_impl::<HasCastInTraitImpl<13, { 12 as u128 }>>();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `12`, found `13`
   = note: expected constant `12`
              found constant `13`

error[E0308]: mismatched types
error[E0308]: mismatched types
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/abstract-const-as-cast-3.rs:43:5
   |
LL |     assert_impl::<HasCastInTraitImpl<14, 13>>();
   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected `13`, found `14`
   = note: expected constant `13`
              found constant `14`

error: aborting due to 12 previous errors
---
24               found constant `true`
- note: required by a bound in `Arr`
-   --> $DIR/issue-72819-generic-in-const-eval.rs:8:39
-    |
- LL | struct Arr<const N: usize>
-    |        --- required by a bound in this
- LL | where Assert::<{N < usize::MAX / 2}>: IsTrue,
-    |                                       ^^^^^^ required by this bound in `Arr`
33 error: aborting due to 2 previous errors
34 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.full/issue-72819-generic-in-const-eval.full.stderr
To only update this specific test, also pass `--test-args const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.rs`


error in revision `full`: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--cfg" "full" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.full" "-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/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.full/auxiliary"
stdout: none
--- stderr -------------------------------
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.rs:20:12
   |
   |
LL |     let x: Arr<{usize::MAX}> = Arr {};
   |            ^^^^^^^^^^^^^^^^^ expected `false`, found `true`
   = note: expected constant `false`
              found constant `true`
note: required by a bound in `Arr`
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.rs:8:39
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.rs:8:39
   |
LL | struct Arr<const N: usize>
   |        --- required by a bound in this
LL | where Assert::<{N < usize::MAX / 2}>: IsTrue,
   |                                       ^^^^^^ required by this bound in `Arr`
error[E0308]: mismatched types
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/issue-72819-generic-in-const-eval.rs:20:32
   |
   |
LL |     let x: Arr<{usize::MAX}> = Arr {};
   |                                ^^^ expected `false`, found `true`
   = note: expected constant `false`
              found constant `true`

error: aborting due to 2 previous errors
error: aborting due to 2 previous errors

For more information about this error, try `rustc --explain E0308`.
------------------------------------------


---- [ui] src/test/ui/const-generics/generic_const_exprs/obligation-cause.rs stdout ----

6    |
7    = note: expected constant `false`
8               found constant `true`
8               found constant `true`
- note: required by a bound in `g`
-   --> $DIR/obligation-cause.rs:13:44
-    |
- LL | fn g<T>()
- ...
- ...
- LL |     Is<{ std::mem::size_of::<T>() == 0 }>: True,
-    |                                            ^^^^ required by this bound in `g`
18 error: aborting due to previous error
19 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/generic_const_exprs/obligation-cause/obligation-cause.stderr
To only update this specific test, also pass `--test-args const-generics/generic_const_exprs/obligation-cause.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/generic_const_exprs/obligation-cause.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/generic_const_exprs/obligation-cause" "-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/const-generics/generic_const_exprs/obligation-cause/auxiliary"
stdout: none
--- stderr -------------------------------
  --> /checkout/src/test/ui/const-generics/generic_const_exprs/obligation-cause.rs:20:5
   |
   |
LL |     g::<usize>();
   |     ^^^^^^^^^^ expected `false`, found `true`
   = note: expected constant `false`
              found constant `true`

error: aborting due to previous error
---
25               found constant `true`
- note: required by a bound in `Arr`
-   --> $DIR/issue-73260.rs:6:37
-    |
- LL | struct Arr<const N: usize>
- LL | where
- LL | where
- LL |     Assert::<{N < usize::MAX / 2}>: IsTrue,
-    |                                     ^^^^^^ required by this bound in `Arr`
35 error: aborting due to 2 previous errors
36 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/issues/issue-73260/issue-73260.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args const-generics/issues/issue-73260.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/issues/issue-73260.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/issues/issue-73260" "-A" "unused" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-Zsave-analysis" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/issues/issue-73260/auxiliary"
stdout: none
--- stderr -------------------------------
  --> /checkout/src/test/ui/const-generics/issues/issue-73260.rs:16:12
   |
   |
LL |     let x: Arr<{usize::MAX}> = Arr {};
   |            ^^^^^^^^^^^^^^^^^ expected `false`, found `true`
   = note: expected constant `false`
              found constant `true`
note: required by a bound in `Arr`
  --> /checkout/src/test/ui/const-generics/issues/issue-73260.rs:6:37
  --> /checkout/src/test/ui/const-generics/issues/issue-73260.rs:6:37
   |
LL | struct Arr<const N: usize>
LL | where
LL | where
LL |     Assert::<{N < usize::MAX / 2}>: IsTrue,
   |                                     ^^^^^^ required by this bound in `Arr`
error[E0308]: mismatched types
  --> /checkout/src/test/ui/const-generics/issues/issue-73260.rs:16:32
   |
   |
LL |     let x: Arr<{usize::MAX}> = Arr {};
   |                                ^^^ expected `false`, found `true`
   = note: expected constant `false`
              found constant `true`

error: aborting due to 2 previous errors
---
8               found constant `false`
- note: required by a bound in `requires_distinct`
-   --> $DIR/issue-79674.rs:23:37
-    |
- LL | fn requires_distinct<A, B>(_a: A, _b: B) where
-    |    ----------------- required by a bound in this
- LL |     A: MiniTypeId, B: MiniTypeId,
- LL |     Lift<{is_same_type::<A, B>()}>: IsFalse {}
-    |                                     ^^^^^^^ required by this bound in `requires_distinct`
18 error: aborting due to previous error
19 



The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/issues/issue-79674/issue-79674.stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args const-generics/issues/issue-79674.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/const-generics/issues/issue-79674.rs" "-Zthreads=1" "--target=x86_64-unknown-linux-gnu" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Cstrip=debuginfo" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/const-generics/issues/issue-79674" "-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/const-generics/issues/issue-79674/auxiliary"
stdout: none
--- stderr -------------------------------
  --> /checkout/src/test/ui/const-generics/issues/issue-79674.rs:26:5
   |
   |
LL |     requires_distinct("str", 12);
   |     ^^^^^^^^^^^^^^^^^ expected `true`, found `false`
   = note: expected constant `true`
              found constant `false`

error: aborting due to previous error

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.