Skip to content

Commit

Permalink
Update rust editions and dependencies (dfinity#893)
Browse files Browse the repository at this point in the history
Rust edition is now consistently 2021.
All dependencies are again up to date.
  • Loading branch information
Frederik Rothenberger authored Sep 20, 2022
1 parent 6a72723 commit 10628a7
Show file tree
Hide file tree
Showing 5 changed files with 92 additions and 71 deletions.
139 changes: 81 additions & 58 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions demos/test-app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[package]
name = "test_app"
version = "0.1.0"
edition = "2018"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand All @@ -12,14 +12,14 @@ path = "lib.rs"
crate-type = ["cdylib"]

[dependencies]
base64 = "0.13.0"
base64 = "0.13"
lazy_static = "1.4"
candid = "0.7"
ic-cdk = "0.5"
ic-cdk-macros = "0.5"
ic-certified-map = "0.3"
sha2 = "^0.9" # set bound to match ic-certified-map bound
sha2 = "^0.10" # set bound to match ic-certified-map bound
serde = "1"
serde_bytes = "0.11"
serde_cbor = "0.11"
serde_with = "1.14"
serde_with = "2.0"
5 changes: 2 additions & 3 deletions src/canister_tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
[package]
name = "canister_tests"
version = "0.1.0"
edition = "2018"
edition = "2021"

[dev-dependencies]
base64 = "0.13.0"
flate2 = "1.0"
hex = "0.4.3"
lazy_static = "1.4"
regex = "1.5.6"
regex = "1.5"
serde = "1"
serde_cbor = "0.11"
serde_bytes = "0.11"
Expand All @@ -18,7 +18,6 @@ internet_identity_interface = { path = "../internet_identity_interface" }

# All IC deps
candid = "0.7"
ic-cdk = "0.5"
ic-types = { git = "https://github.com/dfinity/ic", rev = "50c53c8e996e7b00b88c2f43120c46534cc499f6" }
ic-certification = { git = "https://github.com/dfinity/ic", rev = "50c53c8e996e7b00b88c2f43120c46534cc499f6" }
ic-crypto-internal-basic-sig-iccsa = { git = "https://github.com/dfinity/ic", rev = "50c53c8e996e7b00b88c2f43120c46534cc499f6" }
Expand Down
9 changes: 4 additions & 5 deletions src/internet_identity/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "internet_identity"
version = "0.1.0"
edition = "2018"
edition = "2021"

[dependencies]

Expand All @@ -12,8 +12,8 @@ lazy_static = "1.4"
serde = "1"
serde_bytes = "0.11"
serde_cbor = "0.11"
serde_with = "1.14"
sha2 = "^0.9" # set bound to match ic-certified-map bound
serde_with = "2.0"
sha2 = "^0.10" # set bound to match ic-certified-map bound

# Captcha deps
lodepng = "*"
Expand All @@ -29,10 +29,9 @@ candid = "0.7"
ic-cdk = "0.5"
ic-cdk-macros = "0.5"
ic-certified-map = "0.3"
ic-types = "0.3"

[dev-dependencies]
hex-literal = "0.2.1"
hex-literal = "0.3"

[features]
# the dummy_captcha feature which ensures the captcha string is always "a"
Expand Down
2 changes: 1 addition & 1 deletion src/internet_identity_interface/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ edition = "2021"

[dependencies]
serde_bytes = "0.11"
candid = "0.7.14"
candid = "0.7"
serde = "1"

0 comments on commit 10628a7

Please sign in to comment.