about summary refs log tree commit diff
path: root/src/etc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-07-20 07:12:22 +0000
committerbors <bors@rust-lang.org>2023-07-20 07:12:22 +0000
commitc67cb3e577bdd4de640eb11d96cd5ef5afe0eb0b (patch)
tree718bce56573cbb50af071101db19daf13ce003a3 /src/etc
parent0646a5d1aa3745cb448db247f6fa432890a1812b (diff)
parent770c8d06672ea8d317df7bdf5ff5f8ce954ecbdd (diff)
downloadrust-c67cb3e577bdd4de640eb11d96cd5ef5afe0eb0b.tar.gz
rust-c67cb3e577bdd4de640eb11d96cd5ef5afe0eb0b.zip
Auto merge of #113878 - matthiaskrgr:rollup-u0d3kzx, r=matthiaskrgr
Rollup of 5 pull requests

Successful merges:

 - #113710 (Fix rpath for libdir is specified)
 - #113787 (Update documentation for std::process::Command's new method)
 - #113795 (Properly document `lifetime_mapping` in `OpaqueTy`)
 - #113857 (Add tests for `--document-hidden-items` option)
 - #113871 (Use the correct span for displaying the line following a derive sugge…)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/etc')
-rwxr-xr-xsrc/etc/htmldocck.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/etc/htmldocck.py b/src/etc/htmldocck.py
index 5ab1874e9ed..2e0f832192f 100755
--- a/src/etc/htmldocck.py
+++ b/src/etc/htmldocck.py
@@ -274,6 +274,8 @@ def get_commands(template):
                 args = shlex.split(args)
             except UnicodeEncodeError:
                 args = [arg.decode('utf-8') for arg in shlex.split(args.encode('utf-8'))]
+            except Exception as exc:
+                raise Exception("line {}: {}".format(lineno + 1, exc)) from None
             yield Command(negated=negated, cmd=cmd, args=args, lineno=lineno+1, context=line)