diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2021-03-04 17:16:11 -0500 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2021-03-04 17:16:11 -0500 |
| commit | 6a0fabc6472f49621260de215f128a31ae70219b (patch) | |
| tree | 6a67908358a2c5e5baa215fe0201dfe213dd8a01 /mesonbuild/compilers/d.py | |
| parent | 4340bf34faca7eed8076ba4c388fbe15355f2183 (diff) | |
| download | meson-6a0fabc6472f49621260de215f128a31ae70219b.zip meson-6a0fabc6472f49621260de215f128a31ae70219b.tar.gz meson-6a0fabc6472f49621260de215f128a31ae70219b.tar.bz2 | |
mass rewrite of string formatting to use f-strings everywhere
performed by running "pyupgrade --py36-plus" and committing the results
Diffstat (limited to 'mesonbuild/compilers/d.py')
| -rw-r--r-- | mesonbuild/compilers/d.py | 26 |
1 files changed, 13 insertions, 13 deletions
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() |