build on stable

This commit is contained in:
Willi Ballenthin 2025-02-17 13:51:55 +00:00
parent aff9778af7
commit 315e51f494
5 changed files with 18 additions and 14 deletions

View file

@ -1,6 +1,4 @@
#![allow(clippy::upper_case_acronyms)]
// for thiserror derive macros
#![feature(error_generic_member_access)]
extern crate bitflags;
#[macro_use]

View file

@ -357,7 +357,7 @@ impl Formatter {
// force this into a string, or else the formatting control codes will not be written.
//
// from the documentation:
// > If you do want to get at the escape codes, then you can convert the ANSIString
// > If you do want to get at the escape codes, then you can convert the ANSIString
// > to a string as you would any other Display value.
let s = Formatter::get_token_color(token).paint(s).to_string();
o.write_str(&s)?;

View file

@ -33,8 +33,13 @@ pub enum WorkspaceError {
BufferTooSmall,
#[error("format not supported")]
FormatNotSupported {
#[backtrace]
source: anyhow::Error, // TODO: doesn't seem like we want anyhow in library code.
// we want the following:
//
// #[backtrace]
//
// but this requires nightly for Rust 1.73+.
// see: https://github.com/rust-lang/rust/issues/99301
source: anyhow::Error,
},
}

View file

@ -1,34 +1,34 @@
# build with various profiles to populate the rustc cache
warmup:
# build with cranelift
-env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo build -Zcodegen-backend
-env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo +nightly build -Zcodegen-backend
# build without cranelift (as hx will do)
-cargo build
# build in release profile
-cargo build --release
# build unicorn dep, which is only used in tests, and takes a while
-cd core && env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo test -Zcodegen-backend
-cd core && env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo +nightly test -Zcodegen-backend
-cd core && cargo test
check:
env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo check -Zcodegen-backend
env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo +nightly check -Zcodegen-backend
clippy:
env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo clippy -Zcodegen-backend
env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo +nightly clippy -Zcodegen-backend
fmt:
cargo fmt
cargo +nightly fmt
lint: check clippy fmt
test-core:
cd core && \
env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo test -Zcodegen-backend
env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo +nightly test -Zcodegen-backend
test-flirt:
cd flirt && \
env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo test -Zcodegen-backend
env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo +nightly test -Zcodegen-backend
test-pylancelot-rs:
cd pylancelot && \
@ -51,7 +51,7 @@ test-pyflirt: test-pyflirt-rs test-pyflirt-py
test: test-core test-flirt test-pylancelot test-pyflirt
build:
env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo build -Zcodegen-backend
env CARGO_PROFILE_DEV_CODEGEN_BACKEND=cranelift cargo +nightly build -Zcodegen-backend
build-release:
cargo build --release

View file

@ -1,2 +1,3 @@
[toolchain]
channel = "nightly"
# channel = "nightly"
channel = "stable"