aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/compilers
diff options
context:
space:
mode:
Diffstat (limited to 'mesonbuild/compilers')
-rw-r--r--mesonbuild/compilers/c.py6
-rw-r--r--mesonbuild/compilers/compilers.py32
-rw-r--r--mesonbuild/compilers/cpp.py10
-rw-r--r--mesonbuild/compilers/cuda.py4
-rw-r--r--mesonbuild/compilers/d.py26
-rw-r--r--mesonbuild/compilers/mixins/arm.py2
-rw-r--r--mesonbuild/compilers/mixins/clang.py4
-rw-r--r--mesonbuild/compilers/mixins/clike.py16
-rw-r--r--mesonbuild/compilers/mixins/emscripten.py2
-rw-r--r--mesonbuild/compilers/mixins/gnu.py4
-rw-r--r--mesonbuild/compilers/mixins/islinker.py4
-rw-r--r--mesonbuild/compilers/mixins/pgi.py2
-rw-r--r--mesonbuild/compilers/mixins/visualstudio.py2
-rw-r--r--mesonbuild/compilers/rust.py6
-rw-r--r--mesonbuild/compilers/vala.py4
15 files changed, 62 insertions, 62 deletions
diff --git a/mesonbuild/compilers/c.py b/mesonbuild/compilers/c.py
index 0a2d478..759b969 100644
--- a/mesonbuild/compilers/c.py
+++ b/mesonbuild/compilers/c.py
@@ -58,7 +58,7 @@ class CCompiler(CLikeCompiler, Compiler):
try:
return C_FUNC_ATTRIBUTES[name]
except KeyError:
- raise MesonException('Unknown function attribute "{}"'.format(name))
+ raise MesonException(f'Unknown function attribute "{name}"')
language = 'c'
@@ -474,7 +474,7 @@ class ClangClCCompiler(_ClangCStds, ClangClCompiler, VisualStudioLikeCCompilerMi
key = OptionKey('std', machine=self.for_machine, lang=self.language)
std = options[key].value
if std != "none":
- return ['/clang:-std={}'.format(std)]
+ return [f'/clang:-std={std}']
return []
@@ -654,7 +654,7 @@ class CompCertCCompiler(CompCertCompiler, CCompiler):
return ['-O0']
def get_output_args(self, target: str) -> T.List[str]:
- return ['-o{}'.format(target)]
+ return [f'-o{target}']
def get_werror_args(self) -> T.List[str]:
return ['-Werror']
diff --git a/mesonbuild/compilers/compilers.py b/mesonbuild/compilers/compilers.py
index 56c97f4..15c3805 100644
--- a/mesonbuild/compilers/compilers.py
+++ b/mesonbuild/compilers/compilers.py
@@ -693,7 +693,7 @@ class Compiler(metaclass=abc.ABCMeta):
def find_library(self, libname: str, env: 'Environment', extra_dirs: T.List[str],
libtype: LibType = LibType.PREFER_SHARED) -> T.Optional[T.List[str]]:
- raise EnvironmentException('Language {} does not support library finding.'.format(self.get_display_language()))
+ raise EnvironmentException(f'Language {self.get_display_language()} does not support library finding.')
def get_library_naming(self, env: 'Environment', libtype: LibType,
strict: bool = False) -> T.Optional[T.Tuple[str, ...]]:
@@ -896,7 +896,7 @@ class Compiler(metaclass=abc.ABCMeta):
def has_func_attribute(self, name: str, env: 'Environment') -> T.Tuple[bool, bool]:
raise EnvironmentException(
- 'Language {} does not support function attributes.'.format(self.get_display_language()))
+ f'Language {self.get_display_language()} does not support function attributes.')
def get_pic_args(self) -> T.List[str]:
m = 'Language {} does not support position-independent code'
@@ -971,7 +971,7 @@ class Compiler(metaclass=abc.ABCMeta):
return self.linker.bitcode_args()
def get_buildtype_args(self, buildtype: str) -> T.List[str]:
- raise EnvironmentException('{} does not implement get_buildtype_args'.format(self.id))
+ raise EnvironmentException(f'{self.id} does not implement get_buildtype_args')
def get_buildtype_linker_args(self, buildtype: str) -> T.List[str]:
return self.linker.get_buildtype_args(buildtype)
@@ -1047,22 +1047,22 @@ class Compiler(metaclass=abc.ABCMeta):
return []
def find_framework_paths(self, env: 'Environment') -> T.List[str]:
- raise EnvironmentException('{} does not support find_framework_paths'.format(self.id))
+ raise EnvironmentException(f'{self.id} does not support find_framework_paths')
def attribute_check_func(self, name: str) -> str:
- raise EnvironmentException('{} does not support attribute checks'.format(self.id))
+ raise EnvironmentException(f'{self.id} does not support attribute checks')
def get_pch_suffix(self) -> str:
- raise EnvironmentException('{} does not support pre compiled headers'.format(self.id))
+ raise EnvironmentException(f'{self.id} does not support pre compiled headers')
def get_pch_name(self, name: str) -> str:
- raise EnvironmentException('{} does not support pre compiled headers'.format(self.id))
+ raise EnvironmentException(f'{self.id} does not support pre compiled headers')
def get_pch_use_args(self, pch_dir: str, header: str) -> T.List[str]:
- raise EnvironmentException('{} does not support pre compiled headers'.format(self.id))
+ raise EnvironmentException(f'{self.id} does not support pre compiled headers')
def get_has_func_attribute_extra_args(self, name: str) -> T.List[str]:
- raise EnvironmentException('{} does not support function attributes'.format(self.id))
+ raise EnvironmentException(f'{self.id} does not support function attributes')
def name_string(self) -> str:
return ' '.join(self.exelist)
@@ -1095,7 +1095,7 @@ class Compiler(metaclass=abc.ABCMeta):
return objfile + '.' + self.get_depfile_suffix()
def get_depfile_suffix(self) -> str:
- raise OSError('{} does not implement get_depfile_suffix'.format(self.id))
+ raise OSError(f'{self.id} does not implement get_depfile_suffix')
def get_no_stdinc_args(self) -> T.List[str]:
"""Arguments to turn off default inclusion of standard libraries."""
@@ -1112,13 +1112,13 @@ class Compiler(metaclass=abc.ABCMeta):
pass
def get_module_incdir_args(self) -> T.Tuple[str, ...]:
- raise OSError('{} does not implement get_module_incdir_args'.format(self.id))
+ raise OSError(f'{self.id} does not implement get_module_incdir_args')
def get_module_outdir_args(self, path: str) -> T.List[str]:
- raise OSError('{} does not implement get_module_outdir_args'.format(self.id))
+ raise OSError(f'{self.id} does not implement get_module_outdir_args')
def module_name_to_filename(self, module_name: str) -> str:
- raise OSError('{} does not implement module_name_to_filename'.format(self.id))
+ raise OSError(f'{self.id} does not implement module_name_to_filename')
def get_compiler_check_args(self, mode: CompileCheckMode) -> T.List[str]:
"""Arguments to pass the compiler and/or linker for checks.
@@ -1212,10 +1212,10 @@ class Compiler(metaclass=abc.ABCMeta):
def get_feature_args(self, kwargs: T.Dict[str, T.Any], build_to_src: str) -> T.List[str]:
"""Used by D for extra language features."""
# TODO: using a TypeDict here would improve this
- raise OSError('{} does not implement get_feature_args'.format(self.id))
+ raise OSError(f'{self.id} does not implement get_feature_args')
def get_prelink_args(self, prelink_name: str, obj_list: T.List[str]) -> T.List[str]:
- raise EnvironmentException('{} does not know how to do prelinking.'.format(self.id))
+ raise EnvironmentException(f'{self.id} does not know how to do prelinking.')
def get_global_options(lang: str,
@@ -1223,7 +1223,7 @@ def get_global_options(lang: str,
for_machine: MachineChoice,
env: 'Environment') -> 'KeyedOptionDictType':
"""Retrieve options that apply to all compilers for a given language."""
- description = 'Extra arguments passed to the {}'.format(lang)
+ description = f'Extra arguments passed to the {lang}'
argkey = OptionKey('args', lang=lang, machine=for_machine)
largkey = argkey.evolve('link_args')
diff --git a/mesonbuild/compilers/cpp.py b/mesonbuild/compilers/cpp.py
index ebe3a4f..4d55ccd 100644
--- a/mesonbuild/compilers/cpp.py
+++ b/mesonbuild/compilers/cpp.py
@@ -65,7 +65,7 @@ class CPPCompiler(CLikeCompiler, Compiler):
try:
return CXX_FUNC_ATTRIBUTES.get(name, C_FUNC_ATTRIBUTES[name])
except KeyError:
- raise MesonException('Unknown function attribute "{}"'.format(name))
+ raise MesonException(f'Unknown function attribute "{name}"')
language = 'cpp'
@@ -129,10 +129,10 @@ class CPPCompiler(CLikeCompiler, Compiler):
CPP_TEST = 'int i = static_cast<int>(0);'
with self.compile(CPP_TEST, extra_args=[cpp_std_value], mode='compile') as p:
if p.returncode == 0:
- mlog.debug('Compiler accepts {}:'.format(cpp_std_value), 'YES')
+ mlog.debug(f'Compiler accepts {cpp_std_value}:', 'YES')
return True
else:
- mlog.debug('Compiler accepts {}:'.format(cpp_std_value), 'NO')
+ mlog.debug(f'Compiler accepts {cpp_std_value}:', 'NO')
return False
@functools.lru_cache()
@@ -166,7 +166,7 @@ class CPPCompiler(CLikeCompiler, Compiler):
if self._test_cpp_std_arg(cpp_std_value):
return cpp_std_value
- raise MesonException('C++ Compiler does not support -std={}'.format(cpp_std))
+ raise MesonException(f'C++ Compiler does not support -std={cpp_std}')
def get_options(self) -> 'KeyedOptionDictType':
opts = super().get_options()
@@ -615,7 +615,7 @@ class VisualStudioLikeCPPCompilerMixin(CompilerMixinBase):
permissive, ver = self.VC_VERSION_MAP[options[key].value]
if ver is not None:
- args.append('/std:c++{}'.format(ver))
+ args.append(f'/std:c++{ver}')
if not permissive:
args.append('/permissive-')
diff --git a/mesonbuild/compilers/cuda.py b/mesonbuild/compilers/cuda.py
index a55975a..b7dc0f5 100644
--- a/mesonbuild/compilers/cuda.py
+++ b/mesonbuild/compilers/cuda.py
@@ -514,7 +514,7 @@ class CudaCompiler(Compiler):
mlog.debug(stde)
mlog.debug('-----')
if pc.returncode != 0:
- raise EnvironmentException('Compiler {} can not compile programs.'.format(self.name_string()))
+ raise EnvironmentException(f'Compiler {self.name_string()} can not compile programs.')
# Run sanity check (if possible)
if self.is_cross:
@@ -533,7 +533,7 @@ class CudaCompiler(Compiler):
mlog.debug('-----')
pe.wait()
if pe.returncode != 0:
- raise EnvironmentException('Executables created by {} compiler {} are not runnable.'.format(self.language, self.name_string()))
+ raise EnvironmentException(f'Executables created by {self.language} compiler {self.name_string()} are not runnable.')
# Interpret the result of the sanity test.
# As mentioned above, it is not only a sanity test but also a GPU
diff --git a/mesonbuild/compilers/d.py b/mesonbuild/compilers/d.py
index b16aca8..92d54e9 100644
--- a/mesonbuild/compilers/d.py
+++ b/mesonbuild/compilers/d.py
@@ -183,10 +183,10 @@ class DmdLikeCompilerMixin(CompilerMixinBase):
if int(d) > debug_level:
debug_level = int(d)
else:
- res.append('{}={}'.format(debug_arg, d))
+ res.append(f'{debug_arg}={d}')
if debug_level >= 0:
- res.append('{}={}'.format(debug_arg, debug_level))
+ res.append(f'{debug_arg}={debug_level}')
if 'versions' in kwargs:
version_level = -1
@@ -207,10 +207,10 @@ class DmdLikeCompilerMixin(CompilerMixinBase):
if int(v) > version_level:
version_level = int(v)
else:
- res.append('{}={}'.format(version_arg, v))
+ res.append(f'{version_arg}={v}')
if version_level >= 0:
- res.append('{}={}'.format(version_arg, version_level))
+ res.append(f'{version_arg}={version_level}')
if 'import_dirs' in kwargs:
import_dirs = kwargs.pop('import_dirs')
@@ -230,8 +230,8 @@ class DmdLikeCompilerMixin(CompilerMixinBase):
else:
expdir = basedir
srctreedir = os.path.join(build_to_src, expdir)
- res.append('{}{}'.format(import_dir_arg, srctreedir))
- res.append('{}{}'.format(import_dir_arg, bldtreedir))
+ res.append(f'{import_dir_arg}{srctreedir}')
+ res.append(f'{import_dir_arg}{bldtreedir}')
if kwargs:
raise EnvironmentException('Unknown D compiler feature(s) selected: %s' % ', '.join(kwargs.keys()))
@@ -560,10 +560,10 @@ class DCompiler(Compiler):
if int(d) > debug_level:
debug_level = int(d)
else:
- res.append('{}={}'.format(debug_arg, d))
+ res.append(f'{debug_arg}={d}')
if debug_level >= 0:
- res.append('{}={}'.format(debug_arg, debug_level))
+ res.append(f'{debug_arg}={debug_level}')
if 'versions' in kwargs:
version_level = -1
@@ -584,10 +584,10 @@ class DCompiler(Compiler):
if int(v) > version_level:
version_level = int(v)
else:
- res.append('{}={}'.format(version_arg, v))
+ res.append(f'{version_arg}={v}')
if version_level >= 0:
- res.append('{}={}'.format(version_arg, version_level))
+ res.append(f'{version_arg}={version_level}')
if 'import_dirs' in kwargs:
import_dirs = kwargs.pop('import_dirs')
@@ -607,8 +607,8 @@ class DCompiler(Compiler):
else:
expdir = basedir
srctreedir = os.path.join(build_to_src, expdir)
- res.append('{}{}'.format(import_dir_arg, srctreedir))
- res.append('{}{}'.format(import_dir_arg, bldtreedir))
+ res.append(f'{import_dir_arg}{srctreedir}')
+ res.append(f'{import_dir_arg}{bldtreedir}')
if kwargs:
raise EnvironmentException('Unknown D compiler feature(s) selected: %s' % ', '.join(kwargs.keys()))
@@ -769,7 +769,7 @@ class LLVMDCompiler(DmdLikeCompilerMixin, DCompiler):
@classmethod
def use_linker_args(cls, linker: str) -> T.List[str]:
- return ['-linker={}'.format(linker)]
+ return [f'-linker={linker}']
def get_linker_always_args(self) -> T.List[str]:
args = super().get_linker_always_args()
diff --git a/mesonbuild/compilers/mixins/arm.py b/mesonbuild/compilers/mixins/arm.py
index beb5fd5..4e1898a 100644
--- a/mesonbuild/compilers/mixins/arm.py
+++ b/mesonbuild/compilers/mixins/arm.py
@@ -142,7 +142,7 @@ class ArmclangCompiler(Compiler):
raise mesonlib.EnvironmentException('armclang supports only cross-compilation.')
# Check whether 'armlink' is available in path
if not isinstance(self.linker, ArmClangDynamicLinker):
- raise mesonlib.EnvironmentException('Unsupported Linker {}, must be armlink'.format(self.linker.exelist))
+ raise mesonlib.EnvironmentException(f'Unsupported Linker {self.linker.exelist}, must be armlink')
if not mesonlib.version_compare(self.version, '==' + self.linker.version):
raise mesonlib.EnvironmentException('armlink version does not match with compiler version')
self.id = 'armclang'
diff --git a/mesonbuild/compilers/mixins/clang.py b/mesonbuild/compilers/mixins/clang.py
index fd1966f..5e109c0 100644
--- a/mesonbuild/compilers/mixins/clang.py
+++ b/mesonbuild/compilers/mixins/clang.py
@@ -126,8 +126,8 @@ class ClangCompiler(GnuLikeCompiler):
if shutil.which(linker):
if not shutil.which(linker):
raise mesonlib.MesonException(
- 'Cannot find linker {}.'.format(linker))
- return ['-fuse-ld={}'.format(linker)]
+ f'Cannot find linker {linker}.')
+ return [f'-fuse-ld={linker}']
return super().use_linker_args(linker)
def get_has_func_attribute_extra_args(self, name: str) -> T.List[str]:
diff --git a/mesonbuild/compilers/mixins/clike.py b/mesonbuild/compilers/mixins/clike.py
index ad0e257..787c2c1 100644
--- a/mesonbuild/compilers/mixins/clike.py
+++ b/mesonbuild/compilers/mixins/clike.py
@@ -118,7 +118,7 @@ class CLikeCompilerArgs(arglist.CompilerArgs):
def __repr__(self) -> str:
self.flush_pre_post()
- return 'CLikeCompilerArgs({!r}, {!r})'.format(self.compiler, self._container)
+ return f'CLikeCompilerArgs({self.compiler!r}, {self._container!r})'
class CLikeCompiler(Compiler):
@@ -321,7 +321,7 @@ class CLikeCompiler(Compiler):
mlog.debug(stde)
mlog.debug('-----')
if pc.returncode != 0:
- raise mesonlib.EnvironmentException('Compiler {} can not compile programs.'.format(self.name_string()))
+ raise mesonlib.EnvironmentException(f'Compiler {self.name_string()} can not compile programs.')
# Run sanity check
if self.is_cross:
if self.exe_wrapper is None:
@@ -337,7 +337,7 @@ class CLikeCompiler(Compiler):
raise mesonlib.EnvironmentException('Could not invoke sanity test executable: %s.' % str(e))
pe.wait()
if pe.returncode != 0:
- raise mesonlib.EnvironmentException('Executables created by {} compiler {} are not runnable.'.format(self.language, self.name_string()))
+ raise mesonlib.EnvironmentException(f'Executables created by {self.language} compiler {self.name_string()} are not runnable.')
def sanity_check(self, work_dir: str, environment: 'Environment') -> None:
code = 'int main(void) { int class=0; return class; }\n'
@@ -485,7 +485,7 @@ class CLikeCompiler(Compiler):
try:
pe, so, se = mesonlib.Popen_safe(cmdlist)
except Exception as e:
- mlog.debug('Could not run: %s (error: %s)\n' % (cmdlist, e))
+ mlog.debug(f'Could not run: {cmdlist} (error: {e})\n')
return compilers.RunResult(False)
mlog.debug('Program stdout:\n')
@@ -692,7 +692,7 @@ class CLikeCompiler(Compiler):
with func() as p:
cached = p.cached
if p.returncode != 0:
- raise mesonlib.EnvironmentException('Could not get define {!r}'.format(dname))
+ raise mesonlib.EnvironmentException(f'Could not get define {dname!r}')
# Get the preprocessed value after the delimiter,
# minus the extra newline at the end and
# merge string literals.
@@ -710,7 +710,7 @@ class CLikeCompiler(Compiler):
fmt = '%lli'
cast = '(long long int)'
else:
- raise AssertionError('BUG: Unknown return type {!r}'.format(rtype))
+ raise AssertionError(f'BUG: Unknown return type {rtype!r}')
fargs = {'prefix': prefix, 'f': fname, 'cast': cast, 'fmt': fmt}
code = '''{prefix}
#include <stdio.h>
@@ -810,7 +810,7 @@ class CLikeCompiler(Compiler):
if val is not None:
if isinstance(val, bool):
return val, False
- raise mesonlib.EnvironmentException('Cross variable {} is not a boolean.'.format(varname))
+ raise mesonlib.EnvironmentException(f'Cross variable {varname} is not a boolean.')
# TODO: we really need a protocol for this,
#
@@ -951,7 +951,7 @@ class CLikeCompiler(Compiler):
elif symbol_name in line:
mlog.debug("Symbols have underscore prefix: NO")
return False
- raise RuntimeError('BUG: {!r} check failed unexpectedly'.format(n))
+ raise RuntimeError(f'BUG: {n!r} check failed unexpectedly')
def _get_patterns(self, env: 'Environment', prefixes: T.List[str], suffixes: T.List[str], shared: bool = False) -> T.List[str]:
patterns = [] # type: T.List[str]
diff --git a/mesonbuild/compilers/mixins/emscripten.py b/mesonbuild/compilers/mixins/emscripten.py
index 57295d0..226cc15 100644
--- a/mesonbuild/compilers/mixins/emscripten.py
+++ b/mesonbuild/compilers/mixins/emscripten.py
@@ -53,7 +53,7 @@ class EmscriptenMixin(Compiler):
args = ['-s', 'USE_PTHREADS=1']
count: int = env.coredata.options[OptionKey('thread_count', lang=self.language, machine=self.for_machine)].value
if count:
- args.extend(['-s', 'PTHREAD_POOL_SIZE={}'.format(count)])
+ args.extend(['-s', f'PTHREAD_POOL_SIZE={count}'])
return args
def get_options(self) -> 'coredata.KeyedOptionDictType':
diff --git a/mesonbuild/compilers/mixins/gnu.py b/mesonbuild/compilers/mixins/gnu.py
index 464c664..b007ff0 100644
--- a/mesonbuild/compilers/mixins/gnu.py
+++ b/mesonbuild/compilers/mixins/gnu.py
@@ -104,7 +104,7 @@ def gnulike_default_include_dirs(compiler: T.Tuple[str], lang: str) -> T.List[st
lang = lang_map[lang]
env = os.environ.copy()
env["LC_ALL"] = 'C'
- cmd = list(compiler) + ['-x{}'.format(lang), '-E', '-v', '-']
+ cmd = list(compiler) + [f'-x{lang}', '-E', '-v', '-']
p = subprocess.Popen(
cmd,
stdin=subprocess.DEVNULL,
@@ -317,7 +317,7 @@ class GnuLikeCompiler(Compiler, metaclass=abc.ABCMeta):
raise mesonlib.MesonException(
'Unsupported linker, only bfd, gold, and lld are supported, '
'not {}.'.format(linker))
- return ['-fuse-ld={}'.format(linker)]
+ return [f'-fuse-ld={linker}']
def get_coverage_args(self) -> T.List[str]:
return ['--coverage']
diff --git a/mesonbuild/compilers/mixins/islinker.py b/mesonbuild/compilers/mixins/islinker.py
index 298d47f..eb271f6 100644
--- a/mesonbuild/compilers/mixins/islinker.py
+++ b/mesonbuild/compilers/mixins/islinker.py
@@ -83,11 +83,11 @@ class BasicLinkerIsCompilerMixin(Compiler):
def get_link_whole_for(self, args: T.List[str]) -> T.List[str]:
raise mesonlib.EnvironmentException(
- 'Linker {} does not support link_whole'.format(self.id))
+ f'Linker {self.id} does not support link_whole')
def get_allow_undefined_link_args(self) -> T.List[str]:
raise mesonlib.EnvironmentException(
- 'Linker {} does not support allow undefined'.format(self.id))
+ f'Linker {self.id} does not support allow undefined')
def get_pie_link_args(self) -> T.List[str]:
m = 'Linker {} does not support position-independent executable'
diff --git a/mesonbuild/compilers/mixins/pgi.py b/mesonbuild/compilers/mixins/pgi.py
index 8461574..51de8af 100644
--- a/mesonbuild/compilers/mixins/pgi.py
+++ b/mesonbuild/compilers/mixins/pgi.py
@@ -100,7 +100,7 @@ class PGICompiler(Compiler):
if self.language == 'cpp':
return ['--pch',
'--pch_dir', str(hdr.parent),
- '-I{}'.format(hdr.parent)]
+ f'-I{hdr.parent}']
else:
return []
diff --git a/mesonbuild/compilers/mixins/visualstudio.py b/mesonbuild/compilers/mixins/visualstudio.py
index c5d39c3..29b1499 100644
--- a/mesonbuild/compilers/mixins/visualstudio.py
+++ b/mesonbuild/compilers/mixins/visualstudio.py
@@ -314,7 +314,7 @@ class VisualStudioLikeCompiler(Compiler, metaclass=abc.ABCMeta):
return '14.1' # (Visual Studio 2017)
elif version < 1930:
return '14.2' # (Visual Studio 2019)
- mlog.warning('Could not find toolset for version {!r}'.format(self.version))
+ mlog.warning(f'Could not find toolset for version {self.version!r}')
return None
def get_toolset_version(self) -> T.Optional[str]:
diff --git a/mesonbuild/compilers/rust.py b/mesonbuild/compilers/rust.py
index fd58819..7354d58 100644
--- a/mesonbuild/compilers/rust.py
+++ b/mesonbuild/compilers/rust.py
@@ -80,7 +80,7 @@ class RustCompiler(Compiler):
stdo = _stdo.decode('utf-8', errors='replace')
stde = _stde.decode('utf-8', errors='replace')
if pc.returncode != 0:
- raise EnvironmentException('Rust compiler %s can not compile programs.\n%s\n%s' % (
+ raise EnvironmentException('Rust compiler {} can not compile programs.\n{}\n{}'.format(
self.name_string(),
stdo,
stde))
@@ -119,7 +119,7 @@ class RustCompiler(Compiler):
if i[:2] == '-L':
for j in ['dependency', 'crate', 'native', 'framework', 'all']:
combined_len = len(j) + 3
- if i[:combined_len] == '-L{}='.format(j):
+ if i[:combined_len] == f'-L{j}=':
parameter_list[idx] = i[:combined_len] + os.path.normpath(os.path.join(build_dir, i[combined_len:]))
break
@@ -130,7 +130,7 @@ class RustCompiler(Compiler):
@classmethod
def use_linker_args(cls, linker: str) -> T.List[str]:
- return ['-C', 'linker={}'.format(linker)]
+ return ['-C', f'linker={linker}']
# Rust does not have a use_linker_args because it dispatches to a gcc-like
# C compiler for dynamic linking, as such we invoke the C compiler's
diff --git a/mesonbuild/compilers/vala.py b/mesonbuild/compilers/vala.py
index 80e91f6..b8144f6 100644
--- a/mesonbuild/compilers/vala.py
+++ b/mesonbuild/compilers/vala.py
@@ -100,7 +100,7 @@ class ValaCompiler(Compiler):
extra_flags += environment.coredata.get_external_link_args(self.for_machine, self.language)
with self.cached_compile(code, environment.coredata, extra_args=extra_flags, mode='compile') as p:
if p.returncode != 0:
- msg = 'Vala compiler {!r} can not compile programs'.format(self.name_string())
+ msg = f'Vala compiler {self.name_string()!r} can not compile programs'
raise EnvironmentException(msg)
def get_buildtype_args(self, buildtype: str) -> T.List[str]:
@@ -128,7 +128,7 @@ class ValaCompiler(Compiler):
vapi = os.path.join(d, libname + '.vapi')
if os.path.isfile(vapi):
return [vapi]
- mlog.debug('Searched {!r} and {!r} wasn\'t found'.format(extra_dirs, libname))
+ mlog.debug(f'Searched {extra_dirs!r} and {libname!r} wasn\'t found')
return None
def thread_flags(self, env: 'Environment') -> T.List[str]:
generated by cgit v1.1 at 2025-03-22 00:33:43 +0000