Skip to content

Commit

Permalink
Bumped supported rust version to minimum 1.68 - reflected in BuildKite (
Browse files Browse the repository at this point in the history
#1014)

Co-authored-by: Miraculous Owonubi <omiraculous@gmail.com>
  • Loading branch information
sjriddle and miraclx authored Apr 12, 2023
1 parent 89f8c2d commit 73f41da
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
strategy:
matrix:
platform: [ubuntu-latest, macos-latest]
toolchain: [stable, 1.56.0]
toolchain: [stable, 1.68.2]
steps:
- uses: actions/checkout@v3
- name: "${{ matrix.toolchain }} with rustfmt, and wasm32"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ State breaking changes (low-level serialization format of any data type) will be

### MSRV

The minimum supported Rust version is currently `1.56`. There are no guarantees that this will be upheld if a security patch release needs to come in that requires a Rust toolchain increase.
The minimum supported Rust version is currently `1.68`. There are no guarantees that this will be upheld if a security patch release needs to come in that requires a Rust toolchain increase.

## Contributing

Expand Down
4 changes: 2 additions & 2 deletions contract-builder/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM rust:1.61.0
FROM rust:1.68.2

LABEL description="Container for builds"

RUN rustup default 1.61.0
RUN rustup default 1.68.2
RUN rustup target add wasm32-unknown-unknown

RUN apt-get -y update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion near-sdk/compilation_tests/schema_derive_invalids.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ error[E0277]: the trait bound `Inner: JsonSchema` is not satisfied
(T0, T1, T2, T3, T4, T5)
and $N others
note: required by a bound in `SchemaGenerator::subschema_for`
--> $CARGO/schemars-0.8.11/src/gen.rs
--> $CARGO/schemars-0.8.12/src/gen.rs
|
| pub fn subschema_for<T: ?Sized + JsonSchema>(&mut self) -> Schema {
| ^^^^^^^^^^ required by this bound in `SchemaGenerator::subschema_for`
2 changes: 1 addition & 1 deletion near-sdk/src/store/tree_map/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ where
}
}

fn get_entry_mut<'a, 'b, K, V, H>(map: &'b mut LookupMap<K, V, H>, key: &'a K) -> (&'a K, &'a mut V)
fn get_entry_mut<'a, K, V, H>(map: &mut LookupMap<K, V, H>, key: &'a K) -> (&'a K, &'a mut V)
where
K: BorshSerialize + Ord + BorshDeserialize + Clone,
V: BorshSerialize + BorshDeserialize,
Expand Down

0 comments on commit 73f41da

Please sign in to comment.