Skip to content

Commit 5df197b

Browse files
authored
Merge pull request #522 from CosmWasm/update-rust-to-1.45.2
Update Rust to 1.45.2
2 parents c000752 + 71257dd commit 5df197b

File tree

4 files changed

+45
-41
lines changed

4 files changed

+45
-41
lines changed

.circleci/config.yml

+35-35
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ workflows:
2929
jobs:
3030
package_schema:
3131
docker:
32-
- image: rust:1.44.1
32+
- image: rust:1.45.2
3333
steps:
3434
- checkout
3535
- run:
3636
name: Version information
3737
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
3838
- restore_cache:
3939
keys:
40-
- cargocache-v2-package_schema-rust:1.44.1-{{ checksum "Cargo.lock" }}
40+
- cargocache-v2-package_schema-rust:1.45.2-{{ checksum "Cargo.lock" }}
4141
- run:
4242
name: Build
4343
working_directory: ~/project/packages/schema
@@ -52,19 +52,19 @@ jobs:
5252
- target/debug/.fingerprint
5353
- target/debug/build
5454
- target/debug/deps
55-
key: cargocache-v2-package_schema-rust:1.44.1-{{ checksum "Cargo.lock" }}
55+
key: cargocache-v2-package_schema-rust:1.45.2-{{ checksum "Cargo.lock" }}
5656

5757
package_std:
5858
docker:
59-
- image: rust:1.44.1
59+
- image: rust:1.45.2
6060
steps:
6161
- checkout
6262
- run:
6363
name: Version information
6464
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
6565
- restore_cache:
6666
keys:
67-
- cargocache-v2-package_std-rust:1.44.1-{{ checksum "Cargo.lock" }}
67+
- cargocache-v2-package_std-rust:1.45.2-{{ checksum "Cargo.lock" }}
6868
- run:
6969
name: Add wasm32 target
7070
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
@@ -111,19 +111,19 @@ jobs:
111111
- target/debug/.fingerprint
112112
- target/debug/build
113113
- target/debug/deps
114-
key: cargocache-v2-package_std-rust:1.44.1-{{ checksum "Cargo.lock" }}
114+
key: cargocache-v2-package_std-rust:1.45.2-{{ checksum "Cargo.lock" }}
115115

116116
package_storage:
117117
docker:
118-
- image: rust:1.44.1
118+
- image: rust:1.45.2
119119
steps:
120120
- checkout
121121
- run:
122122
name: Version information
123123
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
124124
- restore_cache:
125125
keys:
126-
- cargocache-v2-package_storage-rust:1.44.1-{{ checksum "Cargo.lock" }}
126+
- cargocache-v2-package_storage-rust:1.45.2-{{ checksum "Cargo.lock" }}
127127
- run:
128128
name: Build library for native target
129129
working_directory: ~/project/packages/storage
@@ -142,11 +142,11 @@ jobs:
142142
- target/debug/.fingerprint
143143
- target/debug/build
144144
- target/debug/deps
145-
key: cargocache-v2-package_storage-rust:1.44.1-{{ checksum "Cargo.lock" }}
145+
key: cargocache-v2-package_storage-rust:1.45.2-{{ checksum "Cargo.lock" }}
146146

147147
package_vm_cranelift:
148148
docker:
149-
- image: rust:1.44.1
149+
- image: rust:1.45.2
150150
steps:
151151
- checkout
152152
- run:
@@ -157,7 +157,7 @@ jobs:
157157
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
158158
- restore_cache:
159159
keys:
160-
- cargocache-v2-package_vm_cranelift-rust:1.44.1-{{ checksum "Cargo.lock" }}
160+
- cargocache-v2-package_vm_cranelift-rust:1.45.2-{{ checksum "Cargo.lock" }}
161161
- run:
162162
name: Build
163163
working_directory: ~/project/packages/vm
@@ -172,7 +172,7 @@ jobs:
172172
- target/debug/.fingerprint
173173
- target/debug/build
174174
- target/debug/deps
175-
key: cargocache-v2-package_vm_cranelift-rust:1.44.1-{{ checksum "Cargo.lock" }}
175+
key: cargocache-v2-package_vm_cranelift-rust:1.45.2-{{ checksum "Cargo.lock" }}
176176

