Skip to content

chore: rust 2024 #2482

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

Closed
Daanvdplas wants to merge 5 commits into from
Closed

chore: rust 2024 #2482

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1b8e9a6
chore: rust 2024
Daanvdplas Apr 11, 2025
0092cfe
chore: minimal rust version env and ink crate
Daanvdplas Apr 11, 2025
225c338
refactor: lifetime may not live long enough
Daanvdplas Apr 11, 2025
8e02483
fix: extern blocks must be safe
Daanvdplas Apr 11, 2025
041a473
fix: as_option macro
Daanvdplas Apr 11, 2025
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
Next Next commit
chore: rust 2024
  • Loading branch information
@Daanvdplas
Daanvdplas committed Apr 11, 2025
commit 1b8e9a697623993c43306ae11ebfbb6247475d01
4 changes: 2 additions & 2 deletions .rustfmt.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ trailing_comma = "Vertical"
match_block_trailing_comma = false
blank_lines_upper_bound = 1
blank_lines_lower_bound = 0
edition = "2021" # changed
style_edition = "2021"
edition = "2024" # changed
style_edition = "2024"
merge_derives = true
use_try_shorthand = true # changed
use_field_init_shorthand = true # changed
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ exclude = [
[workspace.package]
authors = ["Use Ink <ink@use.ink>"]
categories = ["no-std", "embedded"]
edition = "2021"
edition = "2024"
homepage = "https://use.ink"
keywords = ["polkavm", "ink", "riscv", "blockchain", "edsl"]
license = "Apache-2.0"
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/call-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "call-runtime"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/combined-extension/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "combined_extension"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/complex-storage-structures/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "complex_storage_structures"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/conditional-compilation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "conditional-compilation"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"

[dependencies]
ink = { path = "../../../crates/ink", default-features = false, features = ["unstable-hostfn"] }
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "instantiate_contract"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/contract1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "contract1"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/contract2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "contract2"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/virtual_contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "virtual_contract"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/virtual_contract_ver1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "virtual_contract_ver1"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-invocation/virtual_contract_ver2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "virtual_contract_ver2"
version = "0.1.0"
edition = "2021"
edition = "2024"
authors = ["Víctor M. González <victor.gonzalez@coinfabrik.com>"]

[lib]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-storage/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "contract-storage"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-terminate/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "contract_terminate"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-transfer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "contract_transfer"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/contract-xcm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "contract-xcm"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/cross-contract-calls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "cross-contract-calls"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/cross-contract-calls/other-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "other-contract"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/custom-allocator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "custom-allocator"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/custom-environment/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "custom-environment"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/debugging-strategies/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "debugging_strategies"
description = "Illustrates different debugging strategies"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/dns/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "dns"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/e2e-call-runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "e2e_call_runtime"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/erc1155/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "erc1155"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/erc20/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "erc20"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/erc721/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "erc721"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/events/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "events"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/events/event-def-unused/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "event-def-unused"
authors = ["Use Ink <ink@use.ink>"]
version = "0.1.0"
edition = "2021"
edition = "2024"

[dependencies]
ink = { path = "../../../../crates/ink", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/events/event-def/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "event-def"
authors = ["Use Ink <ink@use.ink>"]
version = "0.1.0"
edition = "2021"
edition = "2024"

[dependencies]
ink = { path = "../../../../crates/ink", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/events/event-def2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "event-def2"
authors = ["Use Ink <ink@use.ink>"]
version = "0.1.0"
edition = "2021"
edition = "2024"

[dependencies]
ink = { path = "../../../../crates/ink", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/flipper/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "flipper"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/incrementer/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "incrementer"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/lazyvec/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "lazyvec"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/multi-contract-caller/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "multi-contract-caller"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/multi-contract-caller/accumulator/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "accumulator"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"

[dependencies]
ink = { path = "../../../../crates/ink", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/multi-contract-caller/adder/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "adder"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"

[dependencies]
ink = { path = "../../../../crates/ink", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/multi-contract-caller/subber/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "subber"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"

[dependencies]
ink = { path = "../../../../crates/ink", default-features = false }
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/multisig/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "multisig"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/own-code-hash/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "own-code-hash"
version = "4.3.0"
authors = ["Parity Technologies <admin@parity.io>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/payment-channel/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "payment_channel"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/psp22-extension/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "psp22_extension"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/rand-extension/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "rand_extension"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/runtime-call-contract/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ members = ["sandbox-runtime", "traits"]

[workspace.package]
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
homepage = "https://use.ink"
license = "Apache-2.0"
repository = "https://github.com/use-ink/ink"
Expand Down
2 changes: 1 addition & 1 deletion integration-tests/public/runtime-call-contract/traits/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "flipper-traits"
version = "6.0.0-alpha"
authors = ["Use Ink <ink@use.ink>"]
edition = "2021"
edition = "2024"
publish = false

[dependencies]
Expand Down
Loading
Loading