diff --git a/tests/ui/README.md b/tests/ui/README.md index 237cfb9c4f07..612661dae907 100644 --- a/tests/ui/README.md +++ b/tests/ui/README.md @@ -518,10 +518,6 @@ The `dyn` keyword is used to highlight that calls to methods on the associated T See [`dyn` keyword](https://doc.rust-lang.org/std/keyword.dyn.html). -## `tests/ui/dynamically-sized-types`: Dynamically Sized Types - -**FIXME**: should be coalesced with `tests/ui/dst`. - ## `tests/ui/editions/`: Rust edition-specific peculiarities These tests run in specific Rust editions, such as Rust 2015 or Rust 2018, and check errors and functionality related to specific now-deprecated idioms and features. diff --git a/tests/ui/dynamically-sized-types/dst-coerce-custom.rs b/tests/ui/dst/dst-coerce-custom.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-coerce-custom.rs rename to tests/ui/dst/dst-coerce-custom.rs diff --git a/tests/ui/dynamically-sized-types/dst-coerce-rc.rs b/tests/ui/dst/dst-coerce-rc.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-coerce-rc.rs rename to tests/ui/dst/dst-coerce-rc.rs diff --git a/tests/ui/dynamically-sized-types/dst-coercions.rs b/tests/ui/dst/dst-coercions.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-coercions.rs rename to tests/ui/dst/dst-coercions.rs diff --git a/tests/ui/dynamically-sized-types/dst-coercions.stderr b/tests/ui/dst/dst-coercions.stderr similarity index 100% rename from tests/ui/dynamically-sized-types/dst-coercions.stderr rename to tests/ui/dst/dst-coercions.stderr diff --git a/tests/ui/dynamically-sized-types/dst-deref-mut.rs b/tests/ui/dst/dst-deref-mut.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-deref-mut.rs rename to tests/ui/dst/dst-deref-mut.rs diff --git a/tests/ui/dynamically-sized-types/dst-deref.rs b/tests/ui/dst/dst-deref.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-deref.rs rename to tests/ui/dst/dst-deref.rs diff --git a/tests/ui/dynamically-sized-types/dst-field-align.rs b/tests/ui/dst/dst-field-align.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-field-align.rs rename to tests/ui/dst/dst-field-align.rs diff --git a/tests/ui/dst/dst-index.rs b/tests/ui/dst/dst-index-fail.rs similarity index 100% rename from tests/ui/dst/dst-index.rs rename to tests/ui/dst/dst-index-fail.rs diff --git a/tests/ui/dst/dst-index.stderr b/tests/ui/dst/dst-index-fail.stderr similarity index 85% rename from tests/ui/dst/dst-index.stderr rename to tests/ui/dst/dst-index-fail.stderr index d38af3f89c21..a5481e9ad673 100644 --- a/tests/ui/dst/dst-index.stderr +++ b/tests/ui/dst/dst-index-fail.stderr @@ -1,23 +1,23 @@ error[E0161]: cannot move a value of type `str` - --> $DIR/dst-index.rs:31:5 + --> $DIR/dst-index-fail.rs:31:5 | LL | S[0]; | ^^^^ the size of `str` cannot be statically determined error[E0161]: cannot move a value of type `dyn Debug` - --> $DIR/dst-index.rs:34:5 + --> $DIR/dst-index-fail.rs:34:5 | LL | T[0]; | ^^^^ the size of `dyn Debug` cannot be statically determined error[E0507]: cannot move out of index of `S` - --> $DIR/dst-index.rs:31:5 + --> $DIR/dst-index-fail.rs:31:5 | LL | S[0]; | ^^^^ move occurs because value has type `str`, which does not implement the `Copy` trait error[E0507]: cannot move out of index of `T` - --> $DIR/dst-index.rs:34:5 + --> $DIR/dst-index-fail.rs:34:5 | LL | T[0]; | ^^^^ move occurs because value has type `dyn Debug`, which does not implement the `Copy` trait diff --git a/tests/ui/dynamically-sized-types/dst-index.rs b/tests/ui/dst/dst-index-success.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-index.rs rename to tests/ui/dst/dst-index-success.rs diff --git a/tests/ui/dynamically-sized-types/dst-irrefutable-bind.rs b/tests/ui/dst/dst-irrefutable-bind.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-irrefutable-bind.rs rename to tests/ui/dst/dst-irrefutable-bind.rs diff --git a/tests/ui/dynamically-sized-types/dst-raw.rs b/tests/ui/dst/dst-raw.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-raw.rs rename to tests/ui/dst/dst-raw.rs diff --git a/tests/ui/dynamically-sized-types/dst-struct-sole.rs b/tests/ui/dst/dst-struct-sole.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-struct-sole.rs rename to tests/ui/dst/dst-struct-sole.rs diff --git a/tests/ui/dynamically-sized-types/dst-struct.rs b/tests/ui/dst/dst-struct.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-struct.rs rename to tests/ui/dst/dst-struct.rs diff --git a/tests/ui/dynamically-sized-types/dst-trait.rs b/tests/ui/dst/dst-trait.rs similarity index 100% rename from tests/ui/dynamically-sized-types/dst-trait.rs rename to tests/ui/dst/dst-trait.rs