From 36f032ef15397f383c49b0e656bb36cd43492a1b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 24 Apr 2020 15:02:12 +0300 Subject: [PATCH] Configure crate-type to cdylib/rlib consistently in Cargo.toml And not in the source code, it's a build decision. --- audio/audiofx/src/lib.rs | 2 -- audio/claxon/src/lib.rs | 2 -- audio/csound/src/lib.rs | 2 -- audio/lewton/src/lib.rs | 2 -- audio/transcribe/src/lib.rs | 2 -- generic/file/Cargo.toml | 2 +- generic/file/src/lib.rs | 2 -- generic/sodium/src/lib.rs | 2 -- generic/threadshare/src/lib.rs | 1 - net/reqwest/src/lib.rs | 2 -- net/rusoto/src/lib.rs | 2 -- tutorial/Cargo.toml | 2 +- utils/togglerecord/src/lib.rs | 2 -- video/cdg/src/lib.rs | 2 -- video/closedcaption/src/lib.rs | 1 - video/dav1d/src/lib.rs | 2 -- video/flavors/Cargo.toml | 2 +- video/flavors/src/lib.rs | 2 -- video/rav1e/src/lib.rs | 2 -- 19 files changed, 3 insertions(+), 33 deletions(-) diff --git a/audio/audiofx/src/lib.rs b/audio/audiofx/src/lib.rs index 10aaf46b..ea3e01b8 100644 --- a/audio/audiofx/src/lib.rs +++ b/audio/audiofx/src/lib.rs @@ -6,8 +6,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_type = "cdylib"] - extern crate byte_slice_cast; #[macro_use] extern crate glib; diff --git a/audio/claxon/src/lib.rs b/audio/claxon/src/lib.rs index d6058bd7..7e921491 100644 --- a/audio/claxon/src/lib.rs +++ b/audio/claxon/src/lib.rs @@ -6,8 +6,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use] diff --git a/audio/csound/src/lib.rs b/audio/csound/src/lib.rs index 2343bfeb..e10915bd 100644 --- a/audio/csound/src/lib.rs +++ b/audio/csound/src/lib.rs @@ -15,8 +15,6 @@ // Free Software Foundation, Inc., 51 Franklin Street, Suite 500, // Boston, MA 02110-1335, USA. -#![crate_type = "cdylib"] - use gst::gst_plugin_define; mod filter; diff --git a/audio/lewton/src/lib.rs b/audio/lewton/src/lib.rs index 2ba1f7e7..88a85cfe 100644 --- a/audio/lewton/src/lib.rs +++ b/audio/lewton/src/lib.rs @@ -6,8 +6,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use] diff --git a/audio/transcribe/src/lib.rs b/audio/transcribe/src/lib.rs index 817e354b..a295459e 100644 --- a/audio/transcribe/src/lib.rs +++ b/audio/transcribe/src/lib.rs @@ -15,8 +15,6 @@ // Free Software Foundation, Inc., 51 Franklin Street, Suite 500, // Boston, MA 02110-1335, USA. -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use] diff --git a/generic/file/Cargo.toml b/generic/file/Cargo.toml index 7cbc5fc5..d811ba52 100644 --- a/generic/file/Cargo.toml +++ b/generic/file/Cargo.toml @@ -15,7 +15,7 @@ lazy_static = "1.0" [lib] name = "gstrsfile" -crate-type = ["cdylib"] +crate-type = ["cdylib", "rlib"] path = "src/lib.rs" [build-dependencies] diff --git a/generic/file/src/lib.rs b/generic/file/src/lib.rs index 90616e87..2acde3b9 100644 --- a/generic/file/src/lib.rs +++ b/generic/file/src/lib.rs @@ -6,8 +6,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use] diff --git a/generic/sodium/src/lib.rs b/generic/sodium/src/lib.rs index 3961ddc7..5e5470f8 100644 --- a/generic/sodium/src/lib.rs +++ b/generic/sodium/src/lib.rs @@ -20,8 +20,6 @@ // // SPDX-License-Identifier: MIT -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use] diff --git a/generic/threadshare/src/lib.rs b/generic/threadshare/src/lib.rs index 33e36959..af57fffc 100644 --- a/generic/threadshare/src/lib.rs +++ b/generic/threadshare/src/lib.rs @@ -22,7 +22,6 @@ // Needed for `select!` in `Socket::next` // see https://docs.rs/futures/0.3.1/futures/macro.select.html #![recursion_limit = "1024"] -#![crate_type = "cdylib"] pub use tokio; diff --git a/net/reqwest/src/lib.rs b/net/reqwest/src/lib.rs index 7960329b..f7bc6ce6 100644 --- a/net/reqwest/src/lib.rs +++ b/net/reqwest/src/lib.rs @@ -6,8 +6,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use] diff --git a/net/rusoto/src/lib.rs b/net/rusoto/src/lib.rs index 245e9626..aaeabc9e 100644 --- a/net/rusoto/src/lib.rs +++ b/net/rusoto/src/lib.rs @@ -6,8 +6,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use] diff --git a/tutorial/Cargo.toml b/tutorial/Cargo.toml index a57f5539..e48d5eee 100644 --- a/tutorial/Cargo.toml +++ b/tutorial/Cargo.toml @@ -19,7 +19,7 @@ once_cell = "1.0" [lib] name = "gstrstutorial" -crate-type = ["cdylib"] +crate-type = ["cdylib", "rlib"] path = "src/lib.rs" [build-dependencies] diff --git a/utils/togglerecord/src/lib.rs b/utils/togglerecord/src/lib.rs index 9f215466..84a77a32 100644 --- a/utils/togglerecord/src/lib.rs +++ b/utils/togglerecord/src/lib.rs @@ -15,8 +15,6 @@ // Free Software Foundation, Inc., 51 Franklin Street, Suite 500, // Boston, MA 02110-1335, USA. -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use] diff --git a/video/cdg/src/lib.rs b/video/cdg/src/lib.rs index 85ee04d5..ea547175 100644 --- a/video/cdg/src/lib.rs +++ b/video/cdg/src/lib.rs @@ -6,8 +6,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use] diff --git a/video/closedcaption/src/lib.rs b/video/closedcaption/src/lib.rs index fa77b0c1..7e7ea4b6 100644 --- a/video/closedcaption/src/lib.rs +++ b/video/closedcaption/src/lib.rs @@ -15,7 +15,6 @@ // Free Software Foundation, Inc., 51 Franklin Street, Suite 500, // Boston, MA 02110-1335, USA. -#![crate_type = "cdylib"] #![recursion_limit = "128"] // These macros are in weird paths currently, diff --git a/video/dav1d/src/lib.rs b/video/dav1d/src/lib.rs index a12b195f..2567134b 100644 --- a/video/dav1d/src/lib.rs +++ b/video/dav1d/src/lib.rs @@ -6,8 +6,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use] diff --git a/video/flavors/Cargo.toml b/video/flavors/Cargo.toml index 82dc9b73..805ee316 100644 --- a/video/flavors/Cargo.toml +++ b/video/flavors/Cargo.toml @@ -22,7 +22,7 @@ smallvec = "1.0" [lib] name = "gstrsflv" -crate-type = ["cdylib"] +crate-type = ["cdylib", "rlib"] path = "src/lib.rs" [build-dependencies] diff --git a/video/flavors/src/lib.rs b/video/flavors/src/lib.rs index 7cab1829..479716ed 100644 --- a/video/flavors/src/lib.rs +++ b/video/flavors/src/lib.rs @@ -6,8 +6,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use] diff --git a/video/rav1e/src/lib.rs b/video/rav1e/src/lib.rs index d9426648..452ee2f2 100644 --- a/video/rav1e/src/lib.rs +++ b/video/rav1e/src/lib.rs @@ -6,8 +6,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![crate_type = "cdylib"] - #[macro_use] extern crate glib; #[macro_use]