Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Fixes #6874 #6905

Merged
merged 1 commit into from May 5, 2019

Conversation

Projects
None yet
4 participants
@ArifRoktim
Copy link
Contributor

commented May 4, 2019

Bash completion for cargo on the latest version of stock macOS produced syntax errors. More info in #6874 . This PR should fix that, but as I don't have any apple devices, I can't test it.

Pinging @jimmycuadra or anyone who runs macOS: If you have the time, could you please check if applying the commit in this PR fixes the syntax error when running the stock bash that comes with macOS?
Quick one-liner to apply the commit would be:

patch -d "$(rustc --print sysroot)/etc/bash_completion.d/" cargo <(curl https://github.com/rust-lang/cargo/commit/e2c519dd7ac61e4d2f94cad60ef920ce4aa1718f.patch)

Once this PR is confirmed to work, it can marked as ready.

@rust-highfive

This comment has been minimized.

Copy link

commented May 4, 2019

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ehuss (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@ehuss ehuss marked this pull request as ready for review May 5, 2019

@ehuss

This comment has been minimized.

Copy link
Contributor

commented May 5, 2019

Thanks, I can confirm it works in bash 3.2.57.

@bors r+

@bors

This comment has been minimized.

Copy link
Contributor

commented May 5, 2019

📌 Commit e2c519d has been approved by ehuss

@bors

This comment has been minimized.

Copy link
Contributor

commented May 5, 2019

⌛️ Testing commit e2c519d with merge afd240e...

bors added a commit that referenced this pull request May 5, 2019

Auto merge of #6905 - ArifRoktim:fork/bash_complete, r=ehuss
Fixes #6874

Bash completion for cargo on the latest version of stock macOS produced syntax errors. More info in #6874 . This PR should fix that, but as I don't have any apple devices, I can't test it.

Pinging @jimmycuadra or anyone who runs macOS: If you have the time, could you please check if applying the commit in this PR fixes the syntax error when running the stock bash that comes with macOS?
Quick one-liner to apply the commit would be:
```bash
patch -d "$(rustc --print sysroot)/etc/bash_completion.d/" cargo <(curl https://github.com/rust-lang/cargo/commit/e2c519dd7ac61e4d2f94cad60ef920ce4aa1718f.patch)
```

Once this PR is confirmed to work, it can marked as ready.
@bors

This comment has been minimized.

Copy link
Contributor

commented May 5, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: ehuss
Pushing afd240e to master...

@bors bors merged commit e2c519d into rust-lang:master May 5, 2019

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
homu Test successful
Details

@ehuss ehuss referenced this pull request May 7, 2019

Merged

Update cargo #60596

bors added a commit to rust-lang/rust that referenced this pull request May 7, 2019

Auto merge of #60596 - ehuss:update-cargo, r=alexcrichton
Update cargo

12 commits in beb8fcb5248dc2e6aa488af9613216d5ccb31c6a..759b6161a328db1d4863139e90875308ecd25a75
2019-04-30 23:58:00 +0000 to 2019-05-06 20:47:49 +0000
- Small things (rust-lang/cargo#6910)
- Fix skipping over invalid registry packages (rust-lang/cargo#6912)
- Fixes rust-lang/cargo#6874 (rust-lang/cargo#6905)
- doc: Format examples of version to ease reading (rust-lang/cargo#6907)
- fix more typos (codespell) (rust-lang/cargo#6903)
- Parse less JSON on null builds (rust-lang/cargo#6880)
- chore: Update opener to 0.4 (rust-lang/cargo#6902)
- Update documentation for auto-discovery. (rust-lang/cargo#6898)
- Update some doc links. (rust-lang/cargo#6897)
- Default Cargo.toml template provide help for completing the metadata (rust-lang/cargo#6881)
- Run 'cargo fmt --all' (rust-lang/cargo#6896)
- Refactor command definition (rust-lang/cargo#6894)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.