aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2022-05-19 10:53:17 +0200
committerEli Schwartz <eschwartz93@gmail.com>2022-05-19 07:18:43 -0400
commit087e7943d0e4210b3edb40e075189e4e40ba5f52 (patch)
treed6e0bbdad49ab778b191535cf41d82367b765a00
parent153e81a81623b2abad12eff1043c0d5b474f5c15 (diff)
downloadmeson-087e7943d0e4210b3edb40e075189e4e40ba5f52.zip
meson-087e7943d0e4210b3edb40e075189e4e40ba5f52.tar.gz
meson-087e7943d0e4210b3edb40e075189e4e40ba5f52.tar.bz2
Reword misleading warning
"tried to use" implies that the attempt was not successful, i.e. that meson ignored the feature. But that is not what happens, apart from the warning the feature works just fine. The new message is also shorter ;)
-rw-r--r--mesonbuild/interpreterbase/decorators.py4
-rw-r--r--test cases/common/44 pkgconfig-gen/test.json4
-rw-r--r--test cases/common/62 string arithmetic/test.json2
-rw-r--r--test cases/warning/1 version for string div/test.json2
-rw-r--r--test cases/warning/6 list add/test.json2
5 files changed, 7 insertions, 7 deletions
diff --git a/mesonbuild/interpreterbase/decorators.py b/mesonbuild/interpreterbase/decorators.py
index e678fd9..120c579 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 c2eab20..9e611b1 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 e3519d0..62eed02 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 4622c1e..2f09757 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 9ff8fda..a4437ee 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."
}
]
}