Skip to content

Commit

Permalink
chore: update Rust version (#455)
Browse files Browse the repository at this point in the history
  • Loading branch information
sesi200 authored Aug 4, 2023
1 parent 432ff1d commit 420473d
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
fail-fast: false
matrix:
os: [ macos-latest, ubuntu-latest ]
rust: [ '1.65.0' ]
rust: [ '1.71.1' ]
dfx: [ '0.8.4', '0.9.2', '0.10.1', '0.11.1' ]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fmt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
rust: [ '1.65.0' ]
rust: [ '1.71.1' ]
os: [ ubuntu-latest ]

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ic-ref.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
ic-hs-ref: "3d71032e"
wallet-tag: "20230308"
os: ubuntu-latest
rust: "1.65.0"
rust: "1.71.1"

steps:
- uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
rust: ["1.65.0"]
rust: ["1.71.1"]
os: [ubuntu-latest]

steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
name: linux
binary_path: target/x86_64-unknown-linux-musl/release
binary_files: icx
rust: '1.65.0'
rust: '1.71.1'
- os: macos-latest
name: macos
binary_path: target/release
binary_files: icx
rust: '1.65.0'
rust: '1.71.1'
steps:
- uses: actions/checkout@master

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
rust: ["1.65.0"]
rust: ["1.71.1"]
os: [ubuntu-latest, macos-latest, windows-latest]

steps:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ version = "0.25.0"
authors = ["DFINITY Stiftung <[email protected]>"]
edition = "2021"
repository = "https://github.com/dfinity/agent-rs"
rust-version = "1.65.0"
rust-version = "1.71.1"
license = "Apache-2.0"

[workspace.dependencies]
Expand Down
2 changes: 1 addition & 1 deletion ic-agent/src/identity/basic.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ impl BasicIdentity {
.collect::<Result<Vec<u8>, std::io::Error>>()?;

Ok(BasicIdentity::from_key_pair(Ed25519KeyPair::from_pkcs8(
pem::parse(&bytes)?.contents(),
pem::parse(bytes)?.contents(),
)?))
}

Expand Down
9 changes: 2 additions & 7 deletions ic-utils/src/call/expiry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ use time::OffsetDateTime;

/// An expiry value. Either not specified (the default), a delay relative to the time the
/// call is made, or a specific date time.
#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq)]
#[derive(Clone, Debug, Ord, PartialOrd, Eq, PartialEq, Default)]
pub enum Expiry {
/// Unspecified. Will not try to override the Agent's value, which might itself have
/// its own default value.
#[default]
Unspecified,

/// A duration that will be added to the system time when the call is made.
Expand Down Expand Up @@ -65,9 +66,3 @@ impl From<OffsetDateTime> for Expiry {
Self::DateTime(dt)
}
}

impl Default for Expiry {
fn default() -> Self {
Expiry::Unspecified
}
}
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[toolchain]
channel = "1.65.0"
channel = "1.71.1"
components = ["rustfmt", "clippy"]
targets = ["wasm32-unknown-unknown"]

0 comments on commit 420473d

Please sign in to comment.