Skip to content

Commit

Permalink
chore: Bumping MSRV to 1.75 (#233)
Browse files Browse the repository at this point in the history
* chore: Bumping MSRV to 1.75

* Formatting

* Bumping version on Cargo.toml

* Configuring matrix workflow

* Bringing back actions-rust-lang/setup-rust-toolchain@v1

* Removing "Install Rust Problem Matcher"
  • Loading branch information
oestradiol authored Sep 19, 2024
1 parent 2c206d6 commit 4b75e60
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 40 deletions.
33 changes: 0 additions & 33 deletions .github/rust.json

This file was deleted.

11 changes: 7 additions & 4 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,20 @@ jobs:

strategy:
fail-fast: false
matrix:
rust:
- 1.75.0
- stable

steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Install Rust toolchain
uses: actions-rust-lang/setup-rust-toolchain@v1

# https://github.com/actions-rust-lang/setup-rust-toolchain/blob/main/rust.json
- name: Install Rust Problem Matcher
run: echo "::add-matcher::.github/rust.json"
with:
toolchain: ${{ matrix.rust }}
components: rustfmt, clippy

- name: Bump opt-level
run: sed -i '/\[profile.dev]/a opt-level=1' Cargo.toml
Expand Down
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ resolver = "2"

[workspace.package]
edition = "2021"
rust-version = "1.70"
rust-version = "1.75"
repository = "https://github.com/sugyan/atrium"
license = "MIT"
keywords = ["atproto", "bluesky"]
Expand Down
2 changes: 1 addition & 1 deletion bsky-sdk/src/rich_text.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ impl RichText {
/// Get segments of the rich text.
pub fn segments(&self) -> Vec<RichTextSegment> {
let Some(facets) = self.facets.as_ref() else {
return vec![RichTextSegment::new(&self.text, None)]
return vec![RichTextSegment::new(&self.text, None)];
};
let mut segments = Vec::new();
let (mut text_cursor, mut facet_cursor) = (0, 0);
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[toolchain]
channel = "1.70.0"
channel = "1.75.0"
components = ["clippy", "rustfmt"]

0 comments on commit 4b75e60

Please sign in to comment.