diff options
| -rw-r--r-- | mesonbuild/compilers/rust.py | 6 | ||||
| -rw-r--r-- | mesonbuild/scripts/clippy.py | 2 | ||||
| -rw-r--r-- | mesonbuild/scripts/rustdoc.py | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py index da0c7ee1d..0a1aea93e 100644 --- a/mesonbuild/compilers/rust.py +++ b/mesonbuild/compilers/rust.py @@ -429,7 +429,7 @@ class RustCompiler(Compiler): action = "no" if disable else "yes" return ['-C', f'debug-assertions={action}', '-C', 'overflow-checks=no'] - def get_rust_tool(self, name: str, env: Environment) -> T.List[str]: + def get_rust_tool(self, name: str) -> T.List[str]: if self.rustup_run_and_args: rustup_exelist, args = self.rustup_run_and_args # do not use extend so that exelist is copied @@ -439,7 +439,7 @@ class RustCompiler(Compiler): args = self.get_exe_args() from ..programs import find_external_program - for prog in find_external_program(env, self.for_machine, exelist[0], exelist[0], + for prog in find_external_program(self.environment, self.for_machine, exelist[0], exelist[0], [exelist[0]], allow_default_for_cross=False): exelist[0] = prog.path break @@ -457,7 +457,7 @@ class RustCompiler(Compiler): @functools.lru_cache(maxsize=None) def get_rustdoc(self, env: 'Environment') -> T.Optional[RustdocTestCompiler]: - exelist = self.get_rust_tool('rustdoc', env) + exelist = self.get_rust_tool('rustdoc') if not exelist: return None diff --git a/mesonbuild/scripts/clippy.py b/mesonbuild/scripts/clippy.py index 6d282e4f8..0ea7a3429 100644 --- a/mesonbuild/scripts/clippy.py +++ b/mesonbuild/scripts/clippy.py @@ -23,7 +23,7 @@ class ClippyDriver: compilers = build.environment.coredata.compilers[machine] if 'rust' in compilers: compiler = T.cast('RustCompiler', compilers['rust']) - self.tools[machine] = compiler.get_rust_tool('clippy-driver', build.environment) + self.tools[machine] = compiler.get_rust_tool('clippy-driver') def warn_missing_clippy(self, machine: str) -> None: if self.warned[machine]: diff --git a/mesonbuild/scripts/rustdoc.py b/mesonbuild/scripts/rustdoc.py index 9efcbf57c..2c4423f51 100644 --- a/mesonbuild/scripts/rustdoc.py +++ b/mesonbuild/scripts/rustdoc.py @@ -31,7 +31,7 @@ class Rustdoc: compilers = build.environment.coredata.compilers[machine] if 'rust' in compilers: compiler = T.cast('RustCompiler', compilers['rust']) - self.tools[machine] = compiler.get_rust_tool('rustdoc', build.environment) + self.tools[machine] = compiler.get_rust_tool('rustdoc') def warn_missing_rustdoc(self, machine: str) -> None: if self.warned[machine]: |