about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-06 15:51:19 +0000
committerbors <bors@rust-lang.org>2014-08-06 15:51:19 +0000
commite5df5f56069de2778857597118a6e5f95d659736 (patch)
treec6160d6a9a9d9818de6cb03c91e759619feb3fdf /src
parent8fcfd02d852cc328a1d465f366ff8e22583b26f2 (diff)
parent8a7b0fa939c4e1ae8dcbba941ab4d46a3602b9fe (diff)
auto merge of #15865 : jamesrhurst/rust/ctags-regex, r=alexcrichton
Previously the implementation detection regex would detect
`impl fmt::Show for MyStruct` as `fmt`. Now it will be detected as
`fmt::Show for MyStruct`. Implementations such as `impl MyStruct` will
still be detected as `MyStruct`.
Diffstat (limited to 'src')
-rw-r--r--src/etc/ctags.rust2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/etc/ctags.rust b/src/etc/ctags.rust
index b42edf7579a..59a2ae205cb 100644
--- a/src/etc/ctags.rust
+++ b/src/etc/ctags.rust
@@ -7,5 +7,5 @@
 --regex-Rust=/^[ \t]*(pub[ \t]+)?mod[ \t]+([a-zA-Z0-9_]+)/\2/m,modules,module names/
 --regex-Rust=/^[ \t]*(pub[ \t]+)?static[ \t]+([a-zA-Z0-9_]+)/\2/c,consts,static constants/
 --regex-Rust=/^[ \t]*(pub[ \t]+)?trait[ \t]+([a-zA-Z0-9_]+)/\2/t,traits,traits/
---regex-Rust=/^[ \t]*(pub[ \t]+)?impl([ \t\n]+<.*>)?[ \t]+([a-zA-Z0-9_]+)/\3/i,impls,trait implementations/
+--regex-Rust=/^[ \t]*(pub[ \t]+)?impl([ \t\n]*<[^>]*>)?[ \t]+(([a-zA-Z0-9_:]+)[ \t]*(<[^>]*>)?[ \t]+(for)[ \t]+)?([a-zA-Z0-9_]+)/\4 \6 \7/i,impls,trait implementations/
 --regex-Rust=/^[ \t]*macro_rules![ \t]+([a-zA-Z0-9_]+)/\1/d,macros,macro definitions/