meson: use modern syntax for dict checks

diff --git a/meson.build b/meson.build
index 0c54ef2408691e6dd2c52459b319eccf3b37fbed..81bf99f4153129107ae9b130017dd49a8d03b7a6 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2354,7 +2354,7 @@ foreach dict : executables
                 sources += exe_sources
         endif
 
-        if dict.has_key('export')
+        if 'export' in dict
                 exported_by_name += {
                         name : {
                                 'exported' : exe.extract_objects(dict['export']),
@@ -2718,7 +2718,7 @@ if meson.version().version_compare('>=1.4.0')
         uniq = {}
 
         foreach source : sources
-                if uniq.has_key(source.full_path())
+                if source.full_path() in uniq
                         continue
                 endif
                 uniq += {source.full_path(): source}

diff --git a/test/meson.build b/test/meson.build
index fd3dba3a60093d6269d7da3a47e1434b60ed1f5d..f3a8541f8e61495362a6a184f185b0ff477d46b9 100644 (file)
--- a/test/meson.build
+++ b/test/meson.build
@@ -98,7 +98,7 @@ endif
 ############################################################
 
 test_compare_versions_sh = files('test-compare-versions.sh')
-if want_tests != 'false' and executables_by_name.has_key('systemd-analyze')
+if want_tests != 'false' and 'systemd-analyze' in executables_by_name
         exe = executables_by_name.get('systemd-analyze')
         test('test-compare-versions',
              test_compare_versions_sh,
@@ -156,7 +156,7 @@ endif
 ############################################################
 
 test_fstab_generator_sh = files('test-fstab-generator.sh')
-if want_tests != 'false' and executables_by_name.has_key('systemd-fstab-generator')
+if want_tests != 'false' and 'systemd-fstab-generator' in executables_by_name
         exe = executables_by_name.get('systemd-fstab-generator')
         test('test-fstab-generator',
              test_fstab_generator_sh,