From 218caa410aa38c29984be31a5229b9fa717560ee Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:19:13 +0200 Subject: Merging upstream version 1.68.2+dfsg1. Signed-off-by: Daniel Baumann --- .../ui-fulldeps/fluent-messages/duplicate-a-b.ftl | 1 - .../ui-fulldeps/fluent-messages/duplicate-a.ftl | 1 - .../fluent-messages/label-with-hyphens.ftl | 2 - .../fluent-messages/missing-crate-name.ftl | 2 - .../fluent-messages/missing-message.ftl | 1 - .../fluent-messages/slug-with-hyphens.ftl | 1 - src/test/ui-fulldeps/fluent-messages/test.rs | 98 ---------------------- src/test/ui-fulldeps/fluent-messages/test.stderr | 98 ---------------------- src/test/ui-fulldeps/fluent-messages/valid.ftl | 1 - 9 files changed, 205 deletions(-) delete mode 100644 src/test/ui-fulldeps/fluent-messages/duplicate-a-b.ftl delete mode 100644 src/test/ui-fulldeps/fluent-messages/duplicate-a.ftl delete mode 100644 src/test/ui-fulldeps/fluent-messages/label-with-hyphens.ftl delete mode 100644 src/test/ui-fulldeps/fluent-messages/missing-crate-name.ftl delete mode 100644 src/test/ui-fulldeps/fluent-messages/missing-message.ftl delete mode 100644 src/test/ui-fulldeps/fluent-messages/slug-with-hyphens.ftl delete mode 100644 src/test/ui-fulldeps/fluent-messages/test.rs delete mode 100644 src/test/ui-fulldeps/fluent-messages/test.stderr delete mode 100644 src/test/ui-fulldeps/fluent-messages/valid.ftl (limited to 'src/test/ui-fulldeps/fluent-messages') diff --git a/src/test/ui-fulldeps/fluent-messages/duplicate-a-b.ftl b/src/test/ui-fulldeps/fluent-messages/duplicate-a-b.ftl deleted file mode 100644 index 9407c5170..000000000 --- a/src/test/ui-fulldeps/fluent-messages/duplicate-a-b.ftl +++ /dev/null @@ -1 +0,0 @@ -a_b_key = Value diff --git a/src/test/ui-fulldeps/fluent-messages/duplicate-a.ftl b/src/test/ui-fulldeps/fluent-messages/duplicate-a.ftl deleted file mode 100644 index 9407c5170..000000000 --- a/src/test/ui-fulldeps/fluent-messages/duplicate-a.ftl +++ /dev/null @@ -1 +0,0 @@ -a_b_key = Value diff --git a/src/test/ui-fulldeps/fluent-messages/label-with-hyphens.ftl b/src/test/ui-fulldeps/fluent-messages/label-with-hyphens.ftl deleted file mode 100644 index 016cbeef6..000000000 --- a/src/test/ui-fulldeps/fluent-messages/label-with-hyphens.ftl +++ /dev/null @@ -1,2 +0,0 @@ -label_with_hyphens_some_slug = hi - .label-has-hyphens = test diff --git a/src/test/ui-fulldeps/fluent-messages/missing-crate-name.ftl b/src/test/ui-fulldeps/fluent-messages/missing-crate-name.ftl deleted file mode 100644 index 9bd035c1b..000000000 --- a/src/test/ui-fulldeps/fluent-messages/missing-crate-name.ftl +++ /dev/null @@ -1,2 +0,0 @@ -with-hyphens = 1234 -test-crate_foo = abcd diff --git a/src/test/ui-fulldeps/fluent-messages/missing-message.ftl b/src/test/ui-fulldeps/fluent-messages/missing-message.ftl deleted file mode 100644 index 74b2aa1d4..000000000 --- a/src/test/ui-fulldeps/fluent-messages/missing-message.ftl +++ /dev/null @@ -1 +0,0 @@ -missing_message = diff --git a/src/test/ui-fulldeps/fluent-messages/slug-with-hyphens.ftl b/src/test/ui-fulldeps/fluent-messages/slug-with-hyphens.ftl deleted file mode 100644 index 86ba9a268..000000000 --- a/src/test/ui-fulldeps/fluent-messages/slug-with-hyphens.ftl +++ /dev/null @@ -1 +0,0 @@ -slug_with_hyphens_this-slug-has-hyphens = hi 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>), -} - -/// 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}; -} diff --git a/src/test/ui-fulldeps/fluent-messages/test.stderr b/src/test/ui-fulldeps/fluent-messages/test.stderr deleted file mode 100644 index d1cd4fe26..000000000 --- a/src/test/ui-fulldeps/fluent-messages/test.stderr +++ /dev/null @@ -1,98 +0,0 @@ -error: could not open Fluent resource - --> $DIR/test.rs:25:29 - | -LL | missing_absolute => "/definitely_does_not_exist.ftl", - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: os-specific message - -error: could not open Fluent resource - --> $DIR/test.rs:34:29 - | -LL | missing_relative => "../definitely_does_not_exist.ftl", - | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = note: os-specific message - -error: could not parse Fluent resource - --> $DIR/test.rs:43:28 - | -LL | missing_message => "./missing-message.ftl", - | ^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: see additional errors emitted - -error: expected a message field for "missing_message" - --> ./missing-message.ftl:1:1 - | -1 | missing_message = - | ^^^^^^^^^^^^^^^^^ - | - -error: overrides existing message: `a_b_key` - --> $DIR/test.rs:54:16 - | -LL | a_b => "./duplicate-a-b.ftl", - | ^^^^^^^^^^^^^^^^^^^^^ - | -help: previously defined in this resource - --> $DIR/test.rs:53:14 - | -LL | a => "./duplicate-a.ftl", - | ^^^^^^^^^^^^^^^^^^^ - -error[E0428]: the name `a_b_key` is defined multiple times - --> $DIR/test.rs:51:5 - | -LL | fluent_messages! { - | ^^^^^^^^^^^^^^^^ - | | - | `a_b_key` redefined here - | previous definition of the value `a_b_key` here - | - = note: os-specific message - = note: os-specific message - -error: name `slug_with_hyphens_this-slug-has-hyphens` contains a '-' character - --> $DIR/test.rs:63:30 - | -LL | slug_with_hyphens => "./slug-with-hyphens.ftl", - | ^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: replace any '-'s with '_'s - -error: attribute `label-has-hyphens` contains a '-' character - --> $DIR/test.rs:72:31 - | -LL | label_with_hyphens => "./label-with-hyphens.ftl", - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: replace any '-'s with '_'s - -error: name `with-hyphens` contains a '-' character - --> $DIR/test.rs:91:23 - | -LL | test_crate => "./missing-crate-name.ftl", - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: replace any '-'s with '_'s - -error: name `with-hyphens` does not start with the crate name - --> $DIR/test.rs:91:23 - | -LL | test_crate => "./missing-crate-name.ftl", - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: prepend `test_crate_` to the slug name: `test_crate_with_hyphens` - -error: name `test-crate_foo` contains a '-' character - --> $DIR/test.rs:91:23 - | -LL | test_crate => "./missing-crate-name.ftl", - | ^^^^^^^^^^^^^^^^^^^^^^^^^^ - | - = help: replace any '-'s with '_'s - -error: aborting due to 10 previous errors - -For more information about this error, try `rustc --explain E0428`. diff --git a/src/test/ui-fulldeps/fluent-messages/valid.ftl b/src/test/ui-fulldeps/fluent-messages/valid.ftl deleted file mode 100644 index 549274306..000000000 --- a/src/test/ui-fulldeps/fluent-messages/valid.ftl +++ /dev/null @@ -1 +0,0 @@ -valid_key = Valid! -- cgit v1.2.3