Skip to content

Commit a5c7dd9

Browse files
committed
fix merge
1 parent 61b9127 commit a5c7dd9

File tree

6 files changed

+283
-9
lines changed

6 files changed

+283
-9
lines changed

crates/biome_configuration/src/analyzer/linter/rules.rs

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

crates/biome_configuration/src/generated/linter_options_check.rs

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

crates/biome_json_analyze/src/lint/nursery/no_untrusted_licenses.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ impl Rule for NoUntrustedLicenses {
233233
let Some(name) = member.name().ok() else {
234234
continue;
235235
};
236-
let Some(name_text) = name.inner_string_text().and_then(|t| t.ok()) else {
236+
let Some(name_text) = name.inner_string_text() else {
237237
continue;
238238
};
239239
if !DEPENDENCY_GROUPS.contains(&name_text.text()) {
@@ -346,7 +346,7 @@ fn check_dep(
346346
) -> Option<RuleState> {
347347
let dep_name_node = dep_member.name().ok()?;
348348
let dep_name_token = dep_name_node.as_json_member_name()?.value_token().ok()?;
349-
let dep_name = dep_name_node.inner_string_text()?.ok()?.text().to_string();
349+
let dep_name = dep_name_node.inner_string_text()?.text().to_string();
350350

351351
let dep_manifest = project_layout.get_dependency_manifest(project_dir, &dep_name)?;
352352

crates/biome_rule_options/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,8 @@ pub mod no_unsafe_declaration_merging;
258258
pub mod no_unsafe_finally;
259259
pub mod no_unsafe_negation;
260260
pub mod no_unsafe_optional_chaining;
261-
pub mod no_unused_classes;
262261
pub mod no_untrusted_licenses;
262+
pub mod no_unused_classes;
263263
pub mod no_unused_expressions;
264264
pub mod no_unused_function_parameters;
265265
pub mod no_unused_imports;

0 commit comments

Comments
 (0)