Skip to content
This repository has been archived by the owner on Dec 29, 2022. It is now read-only.

Cooperate with Cargo regarding target/ backup exclusion #1687

Merged
merged 2 commits into from
Nov 18, 2020

Conversation

jstasiak
Copy link
Contributor

Cargo excludes newly created target/ from backups[1]. This is an attempt
to make rls interact nicely with it and prevent build directories like
target/debug/ and target/release/ from polluting backups.

The cargo dependency is updated to the latest cargo in order for the
paths::create_dir_all_excluded_from_backups_atomic() function to become
available to rls.

[1] rust-lang/cargo#8378

Note: I'm not sure about many things here, like the test placement, the way to run rls in the test etc. so I followed some patterns I spotted in the code without deep understanding of what's going on, I'm happy to polish this to a desired state if I'm given some guidance.

Cargo excludes newly created target/ from backups[1]. This is an attempt
to make rls interact nicely with it and prevent build directories like
target/debug/ and target/release/ from polluting backups.

The cargo dependency is updated to the latest cargo in order for the
paths::create_dir_all_excluded_from_backups_atomic() function to become
available to rls.

[1] rust-lang/cargo#8378
@jstasiak
Copy link
Contributor Author

I don't know what causes the build failure but when I run

CFG_RELEASE_CHANNEL=nightly CFG_RELEASE=nightly RUST_BACKTRACE=full cargo test -v test_tooltip_std -- --ignored

on the current master branch (commit dd341d5) it also fails for me in a similar fashion (rustc 1.46.0-nightly (8ac1525e0 2020-07-07), cargo 1.46.0-nightly (fede83ccf 2020-07-02)).

@bors
Copy link
Contributor

bors commented Jul 25, 2020

☔ The latest upstream changes (presumably #1689) made this pull request unmergeable. Please resolve the merge conflicts.

@jstasiak
Copy link
Contributor Author

I don't think the test_tooltip_std build failure is due to my change.

@Xanewok
Copy link
Member

Xanewok commented Nov 18, 2020

Thanks, sorry this was laying for so long.

@Xanewok Xanewok merged commit bf2e4dc into rust-lang:master Nov 18, 2020
@jstasiak jstasiak deleted the target-backup-exclusion branch November 18, 2020 17:01
@jstasiak
Copy link
Contributor Author

Cheers, glad it landed in the end. Should I be concerned about those failed checks or are they unrelated to my change?

@Xanewok
Copy link
Member

Xanewok commented Nov 18, 2020

They were unrelated 🙂 No worries.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants