Skip to content

Commit 89303da

Browse files
committed
Auto merge of #5353 - flip1995:conf_doc, r=Manishearth
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.
2 parents 0e5e2c4 + a1dc609 commit 89303da

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

util/lintlib.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
group_re = re.compile(r'''\s*([a-z_][a-z_0-9]+)''')
1515
conf_re = re.compile(r'''define_Conf! {\n([^}]*)\n}''', re.MULTILINE)
1616
confvar_re = re.compile(
17-
r'''/// Lint: (\w+). (.*).*\n\s*\([^,]+,\s+"([^"]+)",\s+([^=\)]+)=>\s+(.*)\),''', re.MULTILINE)
17+
r'''/// Lint: (\w+)\. (.*)\n\s*\([^,]+,\s+"([^"]+)":\s+([^,]+),\s+([^\.\)]+).*\),''', re.MULTILINE)
1818
comment_re = re.compile(r'''\s*/// ?(.*)''')
1919

2020
lint_levels = {
@@ -93,7 +93,7 @@ def parse_configs(path):
9393
match = re.search(conf_re, contents)
9494
confvars = re.findall(confvar_re, match.group(1))
9595

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

9999
return configs

0 commit comments

Comments
 (0)