Commit b41a16c
authored
fix(config): combine key error context into one (rust-lang#16004)
### What does this PR try to resolve?
This is a cleanup of annoying multiple "failed to parse key".
```
Caused by:
failed to parse key `alias`
Caused by:
failed to parse key `nested`
```
to
```
Caused by:
failed to parse config at path `alias.nested`
```
This also open a door to using annotate-snippets to get the span of a
key path.
### How to test and review this PR?
This controversial part is we are using the invalid syntax to represent
the key path.
For example, `alias.nested[2]` refers to
```toml
[alias]
nested = ["a", "b", "c"]
# ^^^ this one
```
r? MuscraftFile tree
6 files changed
+50
-20
lines changed- src/cargo/util/context
- tests/testsuite
6 files changed
+50
-20
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
112 | 112 | | |
113 | 113 | | |
114 | 114 | | |
115 | | - | |
| 115 | + | |
116 | 116 | | |
117 | 117 | | |
118 | 118 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2155 | 2155 | | |
2156 | 2156 | | |
2157 | 2157 | | |
| 2158 | + | |
| 2159 | + | |
| 2160 | + | |
| 2161 | + | |
| 2162 | + | |
| 2163 | + | |
2158 | 2164 | | |
2159 | 2165 | | |
2160 | 2166 | | |
| |||
2197 | 2203 | | |
2198 | 2204 | | |
2199 | 2205 | | |
| 2206 | + | |
| 2207 | + | |
| 2208 | + | |
| 2209 | + | |
| 2210 | + | |
| 2211 | + | |
| 2212 | + | |
| 2213 | + | |
| 2214 | + | |
| 2215 | + | |
| 2216 | + | |
| 2217 | + | |
| 2218 | + | |
| 2219 | + | |
| 2220 | + | |
| 2221 | + | |
| 2222 | + | |
| 2223 | + | |
| 2224 | + | |
| 2225 | + | |
| 2226 | + | |
| 2227 | + | |
2200 | 2228 | | |
2201 | 2229 | | |
2202 | 2230 | | |
2203 | 2231 | | |
2204 | 2232 | | |
2205 | 2233 | | |
2206 | | - | |
| 2234 | + | |
| 2235 | + | |
2207 | 2236 | | |
2208 | | - | |
| 2237 | + | |
| 2238 | + | |
| 2239 | + | |
| 2240 | + | |
2209 | 2241 | | |
2210 | 2242 | | |
2211 | 2243 | | |
2212 | 2244 | | |
2213 | 2245 | | |
2214 | 2246 | | |
2215 | | - | |
2216 | | - | |
2217 | | - | |
2218 | | - | |
2219 | | - | |
| 2247 | + | |
| 2248 | + | |
| 2249 | + | |
| 2250 | + | |
| 2251 | + | |
| 2252 | + | |
| 2253 | + | |
| 2254 | + | |
| 2255 | + | |
2220 | 2256 | | |
2221 | 2257 | | |
2222 | 2258 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
47 | 47 | | |
48 | 48 | | |
49 | 49 | | |
50 | | - | |
51 | | - | |
52 | | - | |
53 | | - | |
| 50 | + | |
54 | 51 | | |
55 | 52 | | |
56 | 53 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
| 90 | + | |
91 | 91 | | |
92 | 92 | | |
93 | | - | |
94 | | - | |
95 | | - | |
96 | | - | |
| 93 | + | |
97 | 94 | | |
98 | 95 | | |
99 | 96 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1363 | 1363 | | |
1364 | 1364 | | |
1365 | 1365 | | |
1366 | | - | |
| 1366 | + | |
1367 | 1367 | | |
1368 | 1368 | | |
1369 | | - | |
| 1369 | + | |
1370 | 1370 | | |
1371 | 1371 | | |
1372 | 1372 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
527 | 527 | | |
528 | 528 | | |
529 | 529 | | |
530 | | - | |
| 530 | + | |
531 | 531 | | |
532 | 532 | | |
533 | 533 | | |
| |||
0 commit comments