177177
package_vm_singlepass:
178178
docker:
@@ -214,7 +214,7 @@ jobs:
214214

215215
contract_burner:
216216
docker:
217-
- image: rust:1.44.1
217+
- image: rust:1.45.2
218218
working_directory: ~/cosmwasm/contracts/burner
219219
steps:
220220
- checkout:
@@ -224,7 +224,7 @@ jobs:
224224
command: rustc --version; cargo --version; rustup --version
225225
- restore_cache:
226226
keys:
227-
- cargocache-v2-contract_burner-rust:1.44.1-{{ checksum "Cargo.lock" }}
227+
- cargocache-v2-contract_burner-rust:1.45.2-{{ checksum "Cargo.lock" }}
228228
- run:
229229
name: Add wasm32 target
230230
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
@@ -259,11 +259,11 @@ jobs:
259259
- target/wasm32-unknown-unknown/release/.fingerprint
260260
- target/wasm32-unknown-unknown/release/build
261261
- target/wasm32-unknown-unknown/release/deps
262-
key: cargocache-v2-contract_burner-rust:1.44.1-{{ checksum "Cargo.lock" }}
262+
key: cargocache-v2-contract_burner-rust:1.45.2-{{ checksum "Cargo.lock" }}
263263

264264
contract_hackatom:
265265
docker:
266-
- image: rust:1.44.1
266+
- image: rust:1.45.2
267267
working_directory: ~/cosmwasm/contracts/hackatom
268268
steps:
269269
- checkout:
@@ -273,7 +273,7 @@ jobs:
273273
command: rustc --version; cargo --version; rustup --version
274274
- restore_cache:
275275
keys:
276-
- cargocache-v2-contract_hackatom-rust:1.44.1-{{ checksum "Cargo.lock" }}
276+
- cargocache-v2-contract_hackatom-rust:1.45.2-{{ checksum "Cargo.lock" }}
277277
- run:
278278
name: Add wasm32 target
279279
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
@@ -308,7 +308,7 @@ jobs:
308308
- target/wasm32-unknown-unknown/release/.fingerprint
309309
- target/wasm32-unknown-unknown/release/build
310310
- target/wasm32-unknown-unknown/release/deps
311-
key: cargocache-v2-contract_hackatom-rust:1.44.1-{{ checksum "Cargo.lock" }}
311+
key: cargocache-v2-contract_hackatom-rust:1.45.2-{{ checksum "Cargo.lock" }}
312312

313313
# In this job we use singlepass as the VM to execute integration tests. This requires Rust nightly.
314314
# Avoid duplicating generic checks like unit tests or schema generation – they belong in the generic hackatom job.
@@ -347,7 +347,7 @@ jobs:
347347

348348
contract_queue:
349349
docker:
350-
- image: rust:1.44.1
350+
- image: rust:1.45.2
351351
working_directory: ~/cosmwasm/contracts/queue
352352
steps:
353353
- checkout:
@@ -357,7 +357,7 @@ jobs:
357357
command: rustc --version; cargo --version; rustup --version
358358
- restore_cache:
359359
keys:
360-
- cargocache-v2-contract_queue-rust:1.44.1-{{ checksum "Cargo.lock" }}
360+
- cargocache-v2-contract_queue-rust:1.45.2-{{ checksum "Cargo.lock" }}
361361
- run:
362362
name: Add wasm32 target
363363
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
@@ -392,11 +392,11 @@ jobs:
392392
- target/wasm32-unknown-unknown/release/.fingerprint
393393
- target/wasm32-unknown-unknown/release/build
394394
- target/wasm32-unknown-unknown/release/deps
395-
key: cargocache-v2-contract_queue-rust:1.44.1-{{ checksum "Cargo.lock" }}
395+
key: cargocache-v2-contract_queue-rust:1.45.2-{{ checksum "Cargo.lock" }}
396396

