Skip to content

Commit 36972a3

Browse files
authored
Merge pull request #108 from cipherstash/ring-0.17.14
Bump ring from 0.17.8 to 0.17.14
2 parents 55928d3 + 21991f1 commit 36972a3

File tree

3 files changed

+50
-50
lines changed

3 files changed

+50
-50
lines changed

Cargo.lock

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error: field 'name' cannot be used as sort key as struct contains field named 'sk' which must be used
22
--> tests/ui/sk-field-wrong-sort.rs
33
|
4-
| / #[cipherstash(query = "prefix", compound = "email#name")]
5-
| | #[sort_key]
6-
| | name: String,
7-
| |________________^
4+
8 | / #[cipherstash(query = "prefix", compound = "email#name")]
5+
9 | | #[sort_key]
6+
| | name: String,
7+
| |________________^
Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
error[E0277]: the trait bound `PkSk: From<&str>` is not satisfied
22
--> tests/ui/using-pk-instead-of-pk-sk.rs
33
|
4-
| let user: Option<User> = table.get("[email protected]").await?;
5-
| --- ^^^^^^^^^^^^^^^^^^ the trait `From<&str>` is not implemented for `PkSk`
6-
| |
7-
| required by a bound introduced by this call
8-
|
9-
= help: the trait `From<&str>` is not implemented for `PkSk`
10-
but trait `From<(_, _)>` is implemented for it
11-
= help: for that trait implementation, expected `(_, _)`, found `&str`
12-
= note: required for `&str` to implement `Into<PkSk>`
4+
25 | let user: Option<User> = table.get("[email protected]").await?;
5+
| --- ^^^^^^^^^^^^^^^^^^ the trait `From<&str>` is not implemented for `PkSk`
6+
| |
7+
| required by a bound introduced by this call
8+
|
9+
= help: the trait `From<&str>` is not implemented for `PkSk`
10+
but trait `From<(_, _)>` is implemented for it
11+
= help: for that trait implementation, expected `(_, _)`, found `&str`
12+
= note: required for `&str` to implement `Into<PkSk>`
1313
note: required by a bound in `EncryptedTable::get`
14-
--> src/encrypted_table/mod.rs
15-
|
16-
| pub async fn get<T>(&self, k: impl Into<T::PrimaryKey>) -> Result<Option<T>, GetError>
17-
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `EncryptedTable::get`
14+
--> src/encrypted_table/mod.rs
15+
|
16+
| pub async fn get<T>(&self, k: impl Into<T::PrimaryKey>) -> Result<Option<T>, GetError>
17+
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `EncryptedTable::get`
1818

1919
error[E0277]: the trait bound `PkSk: From<&str>` is not satisfied
2020
--> tests/ui/using-pk-instead-of-pk-sk.rs
2121
|
22-
| let user: Option<User> = table.get("[email protected]").await?;
23-
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<&str>` is not implemented for `PkSk`
24-
|
25-
= help: the trait `From<&str>` is not implemented for `PkSk`
26-
but trait `From<(_, _)>` is implemented for it
27-
= help: for that trait implementation, expected `(_, _)`, found `&str`
28-
= note: required for `&str` to implement `Into<PkSk>`
22+
25 | let user: Option<User> = table.get("[email protected]").await?;
23+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `From<&str>` is not implemented for `PkSk`
24+
|
25+
= help: the trait `From<&str>` is not implemented for `PkSk`
26+
but trait `From<(_, _)>` is implemented for it
27+
= help: for that trait implementation, expected `(_, _)`, found `&str`
28+
= note: required for `&str` to implement `Into<PkSk>`
2929
note: required by a bound in `EncryptedTable::get`
30-
--> src/encrypted_table/mod.rs
31-
|
32-
| pub async fn get<T>(&self, k: impl Into<T::PrimaryKey>) -> Result<Option<T>, GetError>
33-
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `EncryptedTable::get`
30+
--> src/encrypted_table/mod.rs
31+
|
32+
| pub async fn get<T>(&self, k: impl Into<T::PrimaryKey>) -> Result<Option<T>, GetError>
33+
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `EncryptedTable::get`
3434

3535
error[E0277]: the trait bound `PkSk: From<&str>` is not satisfied
3636
--> tests/ui/using-pk-instead-of-pk-sk.rs
3737
|
38-
| let user: Option<User> = table.get("[email protected]").await?;
39-
| ^^^^^ the trait `From<&str>` is not implemented for `PkSk`
40-
|
41-
= help: the trait `From<&str>` is not implemented for `PkSk`
42-
but trait `From<(_, _)>` is implemented for it
43-
= help: for that trait implementation, expected `(_, _)`, found `&str`
44-
= note: required for `&str` to implement `Into<PkSk>`
38+
25 | let user: Option<User> = table.get("[email protected]").await?;
39+
| ^^^^^ the trait `From<&str>` is not implemented for `PkSk`
40+
|
41+
= help: the trait `From<&str>` is not implemented for `PkSk`
42+
but trait `From<(_, _)>` is implemented for it
43+
= help: for that trait implementation, expected `(_, _)`, found `&str`
44+
= note: required for `&str` to implement `Into<PkSk>`
4545
note: required by a bound in `EncryptedTable::get`
46-
--> src/encrypted_table/mod.rs
47-
|
48-
| pub async fn get<T>(&self, k: impl Into<T::PrimaryKey>) -> Result<Option<T>, GetError>
49-
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `EncryptedTable::get`
46+
--> src/encrypted_table/mod.rs
47+
|
48+
| pub async fn get<T>(&self, k: impl Into<T::PrimaryKey>) -> Result<Option<T>, GetError>
49+
| ^^^^^^^^^^^^^^^^^^^ required by this bound in `EncryptedTable::get`

0 commit comments

Comments
 (0)