diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-10-28 01:09:46 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-28 01:09:46 +0300 |
commit | dc53e7bc20347778cafb80d41bc37ce1a8902d55 (patch) | |
tree | f12e0dc0ede2d7b984a65940a597b0b227331450 /userdiff.c | |
parent | a8a49ebf61449f80d8c5ea2f9768f0ca590e51dd (diff) | |
parent | a04c7e0f1b6680385945ea901283d6335c4c108a (diff) |
Merge branch 'kb/userdiff-rust-macro-rules'
Userdiff for Rust update.
* kb/userdiff-rust-macro-rules:
userdiff: recognize 'macro_rules!' as starting a Rust function block
Diffstat (limited to 'userdiff.c')
-rw-r--r-- | userdiff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/userdiff.c b/userdiff.c index 4e2b55a5e0..df85f0b8c5 100644 --- a/userdiff.c +++ b/userdiff.c @@ -165,7 +165,7 @@ PATTERNS("ruby", "^[ \t]*((class|module|def)[ \t].*)$", "|[-+0-9.e]+|0[xXbB]?[0-9a-fA-F]+|\\?(\\\\C-)?(\\\\M-)?." "|//=?|[-+*/<>%&^|=!]=|<<=?|>>=?|===|\\.{1,3}|::|[!=]~"), PATTERNS("rust", - "^[\t ]*((pub(\\([^\\)]+\\))?[\t ]+)?((async|const|unsafe|extern([\t ]+\"[^\"]+\"))[\t ]+)?(struct|enum|union|mod|trait|fn|impl)[< \t]+[^;]*)$", + "^[\t ]*((pub(\\([^\\)]+\\))?[\t ]+)?((async|const|unsafe|extern([\t ]+\"[^\"]+\"))[\t ]+)?(struct|enum|union|mod|trait|fn|impl|macro_rules!)[< \t]+[^;]*)$", /* -- */ "[a-zA-Z_][a-zA-Z0-9_]*" "|[0-9][0-9_a-fA-Fiosuxz]*(\\.([0-9]*[eE][+-]?)?[0-9_fF]*)?" |