Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ jobs:
- name: Install toolchain
uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2
with:
bins: wasm-bindgen-cli@0.2.105, wasm-opt
bins: wasm-bindgen-cli@0.2.106, wasm-opt
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/beta_js_api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
uses: extractions/setup-just@e33e0265a09d6d736e2ee1e0eb685ef1de4669ff # v3.0.0

- name: Install wasm-bindgen-cli
run: cargo install wasm-bindgen-cli --version 0.2.105
run: cargo install wasm-bindgen-cli --version 0.2.106

- name: Install wasm-tools
run: cargo install wasm-tools
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
- name: Install toolchain
uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2
with:
bins: wasm-bindgen-cli@0.2.105, wasm-opt
bins: wasm-bindgen-cli@0.2.106, wasm-opt
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull_request_node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
with:
cache-target: release
cache-base: main
bins: wasm-bindgen-cli@0.2.105, wasm-opt
bins: wasm-bindgen-cli@0.2.106, wasm-opt
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Build main binary
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ jobs:
- name: Install toolchain
uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2
with:
bins: wasm-bindgen-cli@0.2.105, wasm-opt
bins: wasm-bindgen-cli@0.2.106, wasm-opt
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down Expand Up @@ -314,7 +314,7 @@ jobs:
- name: Install toolchain
uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2
with:
bins: wasm-bindgen-cli@0.2.105, wasm-opt
bins: wasm-bindgen-cli@0.2.106, wasm-opt
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/repository_dispatch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
- name: Install toolchain
uses: moonrepo/setup-rust@ede6de059f8046a5e236c94046823e2af11ca670 # v1.2.2
with:
bins: wasm-bindgen-cli@0.2.105, wasm-opt
bins: wasm-bindgen-cli@0.2.106, wasm-opt
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand Down
36 changes: 18 additions & 18 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ tikv-jemallocator = "0.6.1"
tokio = "1.48.0"
tower = "0.5.2"
tower-lsp-server = "0.23.0"
tracing = { version = "0.1.41", default-features = false, features = ["attributes", "std"] }
tracing-subscriber = "0.3.20"
tracing = { version = "0.1.44", default-features = false, features = ["attributes", "std"] }
tracing-subscriber = "0.3.22"
unicode-bom = "2.0.3"
unicode-width = "0.1.12"
ureq = "3.1.4"
Expand Down
4 changes: 2 additions & 2 deletions crates/biome_deserialize_macros/src/deserializable_derive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -114,11 +114,11 @@ impl DeriveInput {
})
.collect();

if rest_field.is_some()
if let Some(ref rest_field) = rest_field
&& matches!(attrs.unknown_fields, Some(UnknownFields::Deny))
{
abort!(
rest_field.unwrap(),
rest_field,
"Cannot have a field with #[deserializable(rest)] and #[deserializable(unknown_fields = \"deny\")]"
)
}
Expand Down
4 changes: 2 additions & 2 deletions crates/biome_formatter/src/comments/map.rs
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,7 @@ struct InOrderEntry {
trailing_end: Option<PartIndex>,

#[cfg(feature = "countme")]
_count: countme::Count<InOrderEntry>,
_count: countme::Count<Self>,
}

