From d3c2a7723f99e68f068ee7bb2146acdd96faedcf Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Thu, 15 Feb 2024 08:47:26 -0800 Subject: [PATCH 1/2] Update target data layout for LLVM update. --- tests/build-std/main.rs | 4 ++-- tests/testsuite/custom_target.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/build-std/main.rs b/tests/build-std/main.rs index 6f221b47e96..39c23196266 100644 --- a/tests/build-std/main.rs +++ b/tests/build-std/main.rs @@ -155,7 +155,7 @@ fn cross_custom() { r#" { "llvm-target": "x86_64-unknown-none-gnu", - "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", + "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128", "arch": "x86_64", "target-endian": "little", "target-pointer-width": "64", @@ -196,7 +196,7 @@ fn custom_test_framework() { r#" { "llvm-target": "x86_64-unknown-none-gnu", - "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", + "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128", "arch": "x86_64", "target-endian": "little", "target-pointer-width": "64", diff --git a/tests/testsuite/custom_target.rs b/tests/testsuite/custom_target.rs index 68f977de123..518b1967288 100644 --- a/tests/testsuite/custom_target.rs +++ b/tests/testsuite/custom_target.rs @@ -22,7 +22,7 @@ pub trait Copy { const SIMPLE_SPEC: &str = r#" { "llvm-target": "x86_64-unknown-none-gnu", - "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128", + "data-layout": "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-i128:128-f80:128-n8:16:32:64-S128", "arch": "x86_64", "target-endian": "little", "target-pointer-width": "64", From 52d2303dd01ad52c228c9e9aad62c3d9eb12acec Mon Sep 17 00:00:00 2001 From: Eric Huss Date: Thu, 15 Feb 2024 09:36:40 -0800 Subject: [PATCH 2/2] Update future-incompat output test for latest nightly. --- tests/testsuite/future_incompat_report.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testsuite/future_incompat_report.rs b/tests/testsuite/future_incompat_report.rs index c52bf25a9e1..131b5829eff 100644 --- a/tests/testsuite/future_incompat_report.rs +++ b/tests/testsuite/future_incompat_report.rs @@ -15,7 +15,7 @@ use cargo_test_support::{basic_manifest, project, Project}; // We use a special flag to force it to generate a report. const FUTURE_EXAMPLE: &'static str = "fn main() { let x = 1; }"; // Some text that will be displayed when the lint fires. -const FUTURE_OUTPUT: &'static str = "[..]unused_variables[..]"; +const FUTURE_OUTPUT: &'static str = "[..]unused variable[..]"; fn simple_project() -> Project { project()