Skip to content

Commit 1a75ee5

Browse files
committed
msrv: Update MSRV to 1.91
1 parent 47f67f1 commit 1a75ee5

File tree

7 files changed

+23
-11
lines changed

7 files changed

+23
-11
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
runs-on: ${{ matrix.os }}
3434
steps:
3535
- uses: actions/checkout@v6
36-
- uses: dtolnay/rust-toolchain@1.89
36+
- uses: dtolnay/rust-toolchain@1.91
3737
- uses: Swatinem/rust-cache@v2
3838
- run: cargo test --workspace --no-run
3939
- run: cargo test --workspace --no-fail-fast
@@ -60,7 +60,7 @@ jobs:
6060
runs-on: ubuntu-latest
6161
steps:
6262
- uses: actions/checkout@v6
63-
- uses: dtolnay/rust-toolchain@1.89
63+
- uses: dtolnay/rust-toolchain@1.91
6464
- uses: Swatinem/rust-cache@v2
6565
- run: cargo check --workspace
6666

@@ -69,7 +69,7 @@ jobs:
6969
runs-on: ubuntu-latest
7070
steps:
7171
- uses: actions/checkout@v6
72-
- uses: dtolnay/rust-toolchain@1.89
72+
- uses: dtolnay/rust-toolchain@1.91
7373
with:
7474
components: clippy, rustfmt
7575
- uses: Swatinem/rust-cache@v2

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747

4848
steps:
4949
- uses: actions/checkout@v6
50-
- uses: dtolnay/rust-toolchain@1.89
50+
- uses: dtolnay/rust-toolchain@1.91
5151
with:
5252
target: ${{ matrix.target }}
5353

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ members = ["crates/*"]
55
[workspace.package]
66
version = "0.3.3"
77
# must match ci.yml
8-
rust-version = "1.89"
8+
rust-version = "1.91"
99
authors = ["tingerrr <tinger@tinger.dev>"]
1010
edition = "2024"
1111
homepage = "https://typst-community.github.io/tytanic/"

Justfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
book-src := justfile_directory() / 'docs' / 'book'
22

3-
CI-SET-ENV := 'export RUSTFLAGS="-Dwarnings" RUSTDOCFLAGS="-Dwarnings"'
3+
CI-SET-ENV := 'export RUSTFLAGS="-Dwarnings ${RUSTFLAGS:- }" RUSTDOCFLAGS="-Dwarnings ${RUSTDOCFLAGS:- }"'
44

55
[private]
66
default:

docs/book/src/quickstart/install.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ You can use one of the other installation methods for those versions.
3030
</div>
3131

3232
### Installation From Source
33-
To install Tytanic from source, you must have a Rust toolchain (Rust **v1.89.0+**) and `cargo` installed, you can get these using [`rustup`][rustup].
33+
To install Tytanic from source, you must have a Rust toolchain (Rust **v1.91.0+**) and `cargo` installed, you can get these using [`rustup`][rustup].
3434

3535
#### Stable
3636
```shell

flake.lock

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

flake.nix

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
inputs.nixpkgs.follows = "nixpkgs";
1414
};
1515
rust-manifest = {
16-
url = "https://static.rust-lang.org/dist/channel-rust-1.89.toml";
16+
url = "https://static.rust-lang.org/dist/channel-rust-1.91.toml";
1717
flake = false;
1818
};
1919
};
@@ -51,6 +51,13 @@
5151

5252
rust-toolchain = fenix.packages.${system}.fromManifestFile rust-manifest;
5353

54+
rustflags =
55+
if pkgs.stdenv.hostPlatform.rust.rustcTargetSpec == "x86_64-unknown-linux-gnu" then
56+
# Upstream defaults to lld on x86_64-unknown-linux-gnu, we need to use the system linker
57+
"-Clinker-features=-lld -Clink-self-contained=-linker"
58+
else
59+
null;
60+
5461
# Crane-based Nix flake configuration.
5562
# Based on https://github.com/ipetkov/crane/blob/master/examples/trunk-workspace/flake.nix
5663
craneLib = (crane.mkLib pkgs).overrideToolchain rust-toolchain.defaultToolchain;
@@ -81,6 +88,10 @@
8188
pkgs.pkg-config
8289
pkgs.openssl.dev
8390
];
91+
92+
env = {
93+
RUSTFLAGS = rustflags;
94+
};
8495
};
8596

8697
# Derivation with just the dependencies, so we don't have to keep
@@ -151,6 +162,7 @@
151162
];
152163

153164
RUST_SRC_PATH = "${rust-toolchain.rust-src}/lib/rustlib/src/rust/library";
165+
RUSTFLAGS = rustflags;
154166
};
155167
};
156168
};

0 commit comments

Comments
 (0)