Repository navigation
Commit d8ece6c
committed
fix(build): reconcile three call sites after concurrent merges
Two pairs of pull requests merged cleanly but left main unbuildable:
- DeusData#2447 added a route_mount parameter to emit_route_registration and
handle_route_registration, while DeusData#2464 added a new call to each with
the old argument list. The cross-language refused-route helper from
DeusData#2464 now takes route_mount and passes it on, and the pass_calls.c
call passes it too, as every other call site does. A route minted for
a refused binding therefore gets the same Laravel api mount as any
other route from that file.
- DeusData#2446 added a caller of is_project_db_file, which DeusData#2526 replaced with
cbm_is_project_index_db. The new caller uses the replacement, so the
owning-project lookup accepts the same file names as every other
project scan.
Verified: build/c/test-runner and the server binary build again; suites
edge_types_probe, mcp, cli and pipeline: 1081 passed, 4 platform skips.
Signed-off-by: Martin Vogel <martin.vogel.tech@gmail.com>1 parent 982621d commit d8ece6c
3 files changed
Lines changed: 6 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
12093 | 12093 | | |
12094 | 12094 | | |
12095 | 12095 | | |
12096 | | - | |
| 12096 | + | |
12097 | 12097 | | |
12098 | 12098 | | |
12099 | 12099 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
903 | 903 | | |
904 | 904 | | |
905 | 905 | | |
906 | | - | |
| 906 | + | |
907 | 907 | | |
908 | 908 | | |
909 | 909 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2668 | 2668 | | |
2669 | 2669 | | |
2670 | 2670 | | |
2671 | | - | |
| 2671 | + | |
| 2672 | + | |
2672 | 2673 | | |
2673 | 2674 | | |
2674 | 2675 | | |
| |||
2680 | 2681 | | |
2681 | 2682 | | |
2682 | 2683 | | |
2683 | | - | |
| 2684 | + | |
2684 | 2685 | | |
2685 | 2686 | | |
2686 | 2687 | | |
| |||
3259 | 3260 | | |
3260 | 3261 | | |
3261 | 3262 | | |
3262 | | - | |
| 3263 | + | |
3263 | 3264 | | |
3264 | 3265 | | |
3265 | 3266 | | |
| |||
0 commit comments