Remove s:function(), which is unnecessary on Vim 8

Author: tpope

autoload/rails.vim

@@ -17,14 +17,10 @@ let s:readable_prototype = {}
 
 function! s:add_methods(namespace, method_names)
   for name in a:method_names
-    let s:{a:namespace}_prototype[name] = s:function('s:'.a:namespace.'_'.name)
+    let s:{a:namespace}_prototype[name] = function('s:'.a:namespace.'_'.name)
   endfor
 endfunction
 
-function! s:function(name) abort
-  return function(substitute(a:name, '^s:', matchstr(expand('<sfile>'),  '.*\zs<SNR>\d\+_'), ''))
-endfunction
-
 function! s:sub(str,pat,rep)
   return substitute(a:str,'\v\C'.a:pat,a:rep,'')
 endfunction
@@ -446,7 +442,7 @@ call s:add_methods('readable',['end_of','last_opening_line','last_method_line','
 function! s:readable_find_affinity() dict abort
   let f = self.name()
   let all = self.app().projections()
-  for pattern in reverse(sort(filter(keys(all), 'v:val =~# "^[^*{}]*\\*[^*{}]*$"'), s:function('rails#lencmp')))
+  for pattern in reverse(sort(filter(keys(all), 'v:val =~# "^[^*{}]*\\*[^*{}]*$"'), function('rails#lencmp')))
     if !has_key(all[pattern], 'affinity')
       continue
     endif
@@ -3128,7 +3124,7 @@ function! s:readable_resolve_view(name, ...) dict abort
   else
     for format in ['.'.self.format(a:0 ? a:1 : 0), '']
       let found = self.app().relglob('', 'app/views/'.name.format.'.*')
-      call sort(found, s:function('s:dotcmp'))
+      call sort(found, function('s:dotcmp'))
       if !empty(found)
         return self.app().path(found[0])
       endif
@@ -4789,7 +4785,7 @@ function! s:readable_projected_with_raw(key, ...) dict abort
   if has_key(all, f)
     let mine += map(s:getlist(all[f], a:key), '[s:expand_placeholders(v:val, a:0 ? a:1 : {}), v:val]')
   endif
-  for pattern in reverse(sort(filter(keys(all), 'v:val =~# "^[^*{}]*\\*[^*{}]*$"'), s:function('rails#lencmp')))
+  for pattern in reverse(sort(filter(keys(all), 'v:val =~# "^[^*{}]*\\*[^*{}]*$"'), function('rails#lencmp')))
     let [prefix, suffix; _] = split(pattern, '\*', 1)
     if s:startswith(f, prefix) && s:endswith(f, suffix)
       let root = f[strlen(prefix) : -strlen(suffix)-1]

plugin/rails.vim

@@ -151,10 +151,6 @@ let g:db_adapter_rails = 'rails#db_'
 " }}}1
 " abolish.vim support {{{1
 
-function! s:function(name)
-    return function(substitute(a:name,'^s:',matchstr(expand('<sfile>'), '<SNR>\d\+_'),''))
-endfunction
-
 augroup railsPluginAbolish
   autocmd!
   autocmd VimEnter * call s:abolish_setup()
@@ -163,10 +159,10 @@ augroup END
 function! s:abolish_setup()
   if exists('g:Abolish') && has_key(g:Abolish,'Coercions')
     if !has_key(g:Abolish.Coercions,'l')
-      let g:Abolish.Coercions.l = s:function('s:abolish_l')
+      let g:Abolish.Coercions.l = function('s:abolish_l')
     endif
     if !has_key(g:Abolish.Coercions,'t')
-      let g:Abolish.Coercions.t = s:function('s:abolish_t')
+      let g:Abolish.Coercions.t = function('s:abolish_t')
     endif
   endif
 endfunction