Auto merge of #28101 - ijks:24214-str-bytes, r=alexcrichton

[rust.git] / mk / ctags.mk

diff --git a/mk/ctags.mk b/mk/ctags.mk
index 44a16d556be6fc3fa4043540c0a7cdfc4cb7fdb9..a116f2aba6437ef627a13306d7dd75efe6c805ae 100644 (file)
--- a/mk/ctags.mk
+++ b/mk/ctags.mk
@@ -15,25 +15,11 @@
 
 .PHONY: TAGS.emacs TAGS.vi
 
-# This is using a blacklist approach, probably more durable than a whitelist.
-# We exclude: external dependencies (llvm, rt/{msvc,sundown,vg}),
-# tests (compiletest, test) and a couple of other things (rt/arch, etc)
-CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/llvm,, \
-                               $(patsubst ${CFG_SRC_DIR}src/compiletest,, \
-                               $(patsubst ${CFG_SRC_DIR}src/test,, \
-                               $(patsubst ${CFG_SRC_DIR}src/etc,, \
-                               $(patsubst ${CFG_SRC_DIR}src/rt,, \
-                               $(patsubst ${CFG_SRC_DIR}src/rt/arch,, \
-                               $(patsubst ${CFG_SRC_DIR}src/rt/msvc,, \
-                               $(patsubst ${CFG_SRC_DIR}src/rt/sundown,, \
-                               $(patsubst ${CFG_SRC_DIR}src/rt/vg,, \
-                               $(wildcard ${CFG_SRC_DIR}src/*) $(wildcard ${CFG_SRC_DIR}src/rt/*) \
-                               )))))))))
-CTAGS_OPTS=--options="${CFG_SRC_DIR}src/etc/ctags.rust" --languages=-javascript --recurse ${CTAGS_LOCATIONS}
-# We could use `--languages=Rust`, but there is value in producing tags for the
-# C++ parts of the code base too (at the time of writing, those are .h and .cpp
-# files in src/rt, src/rt/sync and src/rustllvm); we mainly just want to
-# exclude the external dependencies.
+CTAGS_LOCATIONS=$(wildcard ${CFG_SRC_DIR}src/lib*)
+CTAGS_LOCATIONS=$(patsubst ${CFG_SRC_DIR}src/librust%,, \
+                $(patsubst ${CFG_SRC_DIR}src/lib%test,, \
+                               $(wildcard ${CFG_SRC_DIR}src/lib*))) ${CFG_SRC_DIR}src/libtest
+CTAGS_OPTS=--options="${CFG_SRC_DIR}src/etc/ctags.rust" --languages=Rust --recurse ${CTAGS_LOCATIONS}
 
 TAGS.emacs:
        ctags -e -f $@ ${CTAGS_OPTS}