diff options
| -rw-r--r-- | mesonbuild/interpreterbase/decorators.py | 4 | ||||
| -rw-r--r-- | test cases/common/44 pkgconfig-gen/test.json | 4 | ||||
| -rw-r--r-- | test cases/common/62 string arithmetic/test.json | 2 | ||||
| -rw-r--r-- | test cases/warning/1 version for string div/test.json | 2 | ||||
| -rw-r--r-- | test cases/warning/6 list add/test.json | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/interpreterbase/decorators.py b/mesonbuild/interpreterbase/decorators.py index e678fd97f..120c57932 100644 --- a/mesonbuild/interpreterbase/decorators.py +++ b/mesonbuild/interpreterbase/decorators.py @@ -696,7 +696,7 @@ class FeatureNew(FeatureCheckBase): def log_usage_warning(self, tv: str, location: T.Optional['mparser.BaseNode']) -> None: args = [ 'Project targeting', f"'{tv}'", - 'but tried to use feature introduced in', + 'but uses feature introduced in', f"'{self.feature_version}':", f'{self.feature_name}.', ] @@ -729,7 +729,7 @@ class FeatureDeprecated(FeatureCheckBase): def log_usage_warning(self, tv: str, location: T.Optional['mparser.BaseNode']) -> None: args = [ 'Project targeting', f"'{tv}'", - 'but tried to use feature deprecated since', + 'but uses feature deprecated since', f"'{self.feature_version}':", f'{self.feature_name}.', ] diff --git a/test cases/common/44 pkgconfig-gen/test.json b/test cases/common/44 pkgconfig-gen/test.json index c2eab2078..9e611b144 100644 --- a/test cases/common/44 pkgconfig-gen/test.json +++ b/test cases/common/44 pkgconfig-gen/test.json @@ -18,10 +18,10 @@ ], "stdout": [ { - "line": "test cases/common/44 pkgconfig-gen/meson.build:164: WARNING: Project targeting '>=0.60.0' but tried to use feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories." + "line": "test cases/common/44 pkgconfig-gen/meson.build:164: WARNING: Project targeting '>=0.60.0' but uses feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories." }, { - "line": "test cases/common/44 pkgconfig-gen/meson.build:170: WARNING: Project targeting '>=0.60.0' but tried to use feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories.", + "line": "test cases/common/44 pkgconfig-gen/meson.build:170: WARNING: Project targeting '>=0.60.0' but uses feature introduced in '0.62.0': pkgconfig.generate implicit variable for builtin directories.", "count": 0 }, { diff --git a/test cases/common/62 string arithmetic/test.json b/test cases/common/62 string arithmetic/test.json index e3519d050..62eed02d1 100644 --- a/test cases/common/62 string arithmetic/test.json +++ b/test cases/common/62 string arithmetic/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/common/62 string arithmetic/meson.build:25: WARNING: Project targeting '>=0.62.0' but tried to use feature introduced in '0.63.0': multiline format strings." + "line": "test cases/common/62 string arithmetic/meson.build:25: WARNING: Project targeting '>=0.62.0' but uses feature introduced in '0.63.0': multiline format strings." } ] } diff --git a/test cases/warning/1 version for string div/test.json b/test cases/warning/1 version for string div/test.json index 4622c1e94..2f09757a9 100644 --- a/test cases/warning/1 version for string div/test.json +++ b/test cases/warning/1 version for string div/test.json @@ -2,7 +2,7 @@ "stdout": [ { "comment": "literal '/' appears in output, irrespective of os.path.sep, as that's the operator", - "line": "test cases/warning/1 version for string div/meson.build:3: WARNING: Project targeting '>=0.48.0' but tried to use feature introduced in '0.49.0': / with string arguments." + "line": "test cases/warning/1 version for string div/meson.build:3: WARNING: Project targeting '>=0.48.0' but uses feature introduced in '0.49.0': / with string arguments." } ] } diff --git a/test cases/warning/6 list add/test.json b/test cases/warning/6 list add/test.json index 9ff8fda90..a4437ee80 100644 --- a/test cases/warning/6 list add/test.json +++ b/test cases/warning/6 list add/test.json @@ -1,7 +1,7 @@ { "stdout": [ { - "line": "test cases/warning/6 list add/meson.build:4: WARNING: Project targeting '>=0.59.0' but tried to use feature introduced in '0.60.0': list.<plus>. The right hand operand was not a list." + "line": "test cases/warning/6 list add/meson.build:4: WARNING: Project targeting '>=0.59.0' but uses feature introduced in '0.60.0': list.<plus>. The right hand operand was not a list." } ] } |