From 4617b2ee9a43899ad3a4aeb22bc88c4cad80b042 Mon Sep 17 00:00:00 2001 From: rszyma Date: Sat, 1 Jun 2024 06:41:01 +0200 Subject: [PATCH] fix failing build --- .vscode/settings.json | 13 ++++++++++++- kls/src/formatter/defsrc_layout/mod.rs | 15 +++++++++------ 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 34bdd07..c387802 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,8 +1,19 @@ { "rust-analyzer.cargo.target": "wasm32-unknown-unknown", - "rust-analyzer.cargo.features": "all", + // https://github.com/rust-lang/rust-analyzer/issues/10298 + // "rust-analyzer.cargo.features": [ + // "cmd", + // "gui", + // "interception_driver" + // ], "eslint.format.enable": true, "[typescript]": { "editor.defaultFormatter": "dbaeumer.vscode-eslint" }, + // https://github.com/rust-lang/rust-analyzer/issues/8521 + // "rust-analyzer.linkedProjects": [ + // "./kls/Cargo.toml", + // "./kanata-local/parser/Cargo.toml", + // "./kanata/parser/Cargo.toml", + // ], } \ No newline at end of file diff --git a/kls/src/formatter/defsrc_layout/mod.rs b/kls/src/formatter/defsrc_layout/mod.rs index 1759b9f..c4ac5de 100644 --- a/kls/src/formatter/defsrc_layout/mod.rs +++ b/kls/src/formatter/defsrc_layout/mod.rs @@ -1,6 +1,8 @@ +use std::fmt::Display; + use super::ext_tree::*; use crate::log; -use anyhow::{anyhow, Ok}; +use anyhow::anyhow; use unicode_segmentation::*; pub mod get_layout; @@ -314,12 +316,13 @@ pub enum LineEndingSequence { CRLF, } -impl ToString for LineEndingSequence { - fn to_string(&self) -> String { +impl Display for LineEndingSequence { + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { match self { - LineEndingSequence::LF => "\n".to_string(), - LineEndingSequence::CRLF => "\r\n".to_string(), - } + LineEndingSequence::LF => f.write_str("\n"), + LineEndingSequence::CRLF => f.write_str("\r\n"), + }?; + Ok(()) } }