From 4ccfa60ba10340872261070ef406ccef48902e17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emil=20Gardstr=C3=B6m?= Date: Thu, 6 Feb 2025 21:27:31 +0100 Subject: [PATCH 1/2] don't look at `package.metadata.cross` when the package isn't part of the current workspace --- .changes/1623.json | 4 ++++ src/lib.rs | 1 + 2 files changed, 5 insertions(+) create mode 100644 .changes/1623.json diff --git a/.changes/1623.json b/.changes/1623.json new file mode 100644 index 000000000..a35610e86 --- /dev/null +++ b/.changes/1623.json @@ -0,0 +1,4 @@ +{ + "type": "fixed", + "description": "fixed an issue where cross would look for metadata.cross outside the workspace" + } diff --git a/src/lib.rs b/src/lib.rs index c3d2ba78e..a65668e17 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -959,6 +959,7 @@ pub fn toml(metadata: &CargoMetadata, msg_info: &mut MessageInfo) -> Result Date: Thu, 6 Feb 2025 21:34:34 +0100 Subject: [PATCH 2/2] fix deny check, using atty is fine for now --- deny.toml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deny.toml b/deny.toml index 756088cc5..0df3b2d50 100644 --- a/deny.toml +++ b/deny.toml @@ -9,10 +9,11 @@ targets = [ [advisories] version = 2 -# FIXME: remove this if/when clap changes to is-terminal, atty is -# patched, or we migrated to an MSRV of 1.66.0. ignore = [ + # FIXME: remove this if/when clap changes to is-terminal, atty is + # patched, or we migrated to an MSRV of 1.66.0. "RUSTSEC-2021-0145", + "RUSTSEC-2024-0375" ] [bans]