Skip to content

Commit 191a80a

Browse files
chore: Update to Rust 1.88 (#6)
1 parent 9800184 commit 191a80a

File tree

13 files changed

+148
-168
lines changed

13 files changed

+148
-168
lines changed

.cargo/config

Lines changed: 0 additions & 49 deletions
This file was deleted.

.github/dependabot.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,29 @@ updates:
66
separator: "-"
77
schedule:
88
interval: weekly
9+
# Create separate pull requests for major vs minor/patch version updates, as major bumps will likely introduce breaking changes
910
groups:
10-
rust-dependencies:
11+
rust-minor:
1112
patterns:
1213
- "*"
1314
update-types:
1415
- "minor"
1516
- "patch"
16-
17+
rust-major:
18+
patterns:
19+
- "*"
20+
update-types:
21+
- "major"
22+
allow:
23+
# Update both direct and indirect dependencies
24+
- dependency-type: "all"
1725
open-pull-requests-limit: 5
1826

1927
- package-ecosystem: "github-actions"
2028
directory: "/"
2129
schedule:
2230
interval: "weekly"
31+
groups:
32+
actions:
33+
patterns:
34+
- "*"

.github/workflows/ci.yml

Lines changed: 29 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ name: Build and Test
33
on:
44
merge_group:
55
pull_request:
6-
types: [opened, synchronize, reopened, ready_for_review]
76
branches:
87
- main
8+
- dev
99
- 'feat/**'
1010
- release-candidate
1111
workflow_dispatch:
@@ -16,33 +16,44 @@ concurrency:
1616

1717
jobs:
1818
linux-test:
19-
# Change to buildjet-16vcpu-ubuntu-2204 for a more powerful runner (GitHub App must be enabled)
19+
# Change to warp-ubuntu-latest-x64-16x for a more powerful runner (GitHub App must be enabled for this repo)
2020
runs-on: ubuntu-latest
2121
steps:
2222
- uses: actions/checkout@v4
2323
with:
24-
repository: lurk-lab/ci-workflows
24+
repository: argumentcomputer/ci-workflows
2525
- uses: ./.github/actions/ci-env
2626
- uses: actions/checkout@v4
27-
with:
28-
submodules: recursive
2927
- uses: dtolnay/rust-toolchain@stable
3028
- uses: taiki-e/install-action@nextest
3129
- uses: Swatinem/rust-cache@v2
3230
- name: Linux Tests
3331
run: |
3432
cargo nextest run --profile ci --cargo-profile dev-ci --workspace
3533
36-
# Wasm build, rustfmt, clippy, doctests, and MSRV
37-
code-quality:
38-
uses: lurk-lab/ci-workflows/.github/workflows/lints.yml@main
39-
40-
# Check documentation links aren't broken
41-
link-checker:
42-
uses: lurk-lab/ci-workflows/.github/workflows/links-check.yml@main
43-
with:
44-
fail-fast: true
45-
46-
# Lint dependencies for licensing and auditing issues as per `deny.toml`
47-
licenses-audits:
48-
uses: lurk-lab/ci-workflows/.github/workflows/licenses-audits.yml@main
34+
lints:
35+
runs-on: ubuntu-latest
36+
steps:
37+
- uses: actions/checkout@v4
38+
with:
39+
repository: argumentcomputer/ci-workflows
40+
- uses: ./.github/actions/ci-env
41+
- uses: actions/checkout@v4
42+
- uses: dtolnay/rust-toolchain@stable
43+
- uses: Swatinem/rust-cache@v2
44+
- name: Check Rustfmt code style
45+
run: cargo fmt --all --check
46+
- name: Check *everything* compiles
47+
run: cargo check --all-targets --all-features --workspace
48+
- name: Check clippy lints
49+
run: cargo clippy --workspace --all-targets -- -D warnings
50+
- name: Doctests
51+
run: cargo test --doc --workspace
52+
- name: Get Rust version
53+
run: |
54+
echo "RUST_VERSION=$(awk -F '"' '/^channel/ {print $2}' rust-toolchain.toml)" | tee -a $GITHUB_ENV
55+
# Lint dependencies for licensing and auditing issues as per `deny.toml`
56+
- name: Cargo-deny
57+
uses: EmbarkStudios/cargo-deny-action@v2
58+
with:
59+
rust-version: ${{ env.RUST_VERSION }}

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ on:
1212

1313
jobs:
1414
docs:
15-
uses: lurk-lab/ci-workflows/.github/workflows/docs.yml@main
15+
uses: argumentcomputer/ci-workflows/.github/workflows/docs.yml@main

.github/workflows/nightly.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ env:
1212

1313
jobs:
1414
unused-dependencies:
15-
uses: lurk-lab/ci-workflows/.github/workflows/unused-deps.yml@main
15+
uses: argumentcomputer/ci-workflows/.github/workflows/unused-deps.yml@main
1616

1717
rust-version-check:
18-
uses: lurk-lab/ci-workflows/.github/workflows/rust-version-check.yml@main
18+
uses: argumentcomputer/ci-workflows/.github/workflows/rust-version-check.yml@main
1919

2020
typos:
21-
uses: lurk-lab/ci-workflows/.github/workflows/typos.yml@main
21+
uses: argumentcomputer/ci-workflows/.github/workflows/typos.yml@main

.gitignore

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33
debug/
44
target/
55

6-
# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
7-
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
8-
Cargo.lock
9-
106
# These are backup files generated by rustfmt
117
**/*.rs.bk
128

CODE_OF_CONDUCT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ representative at an online or offline event.
6060
## Enforcement
6161

6262
Instances of abusive, harassing, or otherwise unacceptable behavior may be
63-
reported to the community leaders responsible for enforcement at community@lurk-lab.com.
63+
reported to the community leaders responsible for enforcement at community@argument.xyz.
6464
All complaints will be reviewed and investigated promptly and fairly.
6565

6666
All community leaders are obligated to respect the privacy and security of the

Cargo.lock

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 47 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
[package]
22
name = "template"
33
version = "0.1.0"
4-
edition = "2021"
5-
authors = ["Lurk Lab Engineering <engineering@lurk-lab.com>"]
4+
edition = "2024"
5+
authors = ["Argument Engineering <engineering@argument.xyz>"]
66
license = "MIT OR Apache-2.0"
77
# EDIT AS NEEDED
8-
rust-version = "1.70"
8+
rust-version = "1.88"
99

1010
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1111

@@ -22,3 +22,47 @@ opt-level = 3
2222
lto = "thin"
2323
incremental = false
2424
codegen-units = 16
25+
26+
[lints.clippy]
27+
cast_lossless = "warn"
28+
cast_possible_truncation = "warn"
29+
cast_precision_loss = "warn"
30+
cast_sign_loss = "warn"
31+
cast_possible_wrap = "warn"
32+
ptr_as_ptr = "warn"
33+
checked_conversions = "warn"
34+
dbg_macro = "warn"
35+
derive_partial_eq_without_eq = "warn"
36+
enum_glob_use = "warn"
37+
explicit_into_iter_loop = "warn"
38+
fallible_impl_from = "warn"
39+
filter_map_next = "warn"
40+
flat_map_option = "warn"
41+
from_iter_instead_of_collect = "warn"
42+
implicit_clone = "warn"
43+
inefficient_to_string = "warn"
44+
large_stack_arrays = "warn"
45+
large_types_passed_by_value = "warn"
46+
macro_use_imports = "warn"
47+
manual_assert = "warn"
48+
map_err_ignore = "warn"
49+
map_unwrap_or = "warn"
50+
match_same_arms = "warn"
51+
match_wild_err_arm = "warn"
52+
needless_continue = "warn"
53+
needless_for_each = "warn"
54+
needless_pass_by_value = "warn"
55+
option_option = "warn"
56+
same_functions_in_if_condition = "warn"
57+
trait_duplication_in_bounds = "warn"
58+
unnecessary_wraps = "warn"
59+
unnested_or_patterns = "warn"
60+
use_self = "warn"
61+
62+
[lints.rust]
63+
nonstandard_style = "warn"
64+
rust_2024_compatibility = "warn"
65+
trivial_numeric_casts = "warn"
66+
unused_lifetimes = "warn"
67+
unused_qualifications = "warn"
68+
unreachable_pub = "warn"

LICENSE-MIT

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2024 Lurk Lab
3+
Copyright (c) 2025 Argument Computer Corporation
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)