From 05bdd9633b77b8fa28199988238fd73cc2b34612 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 2 Aug 2022 09:24:03 -0700 Subject: [PATCH 1/4] Update cargo --- src/tools/cargo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/cargo b/src/tools/cargo index 85b500ccad8cd..5514f1e0e1b36 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 85b500ccad8cd0b63995fd94a03ddd4b83f7905b +Subproject commit 5514f1e0e1b3650ed8a78306198e90b66b292693 From c627d402b466e9e4f4c1e10d1bc3cbd2267063b4 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 2 Aug 2022 09:25:35 -0700 Subject: [PATCH 2/4] Remove CARGO_TEST_DISABLE_GIT_CLI This was a leftover from the Appveyor days. --- src/bootstrap/test.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs index 5c8034d53e3ad..05403cf48c7c5 100644 --- a/src/bootstrap/test.rs +++ b/src/bootstrap/test.rs @@ -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"); From 39358bf00c3e02b8844f597603e16a5f270c37d6 Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Tue, 2 Aug 2022 20:08:30 -0700 Subject: [PATCH 3/4] Update rls --- src/tools/rls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/rls b/src/tools/rls index fcf1f94c9ab2a..4d8b0a19986a4 160000 --- a/src/tools/rls +++ b/src/tools/rls @@ -1 +1 @@ -Subproject commit fcf1f94c9ab2acc18cfd4368a4aeb38e77da9649 +Subproject commit 4d8b0a19986a4daab37287a5b5fe2da0775d1873 From bc65aaea786ee6d59be7b9d1dd867a3fc5421e7f Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Wed, 3 Aug 2022 12:57:28 -0700 Subject: [PATCH 4/4] Update cargo --- src/tools/cargo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tools/cargo b/src/tools/cargo index 5514f1e0e1b36..4fd148c47e733 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 5514f1e0e1b3650ed8a78306198e90b66b292693 +Subproject commit 4fd148c47e733770c537efac5220744945d572ef