397397
contract_reflect:
398398
docker:
399-
- image: rust:1.44.1
399+
- image: rust:1.45.2
400400
working_directory: ~/cosmwasm/contracts/reflect
401401
steps:
402402
- checkout:
@@ -406,7 +406,7 @@ jobs:
406406
command: rustc --version; cargo --version; rustup --version
407407
- restore_cache:
408408
keys:
409-
- cargocache-v2-contract_reflect-rust:1.44.1-{{ checksum "Cargo.lock" }}
409+
- cargocache-v2-contract_reflect-rust:1.45.2-{{ checksum "Cargo.lock" }}
410410
- run:
411411
name: Add wasm32 target
412412
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
@@ -441,11 +441,11 @@ jobs:
441441
- target/wasm32-unknown-unknown/release/.fingerprint
442442
- target/wasm32-unknown-unknown/release/build
443443
- target/wasm32-unknown-unknown/release/deps
444-
key: cargocache-v2-contract_reflect-rust:1.44.1-{{ checksum "Cargo.lock" }}
444+
key: cargocache-v2-contract_reflect-rust:1.45.2-{{ checksum "Cargo.lock" }}
445445

446446
contract_staking:
447447
docker:
448-
- image: rust:1.44.1
448+
- image: rust:1.45.2
449449
working_directory: ~/cosmwasm/contracts/staking
450450
steps:
451451
- checkout:
@@ -455,7 +455,7 @@ jobs:
455455
command: rustc --version; cargo --version; rustup --version
456456
- restore_cache:
457457
keys:
458-
- cargocache-v2-contract_staking-rust:1.44.1-{{ checksum "Cargo.lock" }}
458+
- cargocache-v2-contract_staking-rust:1.45.2-{{ checksum "Cargo.lock" }}
459459
- run:
460460
name: Add wasm32 target
461461
command: rustup target add wasm32-unknown-unknown && rustup target list --installed
@@ -490,19 +490,19 @@ jobs:
490490
- target/wasm32-unknown-unknown/release/.fingerprint
491491
- target/wasm32-unknown-unknown/release/build
492492
- target/wasm32-unknown-unknown/release/deps
493-
key: cargocache-v2-contract_staking-rust:1.44.1-{{ checksum "Cargo.lock" }}
493+
key: cargocache-v2-contract_staking-rust:1.45.2-{{ checksum "Cargo.lock" }}
494494

495495
fmt:
496496
docker:
497-
- image: rust:1.44.1
497+
- image: rust:1.45.2
498498
steps:
499499
- checkout
500500
- run:
501501
name: Version information
502502
command: rustc --version; cargo --version; rustup --version; rustup target list --installed
503503
- restore_cache:
504504
keys:
505-
- cargocache-v2-fmt-rust:1.44.1-{{ checksum "Cargo.lock" }}
505+
- cargocache-v2-fmt-rust:1.45.2-{{ checksum "Cargo.lock" }}
506506
- run:
507507
name: Add rustfmt component
508508
command: rustup component add rustfmt
@@ -535,14 +535,14 @@ jobs:
535535
- target/debug/.fingerprint
536536
- target/debug/build
537537
- target/debug/deps
538-
key: cargocache-v2-fmt-rust:1.44.1-{{ checksum "Cargo.lock" }}
538+
key: cargocache-v2-fmt-rust:1.45.2-{{ checksum "Cargo.lock" }}
539539

