Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 98 deletions

diff --git a/src/test/ui-fulldeps/fluent-messages/test.rs b/src/test/ui-fulldeps/fluent-messages/test.rs
deleted file mode 100644
index 4e8147e2b..000000000
--- a/src/test/ui-fulldeps/fluent-messages/test.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-// normalize-stderr-test "note.*" -> "note: os-specific message"
-
-#![feature(rustc_private)]
-#![crate_type = "lib"]
-
-extern crate rustc_macros;
-use rustc_macros::fluent_messages;
-
-/// Copy of the relevant `DiagnosticMessage` variant constructed by `fluent_messages` as it
-/// expects `crate::DiagnosticMessage` to exist.
-pub enum DiagnosticMessage {
-    FluentIdentifier(std::borrow::Cow<'static, str>, Option<std::borrow::Cow<'static, str>>),
-}
-
-/// Copy of the relevant `SubdiagnosticMessage` variant constructed by `fluent_messages` as it
-/// expects `crate::SubdiagnosticMessage` to exist.
-pub enum SubdiagnosticMessage {
-    FluentAttr(std::borrow::Cow<'static, str>),
-}
-
-mod missing_absolute {
-    use super::fluent_messages;
-
-    fluent_messages! {
-        missing_absolute => "/definitely_does_not_exist.ftl",
-//~^ ERROR could not open Fluent resource
-    }
-}
-
-mod missing_relative {
-    use super::fluent_messages;
-
-    fluent_messages! {
-        missing_relative => "../definitely_does_not_exist.ftl",
-//~^ ERROR could not open Fluent resource
-    }
-}
-
-mod missing_message {
-    use super::fluent_messages;
-
-    fluent_messages! {
-        missing_message => "./missing-message.ftl",
-//~^ ERROR could not parse Fluent resource
-    }
-}
-
-mod duplicate {
-    use super::fluent_messages;
-
-    fluent_messages! {
-//~^ ERROR the name `a_b_key` is defined multiple times
-        a => "./duplicate-a.ftl",
-        a_b => "./duplicate-a-b.ftl",
-//~^ ERROR overrides existing message: `a_b_key`
-    }
-}
-
-mod slug_with_hyphens {
-    use super::fluent_messages;
-
-    fluent_messages! {
-        slug_with_hyphens => "./slug-with-hyphens.ftl",
-//~^ ERROR name `slug_with_hyphens_this-slug-has-hyphens` contains a '-' character
-    }
-}
-
-mod label_with_hyphens {
-    use super::fluent_messages;
-
-    fluent_messages! {
-        label_with_hyphens => "./label-with-hyphens.ftl",
-//~^ ERROR attribute `label-has-hyphens` contains a '-' character
-    }
-}
-
-mod valid {
-    use super::fluent_messages;
-
-    fluent_messages! {
-        valid => "./valid.ftl",
-    }
-
-    use self::fluent_generated::{DEFAULT_LOCALE_RESOURCES, valid_key};
-}
-
-mod missing_crate_name {
-    use super::fluent_messages;
-
-    fluent_messages! {
-        test_crate => "./missing-crate-name.ftl",
-//~^ ERROR name `test-crate_foo` contains a '-' character
-//~| ERROR name `with-hyphens` contains a '-' character
-//~| ERROR name `with-hyphens` does not start with the crate name
-    }
-
-    use self::fluent_generated::{DEFAULT_LOCALE_RESOURCES, test_crate_foo, with_hyphens};
-}