Skip to content

Commit 0cb5512

Browse files
authored
Unrolled build for rust-lang#132054
Rollup merge of rust-lang#132054 - onur-ozkan:cargo-config, r=Kobzol do not remove `.cargo` directory If vendoring isn't used bootstrap removes `.cargo` directory, which prevents developers from setting certain options in the `.cargo/config.toml` file. This was introduced in rust-lang#97513 (specifically in [this commit](rust-lang@345eb14)). Also, since rust-lang#123942, vendoring is now possible even in git sources, which means we shouldn't remove `.cargo` directory in git sources anymore.
2 parents be01dab + 47d6667 commit 0cb5512

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

src/bootstrap/bootstrap.py

-3
Original file line numberDiff line numberDiff line change
@@ -1092,9 +1092,6 @@ def check_vendored_status(self):
10921092
if not os.path.exists(cargo_dir):
10931093
eprint('ERROR: vendoring required, but .cargo/config does not exist.')
10941094
raise Exception("{} not found".format(cargo_dir))
1095-
else:
1096-
if os.path.exists(cargo_dir):
1097-
shutil.rmtree(cargo_dir)
10981095

10991096
def parse_args(args):
11001097
"""Parse the command line arguments that the python script needs."""

0 commit comments

Comments
 (0)