11 files changed, 23 insertions, 23 deletions
diff --git a/ale_linters/cpp/ccls.vim b/ale_linters/cpp/ccls.vim
index 501fd685..b265ff70 100644
--- a/ale_linters/cpp/ccls.vim
+++ b/ale_linters/cpp/ccls.vim
@@ -7,8 +7,8 @@ call ale#Set('cpp_ccls_init_options', {})
 call ale#linter#Define('cpp', {
 \   'name': 'ccls',
 \   'lsp': 'stdio',
-\   'executable_callback': ale#VarFunc('cpp_ccls_executable'),
+\   'executable': {b -> ale#Var(b, 'cpp_ccls_executable')},
 \   'command': '%e',
-\   'project_root_callback': 'ale#handlers#ccls#GetProjectRoot',
-\   'initialization_options_callback': ale#VarFunc('cpp_ccls_init_options'),
+\   'project_root': function('ale#handlers#ccls#GetProjectRoot'),
+\   'initialization_options': {b -> ale#Var(b, 'cpp_ccls_init_options')},
 \})
diff --git a/ale_linters/cpp/clang.vim b/ale_linters/cpp/clang.vim
index 649c5993..5a465812 100644
--- a/ale_linters/cpp/clang.vim
+++ b/ale_linters/cpp/clang.vim
@@ -18,7 +18,7 @@ endfunction
 call ale#linter#Define('cpp', {
 \   'name': 'clang',
 \   'output_stream': 'stderr',
