From bb49b31254e0bf5ad973a1d0548fc877614b9e30 Mon Sep 17 00:00:00 2001 From: flip1995 <9744647+flip1995@users.noreply.github.com> Date: Sat, 28 Jul 2018 17:35:41 +0200 Subject: [PATCH] Adapt scripts to the tool_lints --- util/dogfood.sh | 2 +- util/update_lints.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/util/dogfood.sh b/util/dogfood.sh index 358fc46c8db..bebe0e82a7f 100755 --- a/util/dogfood.sh +++ b/util/dogfood.sh @@ -1,5 +1,5 @@ #!/bin/sh rm -rf target*/*so -cargo build --lib && cp -R target target_recur && cargo rustc --lib -- -Zextra-plugins=clippy -Ltarget_recur/debug -Dclippy_pedantic -Dclippy || exit 1 +cargo build --lib && cp -R target target_recur && cargo rustc --lib -- -Zextra-plugins=clippy -Ltarget_recur/debug -Dclippy::pedantic -Dclippy::all || exit 1 rm -rf target_recur diff --git a/util/update_lints.py b/util/update_lints.py index abc8e5dee98..ea7b992abb7 100755 --- a/util/update_lints.py +++ b/util/update_lints.py @@ -218,16 +218,16 @@ def main(print_only=False, check=False): lambda: gen_mods(all_lints), replace_start=False, write_back=not check) - # same for "clippy_*" lint collections + # same for "clippy::*" lint collections changed |= replace_region( - 'clippy_lints/src/lib.rs', r'reg.register_lint_group\("clippy"', r'\]\);', + 'clippy_lints/src/lib.rs', r'reg.register_lint_group\("clippy::all"', r'\]\);', lambda: gen_group(clippy_lint_list), replace_start=False, write_back=not check) for key, value in clippy_lints.iteritems(): - # same for "clippy_*" lint collections + # same for "clippy::*" lint collections changed |= replace_region( - 'clippy_lints/src/lib.rs', r'reg.register_lint_group\("clippy_' + key + r'"', r'\]\);', + 'clippy_lints/src/lib.rs', r'reg.register_lint_group\("clippy::' + key + r'"', r'\]\);', lambda: gen_group(value), replace_start=False, write_back=not check)