From 00fec76ab53896c37eb584bc567d9a06865d0e17 Mon Sep 17 00:00:00 2001
From: Xiretza <xiretza@xiretza.xyz>
Date: Wed, 17 Aug 2022 11:35:17 +0200
Subject: [PATCH 1/2] tidy: check fluent files for style

---
 .../locales/en-US/borrowck.ftl                    |  4 ++--
 .../rustc_error_messages/locales/en-US/expand.ftl |  6 +++---
 src/tools/tidy/src/style.rs                       | 15 ++++++---------
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/compiler/rustc_error_messages/locales/en-US/borrowck.ftl b/compiler/rustc_error_messages/locales/en-US/borrowck.ftl
index 4af40d2062d3a..93224f843fbae 100644
--- a/compiler/rustc_error_messages/locales/en-US/borrowck.ftl
+++ b/compiler/rustc_error_messages/locales/en-US/borrowck.ftl
@@ -13,6 +13,6 @@ borrowck_could_not_normalize =
 
 borrowck_higher_ranked_subtype_error =
     higher-ranked subtype error
-  
+
 generic_does_not_live_long_enough =
-    `{$kind}` does not live long enough
\ No newline at end of file
+    `{$kind}` does not live long enough
diff --git a/compiler/rustc_error_messages/locales/en-US/expand.ftl b/compiler/rustc_error_messages/locales/en-US/expand.ftl
index ee76a4f45005d..5720591154f99 100644
--- a/compiler/rustc_error_messages/locales/en-US/expand.ftl
+++ b/compiler/rustc_error_messages/locales/en-US/expand.ftl
@@ -4,10 +4,10 @@ expand_explain_doc_comment_outer =
 expand_explain_doc_comment_inner =
     inner doc comments expand to `#![doc = "..."]`, which is what this macro attempted to match
 
-expand_expr_repeat_no_syntax_vars = 
+expand_expr_repeat_no_syntax_vars =
     attempted to repeat an expression containing no syntax variables matched as repeating at this depth
 
-expand_must_repeat_once = 
+expand_must_repeat_once =
     this must repeat at least once
 
 expand_count_repetition_misplaced =
@@ -19,4 +19,4 @@ expand_meta_var_expr_unrecognized_var =
 expand_var_still_repeating =
     variable '{$ident}' is still repeating at this depth
 
-expand_meta_var_dif_seq_matchers = {$msg}
\ No newline at end of file
+expand_meta_var_dif_seq_matchers = {$msg}
diff --git a/src/tools/tidy/src/style.rs b/src/tools/tidy/src/style.rs
index 3cf44a2d7d1ef..dee58ff2fb510 100644
--- a/src/tools/tidy/src/style.rs
+++ b/src/tools/tidy/src/style.rs
@@ -125,16 +125,13 @@ fn should_ignore(line: &str) -> bool {
 
 /// Returns `true` if `line` is allowed to be longer than the normal limit.
 fn long_line_is_ok(extension: &str, is_error_code: bool, max_columns: usize, line: &str) -> bool {
-    if extension != "md" || is_error_code {
-        if line_is_url(is_error_code, max_columns, line) || should_ignore(line) {
-            return true;
-        }
-    } else if extension == "md" {
+    match extension {
+        // fluent files are allowed to be any length
+        "ftl" => true,
         // non-error code markdown is allowed to be any length
-        return true;
+        "md" if !is_error_code => true,
+        _ => line_is_url(is_error_code, max_columns, line) || should_ignore(line),
     }
-
-    false
 }
 
 enum Directive {
@@ -230,7 +227,7 @@ pub fn check(path: &Path, bad: &mut bool) {
     super::walk(path, &mut skip, &mut |entry, contents| {
         let file = entry.path();
         let filename = file.file_name().unwrap().to_string_lossy();
-        let extensions = [".rs", ".py", ".js", ".sh", ".c", ".cpp", ".h", ".md", ".css"];
+        let extensions = [".rs", ".py", ".js", ".sh", ".c", ".cpp", ".h", ".md", ".css", ".ftl"];
         if extensions.iter().all(|e| !filename.ends_with(e)) || filename.starts_with(".#") {
             return;
         }

From 295457192d100b62fa2c6148ad6b98b2b619937d Mon Sep 17 00:00:00 2001
From: Xiretza <xiretza@xiretza.xyz>
Date: Wed, 17 Aug 2022 11:45:35 +0200
Subject: [PATCH 2/2] fluent: fix slug name for
 borrowck::generic_does_not_live_long_enough

---
 compiler/rustc_error_messages/locales/en-US/borrowck.ftl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/rustc_error_messages/locales/en-US/borrowck.ftl b/compiler/rustc_error_messages/locales/en-US/borrowck.ftl
index 93224f843fbae..a96fe7c8a05d5 100644
--- a/compiler/rustc_error_messages/locales/en-US/borrowck.ftl
+++ b/compiler/rustc_error_messages/locales/en-US/borrowck.ftl
@@ -14,5 +14,5 @@ borrowck_could_not_normalize =
 borrowck_higher_ranked_subtype_error =
     higher-ranked subtype error
 
-generic_does_not_live_long_enough =
+borrowck_generic_does_not_live_long_enough =
     `{$kind}` does not live long enough