-\   'executable_callback': ale#VarFunc('cpp_clang_executable'),
+\   'executable': {b -> ale#Var(b, 'cpp_clang_executable')},
 \   'command_chain': [
 \       {'callback': 'ale#c#GetMakeCommand', 'output_stream': 'stdout'},
 \       {'callback': 'ale_linters#cpp#clang#GetCommand'},
diff --git a/ale_linters/cpp/clangcheck.vim b/ale_linters/cpp/clangcheck.vim
index c66d6702..b511a413 100644
--- a/ale_linters/cpp/clangcheck.vim
+++ b/ale_linters/cpp/clangcheck.vim
@@ -27,8 +27,8 @@ endfunction
 call ale#linter#Define('cpp', {
 \   'name': 'clangcheck',
 \   'output_stream': 'stderr',
-\   'executable_callback': ale#VarFunc('cpp_clangcheck_executable'),
-\   'command_callback': 'ale_linters#cpp#clangcheck#GetCommand',
+\   'executable': {b -> ale#Var(b, 'cpp_clangcheck_executable')},
+\   'command': function('ale_linters#cpp#clangcheck#GetCommand'),
 \   'callback': 'ale#handlers#gcc#HandleGCCFormat',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/cpp/clangd.vim b/ale_linters/cpp/clangd.vim
index 9139f054..4a8ff4f6 100644
--- a/ale_linters/cpp/clangd.vim
+++ b/ale_linters/cpp/clangd.vim
@@ -17,7 +17,7 @@ endfunction
 call ale#linter#Define('cpp', {
 \   'name': 'clangd',
 \   'lsp': 'stdio',
-\   'executable_callback': ale#VarFunc('cpp_clangd_executable'),
-\   'command_callback': 'ale_linters#cpp#clangd#GetCommand',
-\   'project_root_callback': 'ale_linters#cpp#clangd#GetProjectRoot',
+\   'executable': {b -> ale#Var(b, 'cpp_clangd_executable')},
+\   'command': function('ale_linters#cpp#clangd#GetCommand'),
+\   'project_root': function('ale_linters#cpp#clangd#GetProjectRoot'),
 \})
diff --git a/ale_linters/cpp/clangtidy.vim b/ale_linters/cpp/clangtidy.vim
index 9c3da8db..841b795f 100644
--- a/ale_linters/cpp/clangtidy.vim
+++ b/ale_linters/cpp/clangtidy.vim
@@ -29,8 +29,8 @@ endfunction
 call ale#linter#Define('cpp', {
 \   'name': 'clangtidy',
 \   'output_stream': 'stdout',
-\   'executable_callback': ale#VarFunc('cpp_clangtidy_executable'),
-\   'command_callback': 'ale_linters#cpp#clangtidy#GetCommand',
+\   'executable': {b -> ale#Var(b, 'cpp_clangtidy_executable')},
+\   'command': function('ale_linters#cpp#clangtidy#GetCommand'),
 \   'callback': 'ale#handlers#gcc#HandleGCCFormat',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/cpp/clazy.vim b/ale_linters/cpp/clazy.vim
index cbbd0ccf..9b29ac9a 100644
--- a/ale_linters/cpp/clazy.vim
+++ b/ale_linters/cpp/clazy.vim
@@ -25,8 +25,8 @@ endfunction
 call ale#linter#Define('cpp', {
 \   'name': 'clazy',
 \   'output_stream': 'stderr',
-\   'executable_callback': ale#VarFunc('cpp_clazy_executable'),
-\   'command_callback': 'ale_linters#cpp#clazy#GetCommand',
+\   'executable': {b -> ale#Var(b, 'cpp_clazy_executable')},
+\   'command': function('ale_linters#cpp#clazy#GetCommand'),
 \   'callback': 'ale#handlers#gcc#HandleGCCFormat',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/cpp/cppcheck.vim b/ale_linters/cpp/cppcheck.vim
index 229d6133..5173d698 100644
--- a/ale_linters/cpp/cppcheck.vim
+++ b/ale_linters/cpp/cppcheck.vim
@@ -28,7 +28,7 @@ endfunction
 call ale#linter#Define('cpp', {
 \   'name': 'cppcheck',
 \   'output_stream': 'both',
-\   'executable_callback': ale#VarFunc('cpp_cppcheck_executable'),
-\   'command_callback': 'ale_linters#cpp#cppcheck#GetCommand',
+\   'executable': {b -> ale#Var(b, 'cpp_cppcheck_executable')},
+\   'command': function('ale_linters#cpp#cppcheck#GetCommand'),
 \   'callback': 'ale#handlers#cppcheck#HandleCppCheckFormat',
 \})
diff --git a/ale_linters/cpp/cpplint.vim b/ale_linters/cpp/cpplint.vim
index d135fa79..f1f6ce7f 100644
--- a/ale_linters/cpp/cpplint.vim
+++ b/ale_linters/cpp/cpplint.vim
@@ -13,8 +13,8 @@ endfunction
 call ale#linter#Define('cpp', {
 \   'name': 'cpplint',
 \   'output_stream': 'stderr',
-\   'executable_callback': ale#VarFunc('cpp_cpplint_executable'),
-\   'command_callback': 'ale_linters#cpp#cpplint#GetCommand',
+\   'executable': {b -> ale#Var(b, 'cpp_cpplint_executable')},
+\   'command': function('ale_linters#cpp#cpplint#GetCommand'),
 \   'callback': 'ale#handlers#cpplint#HandleCppLintFormat',
 \   'lint_file': 1,
 \})
diff --git a/ale_linters/cpp/cquery.vim b/ale_linters/cpp/cquery.vim
index b1c81989..0dd9f6ad 100644
--- a/ale_linters/cpp/cquery.vim
+++ b/ale_linters/cpp/cquery.vim
@@ -21,8 +21,8 @@ endfunction
 call ale#linter#Define('cpp', {
 \   'name': 'cquery',
 \   'lsp': 'stdio',
-\   'executable_callback': ale#VarFunc('cpp_cquery_executable'),
+\   'executable': {b -> ale#Var(b, 'cpp_cquery_executable')},
 \   'command': '%e',
-\   'project_root_callback': 'ale_linters#cpp#cquery#GetProjectRoot',
-\   'initialization_options_callback': 'ale_linters#cpp#cquery#GetInitializationOptions',
+\   'project_root': function('ale_linters#cpp#cquery#GetProjectRoot'),
+\   'initialization_options': function('ale_linters#cpp#cquery#GetInitializationOptions'),
 \})
diff --git a/ale_linters/cpp/flawfinder.vim b/ale_linters/cpp/flawfinder.vim
index 0a966604..5bfdea22 100644
--- a/ale_linters/cpp/flawfinder.vim
+++ b/ale_linters/cpp/flawfinder.vim
@@ -19,7 +19,7 @@ endfunction
 call ale#linter#Define('cpp', {
 \  'name': 'flawfinder',
 \  'output_stream': 'stdout',
-\  'executable_callback': ale#VarFunc('cpp_flawfinder_executable'),
-\  'command_callback': 'ale_linters#cpp#flawfinder#GetCommand',
+\  'executable': {b -> ale#Var(b, 'cpp_flawfinder_executable')},
+\  'command': function('ale_linters#cpp#flawfinder#GetCommand'),
 \  'callback': 'ale#handlers#flawfinder#HandleFlawfinderFormat',
 \})
diff --git a/ale_linters/cpp/gcc.vim b/ale_linters/cpp/gcc.vim
index 9935b0bb..831620d5 100644
--- a/ale_linters/cpp/gcc.vim
+++ b/ale_linters/cpp/gcc.vim
@@ -19,7 +19,7 @@ call ale#linter#Define('cpp', {
 \   'name': 'gcc',
 \   'aliases': ['g++'],
 \   'output_stream': 'stderr',
-\   'executable_callback': ale#VarFunc('cpp_gcc_executable'),
+\   'executable': {b -> ale#Var(b, 'cpp_gcc_executable')},
 \   'command_chain': [
 \       {'callback': 'ale#c#GetMakeCommand', 'output_stream': 'stdout'},
 \       {'callback': 'ale_linters#cpp#gcc#GetCommand'},