From 6729e0188b87dcf8672124195359bb61dc5a2b00 Mon Sep 17 00:00:00 2001 From: lcnr Date: Thu, 29 Feb 2024 10:50:20 +0100 Subject: [PATCH] one must imagine tidy happy --- src/tools/tidy/src/issues.txt | 1 - ... ambig-hr-projection-issue-93340.next.stderr} | 16 ++++++++-------- ...> ambig-hr-projection-issue-93340.old.stderr} | 4 ++-- ...0-1.rs => ambig-hr-projection-issue-93340.rs} | 0 ...0-2.rs => rigid-hr-projection-issue-93340.rs} | 0 5 files changed, 10 insertions(+), 11 deletions(-) rename tests/ui/generic-associated-types/{issue-93340-1.next.stderr => ambig-hr-projection-issue-93340.next.stderr} (77%) rename tests/ui/generic-associated-types/{issue-93340-1.old.stderr => ambig-hr-projection-issue-93340.old.stderr} (85%) rename tests/ui/generic-associated-types/{issue-93340-1.rs => ambig-hr-projection-issue-93340.rs} (100%) rename tests/ui/generic-associated-types/{issue-93340-2.rs => rigid-hr-projection-issue-93340.rs} (100%) diff --git a/src/tools/tidy/src/issues.txt b/src/tools/tidy/src/issues.txt index 91bbf5041ff58..0ef962c2df870 100644 --- a/src/tools/tidy/src/issues.txt +++ b/src/tools/tidy/src/issues.txt @@ -1107,7 +1107,6 @@ "ui/generic-associated-types/issue-92954.rs", "ui/generic-associated-types/issue-93141.rs", "ui/generic-associated-types/issue-93262.rs", -"ui/generic-associated-types/issue-93340.rs", "ui/generic-associated-types/issue-93341.rs", "ui/generic-associated-types/issue-93342.rs", "ui/generic-associated-types/issue-93874.rs", diff --git a/tests/ui/generic-associated-types/issue-93340-1.next.stderr b/tests/ui/generic-associated-types/ambig-hr-projection-issue-93340.next.stderr similarity index 77% rename from tests/ui/generic-associated-types/issue-93340-1.next.stderr rename to tests/ui/generic-associated-types/ambig-hr-projection-issue-93340.next.stderr index 0a056c9857aaf..6fe128a29f2dc 100644 --- a/tests/ui/generic-associated-types/issue-93340-1.next.stderr +++ b/tests/ui/generic-associated-types/ambig-hr-projection-issue-93340.next.stderr @@ -1,12 +1,12 @@ error[E0283]: type annotations needed - --> $DIR/issue-93340-1.rs:16:5 + --> $DIR/ambig-hr-projection-issue-93340.rs:16:5 | LL | cmp_eq | ^^^^^^ cannot infer type of the type parameter `A` declared on the function `cmp_eq` | = note: cannot satisfy `_: Scalar` note: required by a bound in `cmp_eq` - --> $DIR/issue-93340-1.rs:9:22 + --> $DIR/ambig-hr-projection-issue-93340.rs:9:22 | LL | fn cmp_eq<'a, 'b, A: Scalar, B: Scalar, O: Scalar>(a: A::RefType<'a>, b: B::RefType<'b>) -> O { | ^^^^^^ required by this bound in `cmp_eq` @@ -16,24 +16,24 @@ LL | cmp_eq:: | +++++++++++ error[E0275]: overflow evaluating the requirement `impl for<'a, 'b> Fn(::RefType<'a>, ::RefType<'b>) -> O == for<'a, 'b> fn(..., ...) -> ... {cmp_eq::<..., ..., ...>}` - --> $DIR/issue-93340-1.rs:16:5 + --> $DIR/ambig-hr-projection-issue-93340.rs:16:5 | LL | cmp_eq | ^^^^^^ | - = help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`issue_93340_1`) + = help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`ambig_hr_projection_issue_93340`) error[E0275]: overflow evaluating the requirement `impl for<'a, 'b> Fn(::RefType<'a>, ::RefType<'b>) -> O == for<'a, 'b> fn(..., ...) -> ... {cmp_eq::<..., ..., ...>}` - --> $DIR/issue-93340-1.rs:16:5 + --> $DIR/ambig-hr-projection-issue-93340.rs:16:5 | LL | cmp_eq | ^^^^^^ | - = help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`issue_93340_1`) + = help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`ambig_hr_projection_issue_93340`) = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no` error[E0275]: overflow evaluating the requirement `for<'a, 'b> fn(::RefType<'a>, <_ as Scalar>::RefType<'b>) -> _ {cmp_eq::} <: ...` - --> $DIR/issue-93340-1.rs:14:51 + --> $DIR/ambig-hr-projection-issue-93340.rs:14:51 | LL | ) -> impl Fn(A::RefType<'_>, B::RefType<'_>) -> O { | ___________________________________________________^ @@ -45,7 +45,7 @@ LL | | LL | | } | |_^ | - = help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`issue_93340_1`) + = help: consider increasing the recursion limit by adding a `#![recursion_limit = "256"]` attribute to your crate (`ambig_hr_projection_issue_93340`) error: aborting due to 4 previous errors diff --git a/tests/ui/generic-associated-types/issue-93340-1.old.stderr b/tests/ui/generic-associated-types/ambig-hr-projection-issue-93340.old.stderr similarity index 85% rename from tests/ui/generic-associated-types/issue-93340-1.old.stderr rename to tests/ui/generic-associated-types/ambig-hr-projection-issue-93340.old.stderr index 8b6ab16bb0a25..df2ec4ab182aa 100644 --- a/tests/ui/generic-associated-types/issue-93340-1.old.stderr +++ b/tests/ui/generic-associated-types/ambig-hr-projection-issue-93340.old.stderr @@ -1,12 +1,12 @@ error[E0283]: type annotations needed - --> $DIR/issue-93340-1.rs:16:5 + --> $DIR/ambig-hr-projection-issue-93340.rs:16:5 | LL | cmp_eq | ^^^^^^ cannot infer type of the type parameter `A` declared on the function `cmp_eq` | = note: cannot satisfy `_: Scalar` note: required by a bound in `cmp_eq` - --> $DIR/issue-93340-1.rs:9:22 + --> $DIR/ambig-hr-projection-issue-93340.rs:9:22 | LL | fn cmp_eq<'a, 'b, A: Scalar, B: Scalar, O: Scalar>(a: A::RefType<'a>, b: B::RefType<'b>) -> O { | ^^^^^^ required by this bound in `cmp_eq` diff --git a/tests/ui/generic-associated-types/issue-93340-1.rs b/tests/ui/generic-associated-types/ambig-hr-projection-issue-93340.rs similarity index 100% rename from tests/ui/generic-associated-types/issue-93340-1.rs rename to tests/ui/generic-associated-types/ambig-hr-projection-issue-93340.rs diff --git a/tests/ui/generic-associated-types/issue-93340-2.rs b/tests/ui/generic-associated-types/rigid-hr-projection-issue-93340.rs similarity index 100% rename from tests/ui/generic-associated-types/issue-93340-2.rs rename to tests/ui/generic-associated-types/rigid-hr-projection-issue-93340.rs