Skip to content

Update dependences in preparation for 1.0. #281

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
Nov 7, 2022
Merged

Update dependences in preparation for 1.0. #281

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
7dd2e19
Update dependencies.
sunfishcode Nov 7, 2022
b8025e7
Update internal dependency versions.
sunfishcode Nov 7, 2022
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
16 changes: 8 additions & 8 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,27 +18,27 @@ exclude = ["/.*"]
#async-std = { version = "1.10.0", features = ["attributes"] }
anyhow = "1.0.37"
#cap-async-std = { path = "cap-async-std", version = "^0.25.0" }
cap-fs-ext = { path = "cap-fs-ext", version = "^1.0.0-rc1" }
cap-directories = { path = "cap-directories", version = "^1.0.0-rc1" }
cap-std = { path = "cap-std", version = "^1.0.0-rc1" }
cap-tempfile = { path = "cap-tempfile", version = "^1.0.0-rc1" }
cap-rand = { path = "cap-rand", version = "^1.0.0-rc1" }
cap-fs-ext = { path = "cap-fs-ext", version = "^1.0.0-rc2" }
cap-directories = { path = "cap-directories", version = "^1.0.0-rc2" }
cap-std = { path = "cap-std", version = "^1.0.0-rc2" }
cap-tempfile = { path = "cap-tempfile", version = "^1.0.0-rc2" }
cap-rand = { path = "cap-rand", version = "^1.0.0-rc2" }
rand = "0.8.1"
tempfile = "3.1.0"
camino = "1.0.5"
libc = "0.2.100"
io-lifetimes = "1.0.0-rc1"
io-lifetimes = "1.0.0"

[target.'cfg(not(windows))'.dev-dependencies]
rustix = { version = "0.36.0-rc2", features = ["fs"] }
rustix = { version = "0.36.0", features = ["fs"] }

[target.'cfg(windows)'.dev-dependencies]
# nt_version uses internal Windows APIs, however we're only using it
# for testing here.
nt_version = "0.1.3"

