Skip to content

Combine storage traits and derives into single crate #1389

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
ascjones merged 25 commits into from
Sep 13, 2022
Merged

Combine storage traits and derives into single crate #1389

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
f9cf88f
Add ink_storage_traits crate
ascjones Sep 8, 2022
119acad
Remove unused hash layout trait and impls
ascjones Sep 8, 2022
5fe3571
Remove dependency between storage traits and ink_env
ascjones Sep 8, 2022
2f5506d
Move Storable definition and derive to ink_storage_traits
ascjones Sep 8, 2022
8fb519f
Replace usages of primitives storable with new location
ascjones Sep 8, 2022
e85fa0b
Fmt
ascjones Sep 8, 2022
77e2679
README and license sym links
ascjones Sep 8, 2022
756fe2c
Fix up CI script crates and codegen symlinks
ascjones Sep 8, 2022
332fa75
update CI crates again
ascjones Sep 8, 2022
840ec49
Add StorageLayout impl for Hash
ascjones Sep 9, 2022
0334ad5
Fix up collections ui tests
ascjones Sep 9, 2022
240729e
Fix up storage traits tests
ascjones Sep 9, 2022
3a489b8
Add missing feature to codegen syn dependency
ascjones Sep 9, 2022
73574d4
Fix storage traits reference in env
ascjones Sep 9, 2022
6dd4cfe
Add missing no_std cfg_attr
ascjones Sep 9, 2022
8695967
Fix example build
ascjones Sep 9, 2022
01de0b4
Fmt
ascjones Sep 9, 2022
80d17f5
Fix example
ascjones Sep 9, 2022
fa28c6a
Move Clear trait to primitives
ascjones Sep 9, 2022
7a1d007
Fix example
ascjones Sep 9, 2022
2b25aea
Fix env access
ascjones Sep 9, 2022
361b6a7
Fix up docs
ascjones Sep 9, 2022
63b7a6b
Trying to fix UI tests
ascjones Sep 9, 2022
fcb475f
Fix LICENSE and README paths
ascjones Sep 12, 2022
1dc778b
Merge branch 'master' into aj/storage-traits-crate
ascjones Sep 13, 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
Prev Previous commit
Next Next commit
Trying to fix UI tests
  • Loading branch information
