Merge pull request #12606 from Rmys/master

rust ver. bump
This commit is contained in:
Rmys
2023-10-21 22:21:21 +03:00
committed by GitHub
@@ -4,19 +4,23 @@ Date: Thu, 13 Jul 2023 21:16:53 +0200
Subject: [PATCH] bootstrap: Change bash-completion dir Subject: [PATCH] bootstrap: Change bash-completion dir
--- ---
src/bootstrap/dist.rs | 2 +- src/bootstrap/dist.rs | 6 +++++-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 05e106637d74..426b1277fb23 100644 index 78a5faeae04b..4f4e4e508619 100644
--- a/src/bootstrap/dist.rs --- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs +++ b/src/bootstrap/dist.rs
@@ -1073,7 +1073,7 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> { @@ -1079,7 +1079,11 @@ fn run(self, builder: &Builder<'_>) -> Option<GeneratedTarball> {
tarball.add_file(&cargo, "bin", 0o755);
tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644); tarball.add_file(etc.join("_cargo"), "share/zsh/site-functions", 0o644);
tarball.add_renamed_file( - tarball.add_renamed_file(etc.join("cargo.bashcomp.sh"), "etc/bash_completion.d", "cargo");
etc.join("cargo.bashcomp.sh"), + tarball.add_renamed_file(
- "src/etc/bash_completion.d", + etc.join("cargo.bashcomp.sh"),
+ "share/bash-completion/completions", + "share/bash-completion/completions",
"cargo", + "cargo",
); + );
tarball.add_dir(etc.join("man"), "share/man/man1"); tarball.add_dir(etc.join("man"), "share/man/man1");
tarball.add_legal_and_readme_to("share/doc/cargo");