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

Use some fs shorthand functions. #8124

Merged
merged 2 commits into from
Apr 17, 2020
Merged

Use some fs shorthand functions. #8124

merged 2 commits into from
Apr 17, 2020

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Apr 17, 2020

This is just some cleanup, using some fs convenience functions that I think make the code more readable.

Note: While going through these, I found the out_dir_is_preserved test was broken and not doing what it was supposed to.

@rust-highfive
Copy link

r? @Eh2406

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 17, 2020
@ehuss ehuss force-pushed the fs-cleanup branch 2 times, most recently from 726e5a7 to f256721 Compare April 17, 2020 04:43
@@ -39,8 +39,7 @@ use some of the helper functions in this file to interact with the repository.
*/

use crate::{path2url, project, Project, ProjectBuilder};
use std::fs::{self, File};
use std::io::prelude::*;
use std::fs::{self};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

use std::fs ?

@Eh2406
Copy link
Contributor

Eh2406 commented Apr 17, 2020

Otherwize the part I skimed looks good. r+ when you are ready. :-) and thanks for the cleanup.

@ehuss
Copy link
Contributor Author

ehuss commented Apr 17, 2020

Hm, I sorta expected rustfmt would clean that up, but apparently that was removed because it broke semantics in some cases.

@bors r=Eh2406

@bors
Copy link
Contributor

bors commented Apr 17, 2020

📌 Commit 4ae79d2 has been approved by Eh2406

@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 Apr 17, 2020
@bors
Copy link
Contributor

bors commented Apr 17, 2020

⌛ Testing commit 4ae79d2 with merge 85fd286...

@bors
Copy link
Contributor

bors commented Apr 17, 2020

☀️ Test successful - checks-azure
Approved by: Eh2406
Pushing 85fd286 to master...

@bors bors merged commit 85fd286 into rust-lang:master Apr 17, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 22, 2020
Update cargo, rls

## cargo

17 commits in ebda5065ee8a1e46801380abcbac21a25bc7e755..8751eb3010d4cdb5329b5a6bd2b6d765c95b0dca
2020-04-16 14:28:43 +0000 to 2020-04-21 18:04:35 +0000
- Uplift windows gnu DLL import libraries. (rust-lang/cargo#8141)
- Add windows-gnu CI and fix tests (rust-lang/cargo#8139)
- Several updates to token/index handling. (rust-lang/cargo#7973)
- Add `resolver` opt-in for new feature resolver. (rust-lang/cargo#8129)
- Improve error message when running `cargo install .` (rust-lang/cargo#8137)
- fix mem replace unused (rust-lang/cargo#8138)
- Change `-Cembed-bitcode=no` use to `-Cbitcode-in-rlib=no`. (rust-lang/cargo#8134)
- Refactor BuildContext (rust-lang/cargo#8068)
- Rename allows_underscores to allows_dashes. (rust-lang/cargo#8135)
- Fixed a needless borrow. (rust-lang/cargo#8130)
- Add link to changelog in the Cargo book. (rust-lang/cargo#8126)
- Fix target for doc test cross compilation (rust-lang/cargo#8094)
- Add note about .cargo/config support. (rust-lang/cargo#8125)
- Fix pdb uplift when executable has dashes. (rust-lang/cargo#8123)
- Hint upgrading for future edition keys (rust-lang/cargo#8122)
- Use some fs shorthand functions. (rust-lang/cargo#8124)
- Update documentation to mention "config.toml" instead of "config" (rust-lang/cargo#8121)

## rls

1 commits in 2659cbf14bfb0929a16d7ce9b6858d0bb286ede7..7de2a1f299f8744ffe109139f9f1fdf28bfec909
2020-04-14 22:07:24 +0200 to 2020-04-19 22:41:55 +0000
- Update cargo (rust-lang/rls#1663)
@ehuss ehuss added this to the 1.45.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants