From e9ee63ed033cb2fa64349fbe35f10e82ae264024 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 27 Feb 2024 23:24:28 +0100 Subject: cargo: support lib.path in Cargo.toml Cargo implements this configuration option to override the entry point of the library. To get test coverage, I've modified one of the two Cargo subprojects in the test to use a non-default library entrypoint. The other still uses the default. --- .../rust/22 cargo subproject/subprojects/foo-rs/Cargo.toml | 1 + .../rust/22 cargo subproject/subprojects/foo-rs/lib.rs | 13 +++++++++++++ .../rust/22 cargo subproject/subprojects/foo-rs/src/lib.rs | 13 ------------- 3 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 test cases/rust/22 cargo subproject/subprojects/foo-rs/lib.rs delete mode 100644 test cases/rust/22 cargo subproject/subprojects/foo-rs/src/lib.rs (limited to 'test cases') diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-rs/Cargo.toml b/test cases/rust/22 cargo subproject/subprojects/foo-rs/Cargo.toml index 796548d63..0f0225d06 100644 --- a/test cases/rust/22 cargo subproject/subprojects/foo-rs/Cargo.toml +++ b/test cases/rust/22 cargo subproject/subprojects/foo-rs/Cargo.toml @@ -5,6 +5,7 @@ edition = "2021" [lib] crate-type = ["cdylib"] +path = "lib.rs" # This dependency does not exist, verify optional works. [dependencies.notfound] diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-rs/lib.rs b/test cases/rust/22 cargo subproject/subprojects/foo-rs/lib.rs new file mode 100644 index 000000000..1c8cbc9d3 --- /dev/null +++ b/test cases/rust/22 cargo subproject/subprojects/foo-rs/lib.rs @@ -0,0 +1,13 @@ +extern "C" { + fn extra_func() -> i32; +} + +#[cfg(feature = "foo")] +#[no_mangle] +pub extern "C" fn rust_func() -> i32 { + let v: i32; + unsafe { + v = extra_func(); + }; + mybar::VALUE + v +} diff --git a/test cases/rust/22 cargo subproject/subprojects/foo-rs/src/lib.rs b/test cases/rust/22 cargo subproject/subprojects/foo-rs/src/lib.rs deleted file mode 100644 index 1c8cbc9d3..000000000 --- a/test cases/rust/22 cargo subproject/subprojects/foo-rs/src/lib.rs +++ /dev/null @@ -1,13 +0,0 @@ -extern "C" { - fn extra_func() -> i32; -} - -#[cfg(feature = "foo")] -#[no_mangle] -pub extern "C" fn rust_func() -> i32 { - let v: i32; - unsafe { - v = extra_func(); - }; - mybar::VALUE + v -} -- cgit v1.2.3