3 files changed, 3 insertions, 24 deletions
diff --git a/autoload/rust/debugging.vim b/autoload/rust/debugging.vim
index d16380b5..9096333b 100644
--- a/autoload/rust/debugging.vim
+++ b/autoload/rust/debugging.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/rust/debugging.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " For debugging, inspired by https://github.com/w0rp/rust/blob/master/autoload/rust/debugging.vim
 
@@ -110,5 +105,3 @@ function! rust#debugging#InfoToFile(filename) abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif
diff --git a/autoload/rust/delimitmate.vim b/autoload/rust/delimitmate.vim
index a60dece7..7d2d1817 100644
--- a/autoload/rust/delimitmate.vim
+++ b/autoload/rust/delimitmate.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/rust/delimitmate.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 let s:delimitMate_extra_excluded_regions = ',rustLifetimeCandidate,rustGenericLifetimeCandidate'
 
@@ -51,5 +46,3 @@ endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
 
-
-endif
diff --git a/autoload/rust/tags.vim b/autoload/rust/tags.vim
index 84388174..8ffa4d51 100644
--- a/autoload/rust/tags.vim
+++ b/autoload/rust/tags.vim
@@ -1,11 +1,6 @@
-let s:base = expand("<sfile>:h:h")
-let Filter = { _, v -> stridx(v, s:base) == -1 && stridx(v, $VIMRUNTIME) == -1 && v !~ "after" }
-let files = filter(globpath(&rtp, 'autoload/rust/tags.vim', 1, 1), Filter)
-if len(files) > 0
-  exec 'source ' . files[0]
+if !polyglot#util#IsEnabled('rust', expand('<sfile>:p'))
   finish
 endif
-if !exists('g:polyglot_disabled') || index(g:polyglot_disabled, 'rust') == -1
 
 " Tagbar support code, for the sake of not automatically overriding its
 " configuration in case Universal Ctags is detected.
@@ -25,5 +20,3 @@ function! rust#tags#IsUCtags() abort
 endfunction
 
 " vim: set et sw=4 sts=4 ts=8:
-
-endif