aboutsummaryrefslogtreecommitdiff
path: root/test cases/rust
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2023-04-02 12:08:24 -0400
committerEli Schwartz <eschwartz@archlinux.org>2023-04-04 15:06:17 -0400
commit8fc4649bfe7c0cad389769624e690e4fbf0f186f (patch)
treed1073bf10e7856e12934814ad5b89aa254ec5630 /test cases/rust
parent5fe7ecb861325dd8e88eedde4769269c6a10ccf0 (diff)
downloadmeson-8fc4649bfe7c0cad389769624e690e4fbf0f186f.zip
meson-8fc4649bfe7c0cad389769624e690e4fbf0f186f.tar.gz
meson-8fc4649bfe7c0cad389769624e690e4fbf0f186f.tar.bz2
propagate the most accurate node to error messages
During evaluation of codeblocks, we start off with an iteration of nodes, and then while evaluating them we may update the global self.current_node context. When catching and formatting errors, we didn't take into account that the node might be updated from the original top-level iteration. Switch to formatting errors using self.current_node instead, to ensure we can point at the likely most-accurate actual cause of an error. Also update the current node in a few more places, so that function calls always see the function call as the current node, even if the most recently parsed node was an argument to the function call. Fixes #11643
Diffstat (limited to 'test cases/rust')
-rw-r--r--test cases/rust/12 bindgen/test.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/test cases/rust/12 bindgen/test.json b/test cases/rust/12 bindgen/test.json
index ceedcc6..f94ee85 100644
--- a/test cases/rust/12 bindgen/test.json
+++ b/test cases/rust/12 bindgen/test.json
@@ -1,7 +1,7 @@
{
"stdout": [
{
- "line": "test cases/rust/12 bindgen/meson.build:30: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]."
+ "line": "test cases/rust/12 bindgen/meson.build:27: WARNING: Project targets '>= 0.63' but uses feature introduced in '1.0.0': \"rust.bindgen\" keyword argument \"include_directories\" of type array[str]."
}
]
}