From 86f1affe5a3a7fe71bc8b59044522c3a6e479b03 Mon Sep 17 00:00:00 2001 From: reddevilmidzy Date: Sun, 8 Feb 2026 13:02:57 +0000 Subject: [PATCH] Move higher-ranked-trait-bounds tests into higher-ranked subdir --- tests/ui/README.md | 4 ---- .../trait-bounds}/higher-trait-bounds-ice-60218.rs | 4 +--- .../trait-bounds}/higher-trait-bounds-ice-60218.stderr | 6 +++--- 3 files changed, 4 insertions(+), 10 deletions(-) rename tests/ui/{higher-ranked-trait-bounds => higher-ranked/trait-bounds}/higher-trait-bounds-ice-60218.rs (81%) rename tests/ui/{higher-ranked-trait-bounds => higher-ranked/trait-bounds}/higher-trait-bounds-ice-60218.stderr (85%) diff --git a/tests/ui/README.md b/tests/ui/README.md index 947949ff7181..5892083771d2 100644 --- a/tests/ui/README.md +++ b/tests/ui/README.md @@ -687,10 +687,6 @@ See: - [Higher-ranked trait bounds | rustc-dev-guide](https://rustc-dev-guide.rust-lang.org/traits/hrtb.html) - [Higher-ranked trait bounds | Nomicon](https://doc.rust-lang.org/nomicon/hrtb.html) -## `tests/ui/higher-ranked-trait-bounds` - -**FIXME**: move to `tests/ui/higher-ranked/trait-bounds` - ## `tests/ui/hygiene/` This seems to have been originally intended for "hygienic macros" - macros which work in all contexts, independent of what surrounds them. However, this category has grown into a mish-mash of many tests that may belong in the other directories. diff --git a/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.rs b/tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.rs similarity index 81% rename from tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.rs rename to tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.rs index d1a4e09243ec..d0d09f11a574 100644 --- a/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.rs +++ b/tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.rs @@ -1,6 +1,4 @@ -// https://github.com/rust-lang/rust/issues/60218 -// Regression test for #60218 -// +// Regression test for https://github.com/rust-lang/rust/issues/60218 // This was reported to cause ICEs. use std::iter::Map; diff --git a/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.stderr b/tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.stderr similarity index 85% rename from tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.stderr rename to tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.stderr index 4c403bcbd601..b02179f14125 100644 --- a/tests/ui/higher-ranked-trait-bounds/higher-trait-bounds-ice-60218.stderr +++ b/tests/ui/higher-ranked/trait-bounds/higher-trait-bounds-ice-60218.stderr @@ -1,5 +1,5 @@ error[E0277]: the trait bound `&u32: Foo` is not satisfied - --> $DIR/higher-trait-bounds-ice-60218.rs:19:19 + --> $DIR/higher-trait-bounds-ice-60218.rs:17:19 | LL | trigger_error(vec![], |x: &u32| x) | ------------- ^^^^^^ the trait `Foo` is not implemented for `&u32` @@ -7,12 +7,12 @@ LL | trigger_error(vec![], |x: &u32| x) | required by a bound introduced by this call | help: this trait has no implementations, consider adding one - --> $DIR/higher-trait-bounds-ice-60218.rs:8:1 + --> $DIR/higher-trait-bounds-ice-60218.rs:6:1 | LL | pub trait Foo {} | ^^^^^^^^^^^^^ note: required by a bound in `trigger_error` - --> $DIR/higher-trait-bounds-ice-60218.rs:14:72 + --> $DIR/higher-trait-bounds-ice-60218.rs:12:72 | LL | pub fn trigger_error(iterable: I, functor: F) | ------------- required by a bound in this function