Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tidy: check fluent files for style #100671

Merged
merged 2 commits into from
Aug 22, 2022
Merged

tidy: check fluent files for style #100671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00fec76
tidy: check fluent files for style
Xiretza Aug 17, 2022
2954571
fluent: fix slug name for borrowck::generic_does_not_live_long_enough
Xiretza Aug 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions compiler/rustc_error_messages/locales/en-US/borrowck.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

borrowck_generic_does_not_live_long_enough =
`{$kind}` does not live long enough
6 changes: 3 additions & 3 deletions compiler/rustc_error_messages/locales/en-US/expand.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand All @@ -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}
expand_meta_var_dif_seq_matchers = {$msg}
15 changes: 6 additions & 9 deletions src/tools/tidy/src/style.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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;
}
Expand Down