Skip to content

tools: update check-imports using function #33565

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

Closed
danbev wants to merge 2 commits into from
Closed

tools: update check-imports using function #33565

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e82f393
tools: update check-imports using function
danbev May 26, 2020
6babd4d
src: remove unused using declarations
danbev May 26, 2020
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
Next Next commit
tools: update check-imports using function 
Currently, the do_exist function that performs the checks for unused
types declared with using declarations, only matches the name of the
using declarations. The means that some unused using declarations are
not detected. For example having both a 'using Maybe;' and a 'using
MaybeLocal' and only using MaybeLocal would not be reported.

This commit attempts to take into account the above mentioned case and
also others where the name of the using declaration type is used in name
of a variables or function call. For example, 'using Just;', will now be
reported as unused even if there are calls to the FromJust function.
  • Loading branch information
@danbev
danbev committed May 26, 2020
commit e82f39375a2a5445ec7f8a2aa25102132661cd40
5 changes: 3 additions & 2 deletions tools/check-imports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@
import re
import sys


def do_exist(file_name, lines, imported):
if not any(not re.match('using \w+::{0};'.format(imported), line) and
re.search(imported, line) for line in lines):
re.search("(:?^|\s|<|\(|\:|{{){0}[\s<>(,:*)&]".format(imported),
line)
for line in lines):
print('File "{0}" does not use "{1}"'.format(file_name, imported))
return False
return True
Expand Down