Skip to content
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.

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

Adjust permissions to support uniffi module outside the repo #175

Merged
merged 5 commits into from
Sep 8, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
1 change: 1 addition & 0 deletions src/error.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//! Error types
use std::error::Error as StdError;
use std::fmt::{self, Display, Formatter};

Expand Down
3 changes: 2 additions & 1 deletion src/ffi/mod.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#![allow(missing_docs, missing_debug_implementations)]
use std::marker::PhantomData;
use std::os::raw::c_char;
use std::time::Duration;
Expand All @@ -23,7 +24,7 @@ mod log;
mod result_list;
mod secret;
mod store;
mod tags;
pub mod tags;

#[cfg(all(feature = "migration", feature = "sqlite"))]
mod migration;
Expand Down
2 changes: 1 addition & 1 deletion src/ffi/tags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use crate::entry::EntryTag;

/// A wrapper type used for managing (de)serialization of tags
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
pub(crate) struct EntryTagSet<'e>(Cow<'e, [EntryTag]>);
pub struct EntryTagSet<'e>(Cow<'e, [EntryTag]>);

impl EntryTagSet<'_> {
pub fn into_vec(self) -> Vec<EntryTag> {
Expand Down
2 changes: 1 addition & 1 deletion src/kms/entry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub struct KeyEntry {
/// Thumbprints for the key
pub(crate) thumbprints: Vec<String>,
/// Thumbprints for the key
pub(crate) tags: Vec<EntryTag>,
pub tags: Vec<EntryTag>,
conanoc marked this conversation as resolved.
Show resolved Hide resolved
}

impl KeyEntry {
Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#![deny(missing_docs, missing_debug_implementations, rust_2018_idioms)]

#[macro_use]
mod error;
pub mod error;
andrewwhitehead marked this conversation as resolved.
Show resolved Hide resolved
pub use self::error::{Error, ErrorKind};

#[cfg(any(test, feature = "log"))]
Expand All @@ -22,9 +22,9 @@ pub use askar_storage as storage;
pub use askar_storage::future;

#[cfg(feature = "ffi")]
mod ffi;
pub mod ffi;
conanoc marked this conversation as resolved.
Show resolved Hide resolved

pub mod kms;

mod store;
pub mod store;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's in the store module that's not being exposed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the symbols I use from store.
pub use aries_askar::store::{entry, PassKey, Session, Store, StoreKeyMethod};

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can't you just use aries_askar::{entry, PassKey, Session, Store, StoreKeyMethod} though?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. It works.

pub use store::{entry, PassKey, Session, Store, StoreKeyMethod};
1 change: 1 addition & 0 deletions src/store.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
//! module for askar store and session
use askar_storage::backend::copy_profile;

use crate::{
Expand Down