Skip to content

Revert "fix: 🐛 etc/bash_complettion -> src/etc/... to avoid copy … #113579

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Jul 12, 2023

Conversation

ekusiadadus
Copy link
Contributor

@ekusiadadus ekusiadadus commented Jul 11, 2023

why

  • revert my broken PR

reverts #110906

This reverts commit 08ce68b.

@rustbot
Copy link
Collaborator

rustbot commented Jul 11, 2023

r? @albertlarsan68

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jul 11, 2023
@albertlarsan68
Copy link
Member

Thanks for the PR!
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jul 11, 2023

📌 Commit 05bc71c has been approved by albertlarsan68

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 11, 2023
workingjubilee added a commit to workingjubilee/rustc that referenced this pull request Jul 12, 2023
Revert "fix: 🐛 etc/bash_complettion -> src/etc/... to avoid copy …

## why

- [x] revert my broken PR

rust-lang#110906

This reverts commit 08ce68b.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 12, 2023
…kingjubilee

Rollup of 5 pull requests

Successful merges:

 - rust-lang#113373 (various download-rustc fixes)
 - rust-lang#113385 (style-guide: Fix chain example to match rustfmt behavior)
 - rust-lang#113567 (While let suggestion will work for closure body)
 - rust-lang#113579 (Revert "fix: 🐛 etc/bash_complettion -> src/etc/... to avoid copy …)
 - rust-lang#113595 (Use constants from object crate)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit dc78ced into rust-lang:master Jul 12, 2023
@rustbot rustbot added this to the 1.73.0 milestone Jul 12, 2023
pld-gitsync pushed a commit to pld-linux/rust that referenced this pull request Jul 14, 2023
- fix build by applying upstream revert, see:
  rust-lang/rust#113678
- roll back to original location for bash completion, from:
  rust-lang/rust#113579
@ehuss ehuss added beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Jul 14, 2023
@ehuss
Copy link
Contributor

ehuss commented Jul 14, 2023

I'm nominating for beta and stable backport. This broke bash completion for users of rustup, see rust-lang/rustup#3407.

cc @rust-lang/release

@apiraino
Copy link
Contributor

Beta and stable backports accepted as per compiler team on Zulip

@rustbot label +beta-accepted +stable-accepted

@rustbot rustbot added beta-accepted Accepted for backporting to the compiler in the beta channel. stable-accepted Accepted for backporting to the compiler in the stable channel. labels Jul 28, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 31, 2023
Prepare Rust 1.71.1

This PR prepares the Rust 1.71.1 release, which contains:

* rust-lang#113802
* rust-lang#113579
* rust-lang#111516
* rust-lang#112517
* rust-lang@67b5990 (from rust-lang#113678)

r? `@ghost`
cc `@rust-lang/release`
@cuviper cuviper mentioned this pull request Aug 12, 2023
@cuviper cuviper modified the milestones: 1.73.0, 1.72.0 Aug 12, 2023
@cuviper cuviper removed beta-nominated Nominated for backporting to the compiler in the beta channel. stable-nominated Nominated for backporting to the compiler in the stable channel. labels Aug 12, 2023
@cuviper cuviper modified the milestones: 1.72.0, 1.71.1 Aug 12, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 12, 2023
[beta] backport

* Restrict linker version script of proc-macro crates to just its two symbols rust-lang#114470
* bootstrap: config: fix version comparison bug rust-lang#114440
* lint/ctypes: only try normalize rust-lang#113921
* Avoid tls access while iterating through mpsc thread entries rust-lang#113861
* Substitute types before checking inlining compatibility. rust-lang#113802
* Revert "fix: bug etc/bash_complettion -> src/etc/... to avoid copy error" rust-lang#113579
* lint/ctypes: fix () return type checks rust-lang#113457
* Rename and allow cast_ref_to_mut lint rust-lang#113422
* Ignore flaky clippy tests. rust-lang#113621

r? cuviper
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. stable-accepted Accepted for backporting to the compiler in the stable channel. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants