Commit 9cde0f7
committed
Fully remove submodule handling from bootstrap.py
These submodules were previously updated in python because Cargo gives a hard error if toml files
are missing from the workspace:
```
error: failed to load manifest for workspace member `/home/jnelson/rust-lang/rust/src/tools/rls`
Caused by:
failed to read `/home/jnelson/rust-lang/rust/src/tools/rls/Cargo.toml`
Caused by:
No such file or directory (os error 2)
failed to run: /home/jnelson/rust-lang/rust/build/x86_64-unknown-linux-gnu/stage0/bin/cargo build --manifest-path /home/jnelson/rust-lang/rust/src/bootstrap/Cargo.toml
```
However, bootstrap doesn't actually need to be part of the workspace.
Remove it so we can move submodule handling fully to Rust, avoiding duplicate code between Rust and Python.
Note that this does break `cargo run`; it has to be `cd src/bootstrap && cargo run` now.
Given that we're planning to make the main entrypoint a shell script (or rust binary),
I think this is a good tradeoff for reduced complexity in bootstrap.py.1 parent a09c668 commit 9cde0f7
File tree
6 files changed
+705
-183
lines changed- src/bootstrap
6 files changed
+705
-183
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
215 | 215 | | |
216 | 216 | | |
217 | 217 | | |
218 | | - | |
219 | | - | |
220 | | - | |
221 | | - | |
222 | | - | |
223 | | - | |
224 | | - | |
225 | | - | |
226 | | - | |
227 | | - | |
228 | | - | |
229 | | - | |
230 | | - | |
231 | | - | |
232 | | - | |
233 | | - | |
234 | | - | |
235 | | - | |
236 | | - | |
237 | | - | |
238 | | - | |
239 | | - | |
240 | | - | |
241 | | - | |
242 | | - | |
243 | | - | |
244 | 218 | | |
245 | 219 | | |
246 | 220 | | |
| |||
735 | 709 | | |
736 | 710 | | |
737 | 711 | | |
738 | | - | |
739 | | - | |
740 | | - | |
741 | | - | |
742 | | - | |
743 | | - | |
744 | | - | |
745 | | - | |
746 | | - | |
747 | 712 | | |
748 | 713 | | |
749 | 714 | | |
| |||
1023 | 988 | | |
1024 | 989 | | |
1025 | 990 | | |
1026 | | - | |
| 991 | + | |
1027 | 992 | | |
1028 | | - | |
| 993 | + | |
1029 | 994 | | |
1030 | 995 | | |
1031 | 996 | | |
| |||
2670 | 2635 | | |
2671 | 2636 | | |
2672 | 2637 | | |
2673 | | - | |
| 2638 | + | |
2674 | 2639 | | |
2675 | | - | |
| 2640 | + | |
2676 | 2641 | | |
2677 | 2642 | | |
2678 | 2643 | | |
| |||
2931 | 2896 | | |
2932 | 2897 | | |
2933 | 2898 | | |
2934 | | - | |
2935 | | - | |
2936 | | - | |
2937 | | - | |
2938 | | - | |
2939 | | - | |
2940 | | - | |
2941 | | - | |
2942 | | - | |
2943 | | - | |
2944 | | - | |
2945 | | - | |
2946 | 2899 | | |
2947 | 2900 | | |
2948 | 2901 | | |
| |||
5147 | 5100 | | |
5148 | 5101 | | |
5149 | 5102 | | |
5150 | | - | |
5151 | | - | |
5152 | | - | |
5153 | | - | |
5154 | | - | |
5155 | | - | |
5156 | | - | |
5157 | | - | |
5158 | | - | |
5159 | | - | |
5160 | | - | |
5161 | | - | |
5162 | | - | |
5163 | | - | |
5164 | | - | |
5165 | 5103 | | |
5166 | 5104 | | |
5167 | 5105 | | |
| |||
5538 | 5476 | | |
5539 | 5477 | | |
5540 | 5478 | | |
5541 | | - | |
| 5479 | + | |
5542 | 5480 | | |
5543 | 5481 | | |
5544 | 5482 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
3 | 2 | | |
4 | | - | |
5 | 3 | | |
6 | 4 | | |
7 | 5 | | |
| |||
44 | 42 | | |
45 | 43 | | |
46 | 44 | | |
| 45 | + | |
47 | 46 | | |
48 | 47 | | |
49 | 48 | | |
| |||
97 | 96 | | |
98 | 97 | | |
99 | 98 | | |
100 | | - | |
101 | | - | |
102 | | - | |
103 | | - | |
104 | | - | |
105 | | - | |
106 | | - | |
107 | | - | |
108 | | - | |
109 | 99 | | |
110 | 100 | | |
111 | 101 | | |
| |||
0 commit comments