[target.'cfg(windows)'.dependencies.windows-sys]
version = "0.36.0"
version = "0.42.0"
features = [
"Win32_Storage_FileSystem",
"Win32_Foundation",
Expand Down
6 changes: 3 additions & 3 deletions cap-async-std/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ arf-strings = { version = "0.6.7", optional = true }
# Enable "unstable" for `spawn_blocking`.
async-std = { version = "1.10.0", features = ["attributes", "unstable"] }
cap-primitives = { path = "../cap-primitives", version = "^0.25.0" }
io-lifetimes = { version = "1.0.0-rc1", default-features = false, features = ["async-std"] }
io-lifetimes = { version = "1.0.0", default-features = false, features = ["async-std"] }
ipnet = "2.3.0"
io-extras = { version = "0.16.0-rc1", features = ["use_async_std"] }
io-extras = { version = "0.16.0", features = ["use_async_std"] }
camino = { version = "1.0.5", optional = true }

[target.'cfg(not(windows))'.dependencies]
rustix = { version = "0.36.0-rc2", features = ["fs"] }
rustix = { version = "0.36.0", features = ["fs"] }

[features]
default = []
Expand Down
6 changes: 3 additions & 3 deletions cap-directories/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ repository = "https://github.com/bytecodealliance/cap-std"
edition = "2018"

[dependencies]
cap-std = { path = "../cap-std", version = "^1.0.0-rc1" }
cap-std = { path = "../cap-std", version = "^1.0.0-rc2" }
directories-next = "2.0.0"

[target.'cfg(not(windows))'.dependencies]
rustix = { version = "0.36.0-rc2" }
rustix = { version = "0.36.0" }

[target.'cfg(windows)'.dependencies.windows-sys]
version = "0.36.0"
version = "0.42.0"
features = [
"Win32_Foundation",
]
9 changes: 4 additions & 5 deletions cap-fs-ext/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ edition = "2018"
[dependencies]
arf-strings = { version = "0.6.7", optional = true }
#cap-async-std = { path = "../cap-async-std", optional = true, version = "^0.25.0" }
cap-std = { path = "../cap-std", optional = true, version = "^1.0.0-rc1" }
cap-primitives = { path = "../cap-primitives", version = "^1.0.0-rc1" }
io-lifetimes = { version = "1.0.0-rc1", default-features = false }
cap-std = { path = "../cap-std", optional = true, version = "^1.0.0-rc2" }
cap-primitives = { path = "../cap-primitives", version = "^1.0.0-rc2" }
io-lifetimes = { version = "1.0.0", default-features = false }
# Enable "unstable" for `spawn_blocking`.
#async-std = { version = "1.10.0", features = ["attributes", "unstable"], optional = true }
#async-trait = { version = "0.1.42", optional = true }
Expand All @@ -33,10 +33,9 @@ std = ["cap-std"]
#async_std_arf_strings = ["cap-async-std/arf_strings", "async_std_fs_utf8", "arf-strings"]

[target.'cfg(windows)'.dependencies.windows-sys]
version = "0.36.0"
version = "0.42.0"
features = [
"Win32_Storage_FileSystem",
"Win32_System_SystemServices",
]

[dev-dependencies]
Expand Down
16 changes: 8 additions & 8 deletions cap-fs-ext/src/dir_ext.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,9 +538,9 @@ impl DirExt for cap_std::fs::Dir {
use cap_std::fs::OpenOptions;
use std::os::windows::fs::OpenOptionsExt;
use windows_sys::Win32::Storage::FileSystem::{
FILE_ATTRIBUTE_DIRECTORY, FILE_FLAG_BACKUP_SEMANTICS, FILE_FLAG_OPEN_REPARSE_POINT,
DELETE, FILE_ATTRIBUTE_DIRECTORY, FILE_FLAG_BACKUP_SEMANTICS,
FILE_FLAG_OPEN_REPARSE_POINT,
};
use windows_sys::Win32::System::SystemServices::DELETE;
let path = path.as_ref();

let mut opts = OpenOptions::new();
Expand Down Expand Up @@ -834,9 +834,9 @@ impl AsyncDirExt for cap_async_std::fs::Dir {
use cap_std::fs::OpenOptions;
use std::os::windows::fs::OpenOptionsExt;
use windows_sys::Win32::Storage::FileSystem::{
FILE_ATTRIBUTE_DIRECTORY, FILE_FLAG_BACKUP_SEMANTICS, FILE_FLAG_OPEN_REPARSE_POINT,
DELETE, FILE_ATTRIBUTE_DIRECTORY, FILE_FLAG_BACKUP_SEMANTICS,
FILE_FLAG_OPEN_REPARSE_POINT,
};
use windows_sys::Win32::System::SystemServices::DELETE;
let path = path.as_ref();

let mut opts = OpenOptions::new();
Expand Down Expand Up @@ -1001,9 +1001,9 @@ impl DirExtUtf8 for cap_std::fs_utf8::Dir {
use cap_std::fs::OpenOptions;
use std::os::windows::fs::OpenOptionsExt;
use windows_sys::Win32::Storage::FileSystem::{
FILE_ATTRIBUTE_DIRECTORY, FILE_FLAG_BACKUP_SEMANTICS, FILE_FLAG_OPEN_REPARSE_POINT,
DELETE, FILE_ATTRIBUTE_DIRECTORY, FILE_FLAG_BACKUP_SEMANTICS,
FILE_FLAG_OPEN_REPARSE_POINT,
};
use windows_sys::Win32::System::SystemServices::DELETE;
let path = path.as_ref();

let mut opts = OpenOptions::new();
Expand Down Expand Up @@ -1235,9 +1235,9 @@ impl AsyncDirExtUtf8 for cap_async_std::fs_utf8::Dir {
use cap_std::fs::OpenOptions;
use std::os::windows::fs::OpenOptionsExt;
use windows_sys::Win32::Storage::FileSystem::{
FILE_ATTRIBUTE_DIRECTORY, FILE_FLAG_BACKUP_SEMANTICS, FILE_FLAG_OPEN_REPARSE_POINT,
DELETE, FILE_ATTRIBUTE_DIRECTORY, FILE_FLAG_BACKUP_SEMANTICS,
FILE_FLAG_OPEN_REPARSE_POINT,
};
use windows_sys::Win32::System::SystemServices::DELETE;
let path = path.as_ref();

let mut opts = OpenOptions::new();
Expand Down
12 changes: 6 additions & 6 deletions cap-primitives/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@ ambient-authority = "0.0.1"
arbitrary = { version = "1.0.0", optional = true, features = ["derive"] }
ipnet = "2.3.0"
maybe-owned = "0.3.4"
fs-set-times = "0.18.0-rc1"
io-extras = "0.16.0-rc1"
io-lifetimes = { version = "1.0.0-rc1", default-features = false }
fs-set-times = "0.18.0"
io-extras = "0.16.0"
io-lifetimes = { version = "1.0.0", default-features = false }

[dev-dependencies]
cap-tempfile = { path = "../cap-tempfile" }

[target.'cfg(not(windows))'.dependencies]
rustix = { version = "0.36.0-rc2", features = ["fs", "process", "procfs", "termios", "time"] }
rustix = { version = "0.36.0", features = ["fs", "process", "procfs", "termios", "time"] }

[target.'cfg(windows)'.dependencies]
winx = "0.34.0-rc1"
winx = "0.34.0"

[target.'cfg(windows)'.dependencies.windows-sys]
version = "0.36.0"
version = "0.42.0"
features = [
"Win32_Storage_FileSystem",
"Win32_Foundation",
Expand Down
8 changes: 4 additions & 4 deletions cap-std/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ rustdoc-args = ["--cfg=doc_cfg"]

[dependencies]
arf-strings = { version = "0.6.7", optional = true }
cap-primitives = { path = "../cap-primitives", version = "^1.0.0-rc1" }
cap-primitives = { path = "../cap-primitives", version = "^1.0.0-rc2" }
ipnet = "2.3.0"
io-extras = "0.16.0-rc1"
io-lifetimes = { version = "1.0.0-rc1", default-features = false }
io-extras = "0.16.0"
io-lifetimes = { version = "1.0.0", default-features = false }
camino = { version = "1.0.5", optional = true }

[target.'cfg(not(windows))'.dependencies]
rustix = { version = "0.36.0-rc2", features = ["fs"] }
rustix = { version = "0.36.0", features = ["fs"] }

[features]
default = []
Expand Down
6 changes: 3 additions & 3 deletions cap-tempfile/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ repository = "https://github.com/bytecodealliance/cap-std"
edition = "2018"

[dependencies]
cap-std = { path = "../cap-std", version = "^1.0.0-rc1" }
cap-std = { path = "../cap-std", version = "^1.0.0-rc2" }
uuid = { version = "1.0.0", features = ["v4"] }
camino = { version = "1.0.5", optional = true }

[target.'cfg(target_os = "emscripten")'.dependencies]
rand = "0.8.1"

[target.'cfg(not(windows))'.dependencies]
rustix = { version = "0.36.0-rc2", features = ["procfs"] }
rustix = { version = "0.36.0", features = ["procfs"] }

[target.'cfg(windows)'.dev-dependencies.windows-sys]
version = "0.36.0"
version = "0.42.0"
features = [
"Win32_Foundation",
]
Expand Down
8 changes: 4 additions & 4 deletions cap-time-ext/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ repository = "https://github.com/bytecodealliance/cap-std"
edition = "2018"

[dependencies]
cap-primitives = { path = "../cap-primitives", version = "^1.0.0-rc1" }
cap-std = { path = "../cap-std", optional = true, version = "^1.0.0-rc1" }
cap-primitives = { path = "../cap-primitives", version = "^1.0.0-rc2" }
cap-std = { path = "../cap-std", optional = true, version = "^1.0.0-rc2" }

[target.'cfg(not(windows))'.dependencies]
rustix = { version = "0.36.0-rc2", features = ["time"] }
rustix = { version = "0.36.0", features = ["time"] }

[target.'cfg(windows)'.dependencies]
once_cell = "1.5.2"
winx = "0.34.0-rc1"
winx = "0.34.0"
2 changes: 1 addition & 1 deletion fuzz/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cap-primitives = { path = "../cap-primitives", features = ["arbitrary"] }
# Depend on io-lifetimes with default features, as the fuzzing framework
# seems to add a dependency on `io_lifetimes::OwnedFd::drop` even when the
# code itself doesn't have one.
io-lifetimes = "1.0.0-rc1"
io-lifetimes = "1.0.0"

[[bin]]
name = "cap-primitives"
Expand Down