Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: upgrade rust version to 1.75.0 #1113

Merged
merged 1 commit into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ executors:
environment:
IMAGE_NAME: portalnetwork/trin
docker:
- image: cimg/rust:1.71.1
- image: cimg/rust:1.75.0
docker-nightly:
docker:
- image: rustlang/rust:nightly
Expand Down Expand Up @@ -152,7 +152,7 @@ jobs:
resource_class: xlarge
executor:
name: rust/default
tag: 1.71.1
tag: 1.75.0
environment:
RUSTFLAGS: "-D warnings"
RUST_LOG: "debug"
Expand All @@ -173,7 +173,7 @@ jobs:
resource_class: xlarge
executor:
name: rust/default
tag: 1.71.1
tag: 1.75.0
environment:
RUSTFLAGS: "-D warnings"
RUST_LOG: "debug"
Expand Down Expand Up @@ -210,7 +210,7 @@ jobs:
resource_class: 2xlarge
executor:
name: rust/default
tag: 1.71.1
tag: 1.75.0
environment:
RUSTFLAGS: "-D warnings"
RUST_LOG: "debug"
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "trin"
version = "0.1.0"
authors = ["https://github.com/ethereum/trin/graphs/contributors"]
edition = "2021"
rust-version = "1.71.1"
rust-version = "1.75.0"
default-run = "trin"
repository = "https://github.com/ethereum/trin"
license = "GPL-3.0"
Expand Down
2 changes: 1 addition & 1 deletion book/src/developers/quick_setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ rustc --version
You should see something like:

```bash
rustc 1.71.1 (eb26296b5 2023-08-03)
rustc 1.75.0 (82e1608df 2023-12-21)
```

Next, install the required dependencies:
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# select build image
FROM rust:1.71.1 AS builder
FROM rust:1.75.0 AS builder

# create a new empty shell project
RUN USER=root cargo new --bin trin
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile.bridge
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# select build image
FROM rust:1.71.1 AS builder
FROM rust:1.75.0 AS builder

# create a new empty shell project
RUN USER=root cargo new --bin trin
Expand Down
7 changes: 3 additions & 4 deletions ethportal-api/src/types/portal_wire.rs
Original file line number Diff line number Diff line change
Expand Up @@ -86,10 +86,9 @@ impl TryFrom<&Value> for CustomPayload {
"Unable to decode hex payload into bytes",
))?,
};
match ByteList::try_from(payload) {
Ok(payload) => Ok(Self { payload }),
Err(_) => Err(ValidationError::new("Invalid custom payload value")),
}
Ok(Self {
payload: ByteList::from(payload),
})
}
}

Expand Down
2 changes: 1 addition & 1 deletion trin-validation/src/merkle/proof.rs
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ impl MerkleTree {
if deposit_count == (0x1 << level) {
return Ok(MerkleTree::Finalized(
*finalized_branch
.get(0)
.first()
.ok_or(MerkleTreeError::PleaseNotifyTheDevs)?,
));
}
Expand Down
2 changes: 1 addition & 1 deletion utp-testing/docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM rust:1.71.1-bullseye AS builder
FROM rust:1.75.0-bullseye AS builder

RUN apt-get update \
&& apt-get install clang -y \
Expand Down
Loading