Skip to content

Commit

Permalink
Auto merge of #5353 - flip1995:conf_doc, r=Manishearth
Browse files Browse the repository at this point in the history
Fix documentation generation for configurable lints

In #5135, the configuration macro changed, but the documentation generation script wasn't updated. This PR catches up on this.

[Preview](https://flip1995.github.io/rust-clippy/master/index.html)

r? @Manishearth

changelog: Document configuration options of lints again.
  • Loading branch information
bors committed Mar 22, 2020
2 parents 0e5e2c4 + a1dc609 commit 89303da
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions util/lintlib.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
group_re = re.compile(r'''\s*([a-z_][a-z_0-9]+)''')
conf_re = re.compile(r'''define_Conf! {\n([^}]*)\n}''', re.MULTILINE)
confvar_re = re.compile(
r'''/// Lint: (\w+). (.*).*\n\s*\([^,]+,\s+"([^"]+)",\s+([^=\)]+)=>\s+(.*)\),''', re.MULTILINE)
r'''/// Lint: (\w+)\. (.*)\n\s*\([^,]+,\s+"([^"]+)":\s+([^,]+),\s+([^\.\)]+).*\),''', re.MULTILINE)
comment_re = re.compile(r'''\s*/// ?(.*)''')

lint_levels = {
Expand Down Expand Up @@ -93,7 +93,7 @@ def parse_configs(path):
match = re.search(conf_re, contents)
confvars = re.findall(confvar_re, match.group(1))

for (lint, doc, name, default, ty) in confvars:
for (lint, doc, name, ty, default) in confvars:
configs[lint.lower()] = Config(name.replace("_", "-"), ty, doc, default)

return configs
Expand Down

0 comments on commit 89303da

Please sign in to comment.