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.

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

Jump to bottom

Remove uniffi_api modules #1682

Merged
merged 2 commits into from
Mar 20, 2023
Merged

Remove uniffi_api modules #1682

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
ce7da9a
Use Rust conventions for variable names in UDL
jplatte Mar 20, 2023
0105ebf
ffi: Inline uniffi_api modules
jplatte Mar 20, 2023
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
4 changes: 2 additions & 2 deletions bindings/matrix-sdk-crypto-ffi/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ mod error;
mod logger;
mod machine;
mod responses;
mod uniffi_api;
mod users;
mod verification;

Expand Down Expand Up @@ -47,7 +46,6 @@ use ruma::{
};
use serde::{Deserialize, Serialize};
use tokio::runtime::Runtime;
use uniffi_api::*;
pub use users::UserIdentity;
pub use verification::{
CancelInfo, ConfirmVerificationResult, QrCode, QrCodeListener, QrCodeState,
Expand Down Expand Up @@ -849,6 +847,8 @@ fn vodozemac_version() -> String {
vodozemac::VERSION.to_owned()
}

uniffi::include_scaffolding!("olm");

mod uniffi_types {
pub use crate::{
backup_recovery_key::{
Expand Down
2 changes: 1 addition & 1 deletion bindings/matrix-sdk-crypto-ffi/src/olm.udl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ interface MigrationError {
};

callback interface Logger {
void log(string logLine);
void log(string log_line);
};

callback interface ProgressListener {
Expand Down
5 changes: 0 additions & 5 deletions bindings/matrix-sdk-crypto-ffi/src/uniffi_api.rs
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions bindings/matrix-sdk-ffi/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,12 @@ pub mod room;
pub mod session_verification;
pub mod sliding_sync;
pub mod timeline;
mod uniffi_api;

use client::Client;
use client_builder::ClientBuilder;
use matrix_sdk::{encryption::CryptoStoreError, HttpError, IdParseError};
use once_cell::sync::Lazy;
use tokio::runtime::Runtime;
pub use uniffi_api::*;

pub static RUNTIME: Lazy<Runtime> =
Lazy::new(|| Runtime::new().expect("Can't start Tokio runtime"));
Expand Down Expand Up @@ -97,6 +95,8 @@ impl From<serde_json::Error> for ClientError {

pub use platform::*;

uniffi::include_scaffolding!("api");

mod uniffi_types {
pub use matrix_sdk::ruma::events::room::{message::RoomMessageEventContent, MediaSource};

Expand Down
5 changes: 0 additions & 5 deletions bindings/matrix-sdk-ffi/src/uniffi_api.rs
View file
Open in desktop

This file was deleted.