Skip to content

Commit

Permalink
chor: update rust version to 1.75.0 (#228)
Browse files Browse the repository at this point in the history
* chor: update rust version to 1.75.0

* fix: fix clippy warnings
  • Loading branch information
morph-dev authored Jan 29, 2024
1 parent f5ce5f2 commit 1cfec7c
Show file tree
Hide file tree
Showing 15 changed files with 16 additions and 14 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ orbs:
executors:
docker-publisher:
docker:
- image: cimg/rust:1.71.1
- image: cimg/rust:1.75.0
jobs:
docker-build-glados-web-and-publish:
resource_class: xlarge
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
resource_class: large
executor:
name: rust/default
tag: 1.70.0
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 @@ -2,7 +2,7 @@
name = "glados"
version = "0.1.0"
edition = "2021"
rust-version = "1.70.0"
rust-version = "1.75.0"
authors = ["Piper Merriam <[email protected]>"]

[workspace]
Expand Down
2 changes: 1 addition & 1 deletion entity/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "entity"
version = "0.1.0"
edition = "2021"
publish = false
rust-version = "1.70.0"
rust-version = "1.75.0"
authors = ["Piper Merriam <[email protected]>"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion glados-audit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "glados-audit"
version = "0.1.0"
edition = "2021"
publish = false
rust-version = "1.70.0"
rust-version = "1.75.0"
authors = ["Piper Merriam <[email protected]>"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion glados-audit/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# select build image
FROM rust:1.70.0 AS builder
FROM rust:1.75.0 AS builder

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

# create a new empty shell project
RUN USER=root cargo new --bin glados
Expand Down
2 changes: 1 addition & 1 deletion glados-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "glados-core"
version = "0.1.0"
edition = "2021"
publish = false
rust-version = "1.70.0"
rust-version = "1.75.0"
authors = ["Piper Merriam <[email protected]>"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion glados-monitor/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "glados-monitor"
version = "0.1.0"
edition = "2021"
publish = false
rust-version = "1.70.0"
rust-version = "1.75.0"
authors = ["Piper Merriam <[email protected]>"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion glados-monitor/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# select build image
FROM rust:1.70.0 AS builder
FROM rust:1.75.0 AS builder

# create a new empty shell project
RUN USER=root cargo new --bin glados
Expand Down
2 changes: 1 addition & 1 deletion glados-web/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "glados-web"
version = "0.1.0"
edition = "2021"
publish = false
rust-version = "1.70.0"
rust-version = "1.75.0"
authors = ["Piper Merriam <[email protected]>"]

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
Expand Down
2 changes: 1 addition & 1 deletion glados-web/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# select build image
FROM rust:1.70.0 AS builder
FROM rust:1.75.0 AS builder

# create a new empty shell project
RUN USER=root cargo new --bin glados
Expand Down
2 changes: 1 addition & 1 deletion glados-web/src/routes.rs
Original file line number Diff line number Diff line change
Expand Up @@ -491,7 +491,7 @@ pub async fn node_detail(
.await
.unwrap();

let latest_enr = enr_list.get(0).cloned();
let latest_enr = enr_list.first().cloned();

let latest_enr_key_value_list = match &latest_enr {
Some(enr) => Some(
Expand Down
2 changes: 1 addition & 1 deletion migration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name = "migration"
version = "0.1.0"
edition = "2021"
publish = false
rust-version = "1.70.0"
rust-version = "1.75.0"
authors = ["Piper Merriam <[email protected]>"]

[lib]
Expand Down
1 change: 1 addition & 0 deletions migration/src/m20230511_104804_create_node.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ impl MigrationTrait for Migration {
}

#[derive(Iden)]
#[allow(clippy::enum_variant_names)]
enum Node {
Table,
Id,
Expand Down
1 change: 1 addition & 0 deletions migration/src/m20230511_104814_create_content.rs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ impl MigrationTrait for Migration {

// Content that is known to exist that the Portal Network should be aware of.
#[derive(Iden)]
#[allow(clippy::enum_variant_names)]
enum Content {
Table,
Id, // Database primary key
Expand Down

0 comments on commit 1cfec7c

Please sign in to comment.