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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ hmac = "0.13"
http = "1"
jiff = "0.2"
log = "0.4"
p256 = { version = "0.14.0", default-features = false, features = ["ecdsa"] }
pem = "4.0"
percent-encoding = "2"
p256 = { version = "0.14.0", default-features = false, features = ["ecdsa"] }
pretty_assertions = "1.3"
prost = "0.14"
quick-xml = { version = "0.42.0", features = ["serialize"] }
Expand Down
5 changes: 4 additions & 1 deletion context/command-execute-tokio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ rust-version.workspace = true
reqsign-core = { workspace = true }

[target.'cfg(not(target_family = "wasm"))'.dependencies]
tokio = { version = "1", default-features = false, features = ["process", "io-util"] }
tokio = { version = "1", default-features = false, features = [
"process",
"io-util",
] }

[dev-dependencies]
tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
8 changes: 4 additions & 4 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ anyhow = { workspace = true }
asyncband = { workspace = true }
base64 = { workspace = true }
bytes = { workspace = true }
futures = { workspace = true }
hex = { workspace = true }
hmac = { workspace = true }
http = { workspace = true }
Expand All @@ -51,12 +50,13 @@ rsa = { workspace = true, optional = true }
serde = { workspace = true, optional = true }
serde_json = { workspace = true, optional = true }

[dev-dependencies]
asyncband = { workspace = true, features = ["oneshot"] }

[target.'cfg(target_os = "windows")'.dependencies]
windows-sys = { version = "0.61.0", features = [
"Win32_Foundation",
"Win32_UI_Shell",
"Win32_System_Com",
] }

[dev-dependencies]
asyncband = { workspace = true, features = ["oneshot"] }
futures = { workspace = true }
11 changes: 7 additions & 4 deletions core/src/futures_util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,16 @@
// specific language governing permissions and limitations
// under the License.

/// BoxedFuture is the type alias of [`futures::future::BoxFuture`].
use std::pin::Pin;

/// An owned dynamically typed [`Future`] for use in cases where you can't statically type your
/// result or need to add some indirection.
#[cfg(not(target_arch = "wasm32"))]
pub type BoxedFuture<'a, T> = futures::future::BoxFuture<'a, T>;
pub type BoxedFuture<'a, T> = Pin<Box<dyn Future<Output = T> + Send + 'a>>;

/// BoxedFuture is the type alias of [`futures::future::LocalBoxFuture`].
/// `BoxFuture`, but without the `Send` requirement.
#[cfg(target_arch = "wasm32")]
pub type BoxedFuture<'a, T> = futures::future::LocalBoxFuture<'a, T>;
pub type BoxedFuture<'a, T> = Pin<Box<dyn Future<Output = T> + 'a>>;

/// MaybeSend is a marker to determine whether a type is `Send` or not.
///
Expand Down
2 changes: 1 addition & 1 deletion services/azure-storage/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ sha1 = { workspace = true }

[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
pem = { workspace = true }
rsa = { workspace = true }
reqsign-core = { workspace = true, features = ["jwt"] }
rsa = { workspace = true }

[dev-dependencies]
asyncband = { workspace = true, features = ["semaphore"] }
Expand Down
2 changes: 1 addition & 1 deletion services/google/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,14 @@ rust-version.workspace = true
all-features = true

[features]
default = []
credential-access-boundary-client-side = [
"dep:aes-gcm",
"dep:asyncband",
"dep:base64",
"dep:prost",
"dep:zeroize",
]
default = []

[dependencies]
aes-gcm = { workspace = true, features = ["zeroize"], optional = true }
Expand Down
Loading