540540
clippy:
541541
docker:
542-
- image: rust:1.44.1
542+
- image: rust:1.45.2
543543
environment:
544544
# Make sure to choose version with clippy present: https://rust-lang.github.io/rustup-components-history/x86_64-unknown-linux-gnu.html
545-
NIGHTLY_TOOLCHAIN: nightly-2020-05-26
545+
NIGHTLY_TOOLCHAIN: nightly-2020-09-08
546546
steps:
547547
- checkout
548548
- run:
@@ -559,7 +559,7 @@ jobs:
559559
command: rustc +$NIGHTLY_TOOLCHAIN --version && cargo +$NIGHTLY_TOOLCHAIN --version
560560
- restore_cache:
561561
keys:
562-
- cargocache-v2-clippy-rust:1.44.1-{{ checksum "Cargo.lock" }}-{{ checksum "contracts/burner/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}
562+
- cargocache-v2-clippy-rust:1.45.2-{{ checksum "Cargo.lock" }}-{{ checksum "contracts/burner/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}
563563
- run:
564564
name: Add clippy component
565565
command: rustup component add clippy
@@ -646,7 +646,7 @@ jobs:
646646
- contracts/staking/target/debug/.fingerprint
647647
- contracts/staking/target/debug/build
648648
- contracts/staking/target/debug/deps
649-
key: cargocache-v2-clippy-rust:1.44.1-{{ checksum "Cargo.lock" }}-{{ checksum "contracts/burner/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}
649+
key: cargocache-v2-clippy-rust:1.45.2-{{ checksum "Cargo.lock" }}-{{ checksum "contracts/burner/Cargo.lock" }}-{{ checksum "contracts/hackatom/Cargo.lock" }}-{{ checksum "contracts/queue/Cargo.lock" }}-{{ checksum "contracts/reflect/Cargo.lock" }}-{{ checksum "contracts/staking/Cargo.lock" }}
650650

651651
# This job roughly follows the instructions from https://circleci.com/blog/publishing-to-github-releases-via-circleci/
652652
build_and_upload_devcontracts:
@@ -677,7 +677,7 @@ jobs:
677677
for contract_dir in ./contracts/*/; do
678678
name=$(basename $contract_dir)
679679
echo "Building $name ..."
680-
docker run --volumes-from with_code cosmwasm/rust-optimizer:0.9.0 ./contracts/$name
680+
docker run --volumes-from with_code cosmwasm/rust-optimizer:0.9.1 ./contracts/$name
681681
docker cp with_code:/code/contracts/$name/contract.wasm ./artifacts/$name.wasm
682682
done
683683
- run:

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## 0.11.0 (unreleased)
44

5+
**all**
6+
7+
- Drop support for Rust versions lower than 1.45.2.
8+
59
**cosmwasm-std**
610

711
- Add `time_nanos` to `BlockInfo` allowing access to high precision block times.

contracts/README.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,25 +17,25 @@ To rebuild all contracts as part of a release use the following commands:
1717
docker run --rm -v "$(pwd)":/code \
1818
--mount type=volume,source="devcontract_cache_burner",target=/code/contracts/burner/target \
1919
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
20-
cosmwasm/rust-optimizer:0.9.0 ./contracts/burner
20+
cosmwasm/rust-optimizer:0.9.1 ./contracts/burner
2121

2222
docker run --rm -v "$(pwd)":/code \
2323
--mount type=volume,source="devcontract_cache_hackatom",target=/code/contracts/hackatom/target \
2424
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
25-
cosmwasm/rust-optimizer:0.9.0 ./contracts/hackatom
25+
cosmwasm/rust-optimizer:0.9.1 ./contracts/hackatom
2626

2727
docker run --rm -v "$(pwd)":/code \
2828
--mount type=volume,source="devcontract_cache_queue",target=/code/contracts/queue/target \
2929
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
30-
cosmwasm/rust-optimizer:0.9.0 ./contracts/queue
30+
cosmwasm/rust-optimizer:0.9.1 ./contracts/queue
3131

3232
docker run --rm -v "$(pwd)":/code \
3333
--mount type=volume,source="devcontract_cache_reflect",target=/code/contracts/reflect/target \
3434
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
35-
cosmwasm/rust-optimizer:0.9.0 ./contracts/reflect
35+
cosmwasm/rust-optimizer:0.9.1 ./contracts/reflect
3636

3737
docker run --rm -v "$(pwd)":/code \
3838
--mount type=volume,source="devcontract_cache_staking",target=/code/contracts/staking/target \
3939
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
40-
cosmwasm/rust-optimizer:0.9.0 ./contracts/staking
40+
cosmwasm/rust-optimizer:0.9.1 ./contracts/staking
4141
```

packages/vm/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ To rebuild the test contracts, go to the repo root and do
2323
docker run --rm -v "$(pwd)":/code \
2424
--mount type=volume,source="devcontract_cache_hackatom",target=/code/contracts/hackatom/target \
2525
--mount type=volume,source=registry_cache,target=/usr/local/cargo/registry \
26-
cosmwasm/rust-optimizer:0.9.0 ./contracts/hackatom \
26+
cosmwasm/rust-optimizer:0.9.1 ./contracts/hackatom \
2727
&& cp contracts/hackatom/contract.wasm packages/vm/testdata/contract_0.11.wasm
2828
```
2929

0 commit comments

Comments
 (0)