impl InOrderEntry {
Expand Down Expand Up @@ -592,7 +592,7 @@ struct OutOfOrderEntry {
/// Index into the [CommentsMap::out_of_order] vector at which offset the leading vec is stored.
leading_index: usize,
#[cfg(feature = "countme")]
_count: countme::Count<OutOfOrderEntry>,
_count: countme::Count<Self>,
}

impl OutOfOrderEntry {
Expand Down
4 changes: 2 additions & 2 deletions crates/biome_formatter/src/macros.rs
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@ macro_rules! best_fitting {
#[cfg(test)]
mod tests {
use crate::prelude::*;
use crate::{FormatState, SimpleFormatOptions, VecBuffer, write};
use crate::{FormatState, SimpleFormatOptions, VecBuffer};
use biome_rowan::TextSize;

struct TestFormat;
Expand Down Expand Up @@ -385,8 +385,8 @@ mod tests {

#[test]
fn best_fitting_variants_print_as_lists() {
use crate::Formatted;
use crate::prelude::*;
use crate::{Formatted, format, format_args};

// The second variant below should be selected when printing at a width of 30
let formatted_best_fitting = format!(
Expand Down
1 change: 1 addition & 0 deletions crates/biome_grit_patterns/src/grit_resolved_pattern.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use std::borrow::Cow;
use std::collections::{BTreeMap, HashMap};

#[derive(Clone, Debug, PartialEq)]
#[expect(clippy::use_self)]
pub enum GritResolvedPattern<'a> {
Binding(Vec<GritBinding<'a>>),
Snippets(Vec<ResolvedSnippet<'a, GritQueryContext>>),
Expand Down
2 changes: 1 addition & 1 deletion crates/biome_js_syntax/src/expr_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use crate::{
JsObjectExpression, JsPostUpdateExpression, JsPreUpdateExpression, JsReferenceIdentifier,
JsRegexLiteralExpression, JsStaticMemberExpression, JsStringLiteralExpression, JsSyntaxKind,
JsSyntaxNode, JsSyntaxToken, JsTemplateChunkElement, JsTemplateExpression, JsUnaryExpression,
JsWhileStatement, OperatorPrecedence, T, TsStringLiteralType, inner_string_text,
JsWhileStatement, OperatorPrecedence, TsStringLiteralType, inner_string_text,
};
use biome_rowan::{
AstNode, AstNodeList, AstSeparatedList, NodeOrToken, SyntaxNodeCast, SyntaxResult, TextRange,
Expand Down
2 changes: 1 addition & 1 deletion crates/biome_js_syntax/src/stmt_ext.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{
JsBlockStatement, JsBreakStatement, JsCatchClause, JsContinueStatement, JsFinallyClause,
JsForVariableDeclaration, JsLabeledStatement, JsStatementList, JsSyntaxKind,
JsSyntaxToken as SyntaxToken, JsTryFinallyStatement, JsTryStatement, JsVariableDeclaration,
JsVariableDeclarator, T, TsModuleDeclaration,
JsVariableDeclarator, TsModuleDeclaration,
};
use biome_rowan::{AstNode, SyntaxResult, declare_node_union};

Expand Down
2 changes: 1 addition & 1 deletion crates/biome_migrate/tests/spec_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use biome_test_utils::{
use camino::Utf8Path;
use std::fs::read_to_string;
use std::path::PathBuf;
use std::{env, slice};
use std::slice;

tests_macros::gen_tests! {"tests/specs/**/*.{json,jsonc}", crate::run_test, "module"}

Expand Down
2 changes: 1 addition & 1 deletion crates/biome_service/src/scanner/workspace_bridges.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ pub(crate) trait WorkspaceScannerBridge: Send + Sync + RefUnwindSafe {

/// Trait used to give access to workspace functionality required by the
/// watcher.
pub(crate) trait WorkspaceWatcherBridge {
pub trait WorkspaceWatcherBridge {
/// Returns a reference to the [`FileSystem`].
fn fs(&self) -> &dyn FileSystem;

Expand Down
7 changes: 4 additions & 3 deletions crates/biome_service/src/workspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -548,11 +548,12 @@ impl SupportKind {
}
}

#[derive(Debug, Copy, Clone, Hash, serde::Serialize, serde::Deserialize, Eq, PartialEq)]
#[bitflags]
#[repr(u8)]
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[bitflags]
#[derive(Debug, Copy, Clone, Hash, serde::Serialize, serde::Deserialize, Eq, PartialEq)]
#[serde(rename_all = "camelCase")]
#[cfg_attr(feature = "schema", derive(schemars::JsonSchema))]
#[expect(clippy::use_self)] // false positive
pub enum FeatureKind {
Format,
Lint,
Expand Down
28 changes: 14 additions & 14 deletions crates/biome_string_case/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,31 +37,31 @@ pub enum Case {
/// ASCII numbers
Number = 1 << 0,
/// Alphanumeric Characters that cannot be in lowercase or uppercase (numbers and syllabary)
Uni = Case::Number as u16 | (1 << 1),
Uni = Self::Number as u16 | (1 << 1),
/// A, B1, C42
NumberableCapital = 1 << 2,
/// UPPERCASE
Upper = Case::NumberableCapital as u16 | (1 << 3),
Upper = Self::NumberableCapital as u16 | (1 << 3),
// CONSTANT_CASE
Constant = Case::Upper as u16 | (1 << 4),
Constant = Self::Upper as u16 | (1 << 4),
/// PascalCase
Pascal = Case::NumberableCapital as u16 | (1 << 5),
Pascal = Self::NumberableCapital as u16 | (1 << 5),
/// lowercase
Lower = Case::Number as u16 | (1 << 6),
Lower = Self::Number as u16 | (1 << 6),
/// snake_case
Snake = Case::Lower as u16 | (1 << 7),
Snake = Self::Lower as u16 | (1 << 7),
/// kebab-case
Kebab = Case::Lower as u16 | (1 << 8),
Kebab = Self::Lower as u16 | (1 << 8),
// camelCase
Camel = Case::Lower as u16 | (1 << 9),
Camel = Self::Lower as u16 | (1 << 9),
/// Unknown case
#[default]
Unknown = Case::Camel as u16
| Case::Kebab as u16
| Case::Snake as u16
| Case::Pascal as u16
| Case::Constant as u16
| Case::Uni as u16
Unknown = Self::Camel as u16
| Self::Kebab as u16
| Self::Snake as u16
| Self::Pascal as u16
| Self::Constant as u16
| Self::Uni as u16
| (1 << 10),
}

Expand Down
14 changes: 7 additions & 7 deletions crates/biome_ungrammar/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -102,26 +102,26 @@ pub enum Rule {
/// The label.
label: String,
/// The rule.
rule: Box<Rule>,
rule: Box<Self>,
},
/// A node, like `A`.
Node(Node),
/// A token, like `'struct'`.
Token(Token),
/// A sequence of rules, like `'while' '(' Expr ')' Stmt`.
Seq(Vec<Rule>),
Seq(Vec<Self>),
/// An alternative between many rules, like `'+' | '-' | '*' | '/'`.
Alt(Vec<Rule>),
Alt(Vec<Self>),
/// An unordered, alternative rule, like `A || B || C`, meaning A, B, and C
/// can all appear 0 or 1 times, in any order.
UnorderedSome(Vec<Rule>),
UnorderedSome(Vec<Self>),
/// An unordered, required rule, like `A && B && C`, meaning A, B, and C
/// _must_ all appear exactly 1 time, but can be in any order.
UnorderedAll(Vec<Rule>),
UnorderedAll(Vec<Self>),
/// An optional rule, like `A?`.
Opt(Box<Rule>),
Opt(Box<Self>),
/// A repeated rule, like `A*`.
Rep(Box<Rule>),
Rep(Box<Self>),
}

#[test]
Expand Down
2 changes: 1 addition & 1 deletion crates/biome_ungrammar/src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::collections::HashMap;

use crate::{
Grammar, Node, NodeData, Rule, Token, TokenData,
error::{Result, bail, format_err},
error::{Result, format_err},
lexer::{self, CombinatorKind, TokenKind},
};

Expand Down
2 changes: 1 addition & 1 deletion crates/biome_wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ serde = { workspace = true }
serde_json = { workspace = true }
serde-wasm-bindgen = "0.6.5"
# IMPORTANT: if you update this package, you must update justfile and workflows so we install the same CLI version
wasm-bindgen = { version = "0.2.105", features = ["serde-serialize"] }
wasm-bindgen = { version = "0.2.106", features = ["serde-serialize"] }

[build-dependencies]
biome_js_factory = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/tests_macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ fn transform_file_name(input: &str) -> String {

#[derive(Default)]
struct Modules {
modules: HashMap<String, Modules>,
modules: HashMap<String, Self>,
tests: Vec<proc_macro2::TokenStream>,
}

Expand Down
Loading
Loading