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
1 change: 0 additions & 1 deletion crates/ruff_annotate_snippets/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ filter_map_next = "warn"
flat_map_option = "warn"
float_cmp_const = "warn"
fn_params_excessive_bools = "warn"
from_iter_instead_of_collect = "warn"
if_same_then_else = "allow"
implicit_clone = "warn"
imprecise_flops = "warn"
Expand Down
2 changes: 1 addition & 1 deletion crates/ruff_linter/src/linter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1059,7 +1059,7 @@ mod tests {
},
);
insta::with_settings!({filters => vec![(r"\\", "/")]}, {
assert_diagnostics!(format!("{snapshot}"), diagnostics);
assert_diagnostics!(snapshot, diagnostics);
});

Ok(())
Expand Down
2 changes: 1 addition & 1 deletion crates/ruff_linter/src/noqa.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3350,7 +3350,7 @@ mod tests {
PreviewMode::Disabled,
);
assert_eq!(count, 0);
assert_eq!(output, format!("{contents}"));
assert_eq!(output, contents.to_string());

let source_file = SourceFileBuilder::new(path.to_string_lossy(), contents).finish();
let messages = [UnusedVariable {
Expand Down
4 changes: 2 additions & 2 deletions crates/ruff_r2il/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ version = "0.1.0"
publish = false
# Excluded from the ruff workspace (root `exclude`), so nothing here can inherit from
# [workspace.package] / [workspace.dependencies] / [workspace.lints]. edition/rust-version are
# pinned by hand to satisfy BOTH sides: ruff (edition 2024, rust-version 1.93, toolchain 1.97.1)
# and r2sleigh (edition 2024).
# pinned by hand to satisfy BOTH sides: ruff (edition 2024, rust-version per the workspace
# Cargo.toml, toolchain per rust-toolchain.toml) and r2sleigh (edition 2024).
edition = "2024"
rust-version = "1.93"
description = "R2IL intake arm: a lossless ore carrier over r2sleigh's r2il/r2ssa object graph, a furnace that melts it into flat facet-addressed concern rows, and an addressed residual (slag) ledger. Ore in, named slag out — no catch-all, nothing dropped."
Expand Down
12 changes: 8 additions & 4 deletions crates/ty_python_semantic/src/types/infer/tests.rs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
use std::fmt::Write as _;

use super::builder::TypeInferenceBuilder;
use crate::db::tests::{TestDb, TestDbBuilder, setup_db};
use crate::place::symbol;
Expand Down Expand Up @@ -582,15 +584,16 @@ class Ui:
);

for index in 0..MANY_WIDGETS {
ui.push_str(&format!(
let _ = write!(
ui,
concat!(
" self.widget_{index} = Widget()\n",
" self.widget_{index}.configure()\n",
" self.widget_{index}.configure()\n",
" self.widget_{index}.configure()\n",
),
index = index,
));
);
}
ui.push_str(" self.target = Widget()\n");

Expand Down Expand Up @@ -639,15 +642,16 @@ class Inner:
"#,
);
for index in 0..MANY_WIDGETS {
inner.push_str(&format!(
let _ = write!(
inner,
concat!(
" self.widget_{index} = Widget()\n",
" self.widget_{index}.configure()\n",
" self.widget_{index}.configure()\n",
" self.widget_{index}.configure()\n",
),
index = index,
));
);
}
inner.push_str(" self.target = Widget()\n");

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "1.97.1"
channel = "1.98.1"
Loading