Auto merge of #124947 - cuviper:beta-next, r=cuviper

[beta] backports

- Consider inner modules to be local in the `non_local_definitions` lint #124539
- Fix bootstrap panic when build from tarball #124668

r? cuviper