Skip to content

rustdoc: introduce the #[doc(keyword="")] attribute for documenting keywords #51140

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

Merged
bors merged 8 commits into from
Jun 5, 2018
Merged

rustdoc: introduce the #[doc(keyword="")] attribute for documenting keywords #51140

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d024d6a
slightly improve rustdoc xml path error
GuillaumeGomez May 28, 2018
ebee483
Add doc keyword support
GuillaumeGomez May 28, 2018
904f492
Few improvements
GuillaumeGomez May 29, 2018
f784d5e
Remove useless function call for keyword generation in rustdoc
GuillaumeGomez Jun 2, 2018
ded5c5a
Put doc keyword behind feature flag
GuillaumeGomez Jun 2, 2018
402aa0f
Add even more tests
GuillaumeGomez Jun 2, 2018
fb54a4a
Add missing ui tests
GuillaumeGomez Jun 3, 2018
2f7fa24
Update rustdoc-js
GuillaumeGomez Jun 4, 2018
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
slightly improve rustdoc xml path error
  • Loading branch information
@GuillaumeGomez
GuillaumeGomez committed Jun 4, 2018
commit d024d6a51e05f0fa03d954d69f2863519922e00c
22 changes: 13 additions & 9 deletions src/etc/htmldocck.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,15 +346,19 @@ def check_tree_attr(tree, path, attr, pat, regexp):
def check_tree_text(tree, path, pat, regexp):
path = normalize_xpath(path)
ret = False
for e in tree.findall(path):
try:
value = flatten(e)
except KeyError:
continue
else:
ret = check_string(value, pat, regexp)
if ret:
break
try:
for e in tree.findall(path):
try:
value = flatten(e)
except KeyError:
continue
else:
ret = check_string(value, pat, regexp)
if ret:
break
except Exception as e:
print('Failed to get path "{}"'.format(path))
raise e
return ret


Expand Down