Skip to content

Commit adaa809

Browse files
webmaster128webmaster128
authored
Merge pull request #435 from CosmWasm/upgrade-deps
Update dependencies in Cargo.lock and cargo-audit
2 parents 818281c + 5c15c6d commit adaa809

File tree

5 files changed

+521
-363
lines changed

5 files changed

+521
-363
lines changed

‎.circleci/config.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
docker:
111111
# The audit tool might use a more modern Rust version than the build jobs. See
112112
# "Tooling Rust compiler" in docs/COMPILER_VERSIONS.md
113-
- image: cimg/rust:1.65.0
113+
- image: cimg/rust:1.69.0
114114
steps:
115115
- checkout
116116
- run:
@@ -123,19 +123,19 @@ jobs:
123123
command: rustc --version; cargo --version; rustup --version
124124
- restore_cache:
125125
keys:
126-
- cargocache-v3-libwasmvm_audit-rust:1.65.0-{{ checksum "libwasmvm/Cargo.lock" }}
127-
- cargocache-v3-libwasmvm_audit-rust:1.65.0-
126+
- cargocache-v3-libwasmvm_audit-rust:1.69.0-{{ checksum "libwasmvm/Cargo.lock" }}
127+
- cargocache-v3-libwasmvm_audit-rust:1.69.0-
128128
- run:
129129
name: Install cargo-audit
130-
command: cargo install --debug cargo-audit --version 0.17.4
130+
command: cargo install --debug cargo-audit --version 0.17.6
131131
- run:
132132
name: Run cargo-audit
133133
working_directory: libwasmvm
134134
command: cargo audit
135135
- save_cache:
136136
paths:
137137
- ~/.cargo/registry
138-
key: cargocache-v3-libwasmvm_audit-rust:1.65.0-{{ checksum "libwasmvm/Cargo.lock" }}
138+
key: cargocache-v3-libwasmvm_audit-rust:1.69.0-{{ checksum "libwasmvm/Cargo.lock" }}
139139

140140
format-go:
141141
docker:

‎docs/COMPILER_VERSIONS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,4 @@ We currently use the following version:
6565
| ------------------------ | ------------ | --------------------------------- |
6666
| Production Rust compiler | 1.68.2 | Builders version 0015 |
6767
| Min Rust compiler | 1.60.0 | Supports builder versions >= 0012 |
68-
| Tooling Rust compiler | 1.65.0 | |
68+
| Tooling Rust compiler | 1.69.0 | |

‎internal/api/bindings.h

Lines changed: 48 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* (c) 2019 Confio OÜ. Licensed under Apache-2.0 */
22

3-
/* Generated with cbindgen:0.24.3 */
3+
/* Generated with cbindgen:0.24.5 */
44

55
/* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
66

@@ -254,7 +254,12 @@ typedef struct iterator_t {
254254
} iterator_t;
255255

256256
typedef struct Iterator_vtable {
257-
int32_t (*next_db)(struct iterator_t, struct gas_meter_t*, uint64_t*, struct UnmanagedVector*, struct UnmanagedVector*, struct UnmanagedVector*);
257+
int32_t (*next_db)(struct iterator_t,
258+
struct gas_meter_t*,
259+
uint64_t*,
260+
struct UnmanagedVector*,
261+
struct UnmanagedVector*,
262+
struct UnmanagedVector*);
258263
} Iterator_vtable;
259264

260265
typedef struct GoIter {
@@ -264,10 +269,31 @@ typedef struct GoIter {
264269
} GoIter;
265270

266271
typedef struct Db_vtable {
267-
int32_t (*read_db)(struct db_t*, struct gas_meter_t*, uint64_t*, struct U8SliceView, struct UnmanagedVector*, struct UnmanagedVector*);
268-
int32_t (*write_db)(struct db_t*, struct gas_meter_t*, uint64_t*, struct U8SliceView, struct U8SliceView, struct UnmanagedVector*);
269-
int32_t (*remove_db)(struct db_t*, struct gas_meter_t*, uint64_t*, struct U8SliceView, struct UnmanagedVector*);
270-
int32_t (*scan_db)(struct db_t*, struct gas_meter_t*, uint64_t*, struct U8SliceView, struct U8SliceView, int32_t, struct GoIter*, struct UnmanagedVector*);
272+
int32_t (*read_db)(struct db_t*,
273+
struct gas_meter_t*,
274+
uint64_t*,
275+
struct U8SliceView,
276+
struct UnmanagedVector*,
277+
struct UnmanagedVector*);
278+
int32_t (*write_db)(struct db_t*,
279+
struct gas_meter_t*,
280+
uint64_t*,
281+
struct U8SliceView,
282+
struct U8SliceView,
283+
struct UnmanagedVector*);
284+
int32_t (*remove_db)(struct db_t*,
285+
struct gas_meter_t*,
286+
uint64_t*,
287+
struct U8SliceView,
288+
struct UnmanagedVector*);
289+
int32_t (*scan_db)(struct db_t*,
290+
struct gas_meter_t*,
291+
uint64_t*,
292+
struct U8SliceView,
293+
struct U8SliceView,
294+
int32_t,
295+
struct GoIter*,
296+
struct UnmanagedVector*);
271297
} Db_vtable;
272298

273299
typedef struct Db {
@@ -281,8 +307,16 @@ typedef struct api_t {
281307
} api_t;
282308

283309
typedef struct GoApi_vtable {
284-
int32_t (*humanize_address)(const struct api_t*, struct U8SliceView, struct UnmanagedVector*, struct UnmanagedVector*, uint64_t*);
285-
int32_t (*canonicalize_address)(const struct api_t*, struct U8SliceView, struct UnmanagedVector*, struct UnmanagedVector*, uint64_t*);
310+
int32_t (*humanize_address)(const struct api_t*,
311+
struct U8SliceView,
312+
struct UnmanagedVector*,
313+
struct UnmanagedVector*,
314+
uint64_t*);
315+
int32_t (*canonicalize_address)(const struct api_t*,
316+
struct U8SliceView,
317+
struct UnmanagedVector*,
318+
struct UnmanagedVector*,
319+
uint64_t*);
286320
} GoApi_vtable;
287321

288322
typedef struct GoApi {
@@ -295,7 +329,12 @@ typedef struct querier_t {
295329
} querier_t;
296330

297331
typedef struct Querier_vtable {
298-
int32_t (*query_external)(const struct querier_t*, uint64_t, uint64_t*, struct U8SliceView, struct UnmanagedVector*, struct UnmanagedVector*);
332+
int32_t (*query_external)(const struct querier_t*,
333+
uint64_t,
334+
uint64_t*,
335+
struct U8SliceView,
336+
struct UnmanagedVector*,
337+
struct UnmanagedVector*);
299338
} Querier_vtable;
300339

301340
typedef struct GoQuerier {

0 commit comments

Comments
 (0)