Skip to content

Fix compatibility with Rust 1.40 #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 23, 2019
Merged

Fix compatibility with Rust 1.40 #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
605bc9d
Fix clippy::needless-doctest-main
ilammy Dec 23, 2019
dd82f01
Fix Cargo with "--features"
ilammy Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions src/wrappers/themis/rust/libthemis-src/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,12 @@
//! Typical usage from a `*-sys` crate looks like this:
//!
//! ```no_run
//! fn main() {
//! #[cfg(feature = "vendored")]
//! libthemis_src::make();
//! #[cfg(feature = "vendored")]
//! libthemis_src::make();
//!
//! // Go on with your usual build.rs business, pkg_config crate
//! // should be able to locate the local installation of Themis.
//! // You'll probably need to use the static library.
//! }
//! // Go on with your usual build.rs business, pkg_config crate
//! // should be able to locate the local installation of Themis.
//! // You'll probably need to use the static library.
//! ```

use std::env;
Expand Down
9 changes: 7 additions & 2 deletions tests/rust/run_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,13 @@ cargo test --all -- --test-threads 1
echo
echo "Checking documentation..."
echo
cargo clean --doc && cargo doc --no-deps
cargo clean --doc && cargo doc --no-deps --features "vendored"
# Cargo does not allow "--features" to be used with virtual crate in workspace.
# Jump into RustThemis subdirectory to make Cargo happy and use "--workspace"
# to still document all crates in the workspace.
cd src/wrappers/themis/rust
cargo clean --doc && cargo doc --workspace --no-deps
cargo clean --doc && cargo doc --workspace --no-deps --features "vendored"
cd -

echo
echo "Rust tests OK!"
Expand Down