Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
11 changes: 7 additions & 4 deletions src-tauri/src/keyring.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1747,22 +1747,25 @@ impl NativeKeyring {
}
}

#[cfg(target_os = "macos")]
#[cfg(all(feature = "phase1-conformance", target_os = "macos"))]
const fn native_keyring_backend() -> &'static str {
"macos-keychain"
}

#[cfg(target_os = "linux")]
#[cfg(all(feature = "phase1-conformance", target_os = "linux"))]
const fn native_keyring_backend() -> &'static str {
"linux-keyring"
}

#[cfg(target_os = "windows")]
#[cfg(all(feature = "phase1-conformance", target_os = "windows"))]
const fn native_keyring_backend() -> &'static str {
"windows-credential-manager"
}

#[cfg(not(any(target_os = "macos", target_os = "linux", target_os = "windows")))]
#[cfg(all(
feature = "phase1-conformance",
not(any(target_os = "macos", target_os = "linux", target_os = "windows"))
))]
const fn native_keyring_backend() -> &'static str {
"unsupported"
}
Expand Down
3 changes: 3 additions & 0 deletions src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -146,14 +146,17 @@ impl NativeConnectionState {
self.operations.cancel(attempt_id, reason)
}

#[cfg(feature = "phase1-conformance")]
fn cancel_all_operations(&self, reason: NativeCancelReason) {
self.operations.cancel_all(reason);
}

#[cfg(feature = "phase1-conformance")]
fn operation_registry(&self) -> Arc<NativeOperationRegistry> {
Arc::clone(&self.operations)
}

#[cfg(feature = "phase1-conformance")]
fn mutation_queue(&self) -> Arc<NativeMutationQueue> {
Arc::clone(&self.mutations)
}
Expand Down
2 changes: 2 additions & 0 deletions src-tauri/src/operation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ pub struct NativeOperationInput {
}

impl NativeOperationInput {
#[cfg(any(test, feature = "phase1-conformance"))]
pub(crate) fn new(attempt_id: String, timeout_ms: u32) -> NativeResult<Self> {
let input = Self {
attempt_id,
Expand Down Expand Up @@ -608,6 +609,7 @@ impl NativeOperationRegistry {
Ok(NativeCancelResult::queued())
}

#[cfg(feature = "phase1-conformance")]
pub(crate) fn cancel_all(&self, reason: NativeCancelReason) {
if let Ok(state) = self.state.lock() {
for active in state.active.values() {
Expand Down
Loading
Loading