@ascjones
ascjones committed Sep 9, 2022
commit 63b7a6bd20128422b4987376464fbaaec4707e7b
70 changes: 39 additions & 31 deletions crates/lang/tests/ui/storage_item/fail/collections_only_packed_1.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,40 +71,48 @@ note: required by a bound in `Storable`
= note: this error originates in the derive macro `::ink_storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: the trait bound `Vec<NonPacked>: Decode` is not satisfied
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:9:1
|
9 | #[ink_lang::storage_item]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Decode` is not implemented for `Vec<NonPacked>`
|
= help: the trait `Decode` is implemented for `Vec<T>`
= note: required for `Vec<NonPacked>` to implement `Packed`
= note: required for `Vec<NonPacked>` to implement `StorableHint<()>`
= note: required for `Vec<NonPacked>` to implement `AutoStorableHint<ManualKey<2085512762>>`
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:9:1
|
9 | #[ink_lang::storage_item]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Decode` is not implemented for `Vec<NonPacked>`
|
= help: the trait `Decode` is implemented for `Vec<T>`
= note: required for `Vec<NonPacked>` to implement `Packed`
= note: required for `Vec<NonPacked>` to implement `StorableHint<()>`
= note: required for `Vec<NonPacked>` to implement `AutoStorableHint<ManualKey<2085512762>>`
note: required because it appears within the type `Contract`
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:10:8
|
10 | struct Contract {
| ^^^^^^^^
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:10:8
|
10 | struct Contract {
| ^^^^^^^^
note: required by a bound in `Result`
= note: this error originates in the derive macro `::ink_storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)
--> $RUST/core/src/result.rs
|
| pub enum Result<T, E> {
| ^ required by this bound in `Result`
= note: this error originates in the derive macro `::ink_storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: the trait bound `[NonPacked]: Encode` is not satisfied
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:9:1
|
9 | #[ink_lang::storage_item]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Encode` is not implemented for `[NonPacked]`
|
= help: the following other types implement trait `Encode`:
[T; N]
[T]
= note: required for `Vec<NonPacked>` to implement `Encode`
= note: required for `Vec<NonPacked>` to implement `Packed`
= note: required for `Vec<NonPacked>` to implement `StorableHint<()>`
= note: required for `Vec<NonPacked>` to implement `AutoStorableHint<ManualKey<2085512762>>`
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:9:1
|
9 | #[ink_lang::storage_item]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Encode` is not implemented for `[NonPacked]`
|
= help: the following other types implement trait `Encode`:
[T; N]
[T]
= note: required for `Vec<NonPacked>` to implement `Encode`
= note: required for `Vec<NonPacked>` to implement `Packed`
= note: required for `Vec<NonPacked>` to implement `StorableHint<()>`
= note: required for `Vec<NonPacked>` to implement `AutoStorableHint<ManualKey<2085512762>>`
note: required because it appears within the type `Contract`
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:10:8
|
10 | struct Contract {
| ^^^^^^^^
--> tests/ui/storage_item/fail/collections_only_packed_1.rs:10:8
|
10 | struct Contract {
| ^^^^^^^^
note: required by a bound in `Result`
= note: this error originates in the derive macro `::ink_storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)
--> $RUST/core/src/result.rs
|
| pub enum Result<T, E> {
| ^ required by this bound in `Result`
= note: this error originates in the derive macro `::ink_storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)
64 changes: 36 additions & 28 deletions crates/lang/tests/ui/storage_item/fail/collections_only_packed_2.stderr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,37 +65,45 @@ note: required by a bound in `Storable`
= note: this error originates in the derive macro `::ink_storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: Decode` is not satisfied
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:9:1
|
9 | #[ink_lang::storage_item]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Decode` is not implemented for `BTreeMap<u128, NonPacked>`
|
= help: the trait `Decode` is implemented for `BTreeMap<K, V>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `Packed`
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<2085512762>>`
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:9:1
|
9 | #[ink_lang::storage_item]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Decode` is not implemented for `BTreeMap<u128, NonPacked>`
|
= help: the trait `Decode` is implemented for `BTreeMap<K, V>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `Packed`
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<2085512762>>`
note: required because it appears within the type `Contract`
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:10:8
|
10 | struct Contract {
| ^^^^^^^^
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:10:8
|
10 | struct Contract {
| ^^^^^^^^
note: required by a bound in `Result`
= note: this error originates in the derive macro `::ink_storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)
--> $RUST/core/src/result.rs
|
| pub enum Result<T, E> {
| ^ required by this bound in `Result`
= note: this error originates in the derive macro `::ink_storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)

error[E0277]: the trait bound `BTreeMap<u128, NonPacked>: Encode` is not satisfied
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:9:1
|
9 | #[ink_lang::storage_item]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Encode` is not implemented for `BTreeMap<u128, NonPacked>`
|
= help: the trait `Encode` is implemented for `BTreeMap<K, V>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `Packed`
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<2085512762>>`
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:9:1
|
9 | #[ink_lang::storage_item]
| ^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Encode` is not implemented for `BTreeMap<u128, NonPacked>`
|
= help: the trait `Encode` is implemented for `BTreeMap<K, V>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `Packed`
= note: required for `BTreeMap<u128, NonPacked>` to implement `StorableHint<()>`
= note: required for `BTreeMap<u128, NonPacked>` to implement `AutoStorableHint<ManualKey<2085512762>>`
note: required because it appears within the type `Contract`
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:10:8
|
10 | struct Contract {
| ^^^^^^^^
--> tests/ui/storage_item/fail/collections_only_packed_2.rs:10:8
|
10 | struct Contract {
| ^^^^^^^^
note: required by a bound in `Result`
= note: this error originates in the derive macro `::ink_storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)
--> $RUST/core/src/result.rs
|
| pub enum Result<T, E> {
| ^ required by this bound in `Result`
= note: this error originates in the derive macro `::ink_storage::traits::Storable` (in Nightly builds, run with -Z macro-backtrace for more info)