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.

Sign up for GitHub

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

Jump to bottom

Update cargo, rls #100065

Merged
merged 4 commits into from
Aug 4, 2022
Merged

Update cargo, rls #100065

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
05bdd96
Update cargo
ehuss Aug 2, 2022
c627d40
Remove CARGO_TEST_DISABLE_GIT_CLI
ehuss Aug 2, 2022
39358bf
Update rls
ehuss Aug 3, 2022
bc65aae
Update cargo
ehuss Aug 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/bootstrap/test.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,8 +289,6 @@ impl Step for Cargo {
// Don't run cross-compile tests, we may not have cross-compiled libstd libs
// available.
cargo.env("CFG_DISABLE_CROSS_TESTS", "1");
// Disable a test that has issues with mingw.
cargo.env("CARGO_TEST_DISABLE_GIT_CLI", "1");
// Forcibly disable tests using nightly features since any changes to
// those features won't be able to land.
cargo.env("CARGO_TEST_DISABLE_NIGHTLY", "1");
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Open in desktop
Submodule cargo updated 151 files
2 changes: 1 addition & 1 deletion src/tools/rls
Open in desktop
Submodule rls updated 4 files
+32 −25 Cargo.lock
+2 −2 Cargo.toml
+1 −1 rls/src/build/cargo.rs
+1 −1 rls/src/config.rs