Skip to content

Commit 921f409

Browse files
authored
Update Rust toolchain to 1.91 (#21179)
1 parent a151f97 commit 921f409

File tree

17 files changed

+27
-47
lines changed

17 files changed

+27
-47
lines changed

crates/ruff/src/commands/format.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ pub(crate) fn format_source(
370370
let line_index = LineIndex::from_source_text(unformatted);
371371
let byte_range = range.to_text_range(unformatted, &line_index);
372372
format_range(unformatted, byte_range, options).map(|formatted_range| {
373-
let mut formatted = unformatted.to_string();
373+
let mut formatted = unformatted.clone();
374374
formatted.replace_range(
375375
std::ops::Range::<usize>::from(formatted_range.source_range()),
376376
formatted_range.as_code(),

crates/ruff_dev/src/generate_options.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ fn generate_set(output: &mut String, set: Set, parents: &mut Vec<Set>) {
6262
generate_set(
6363
output,
6464
Set::Named {
65-
name: set_name.to_string(),
65+
name: set_name.clone(),
6666
set: *sub_set,
6767
},
6868
parents,

crates/ruff_dev/src/generate_ty_options.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ fn generate_set(output: &mut String, set: Set, parents: &mut Vec<Set>) {
104104
generate_set(
105105
output,
106106
Set::Named {
107-
name: set_name.to_string(),
107+
name: set_name.clone(),
108108
set: *sub_set,
109109
},
110110
parents,

crates/ruff_formatter/src/builders.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ impl<Context> std::fmt::Debug for Align<'_, Context> {
10061006
/// Block indents indent a block of code, such as in a function body, and therefore insert a line
10071007
/// break before and after the content.
10081008
///
1009-
/// Doesn't create an indentation if the passed in content is [`FormatElement.is_empty`].
1009+
/// Doesn't create an indentation if the passed in content is empty.
10101010
///
10111011
/// # Examples
10121012
///

crates/ruff_linter/src/rules/flake8_import_conventions/rules/unconventional_import_alias.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub(crate) fn unconventional_import_alias(
7878
let mut diagnostic = checker.report_diagnostic(
7979
UnconventionalImportAlias {
8080
name: qualified_name,
81-
asname: expected_alias.to_string(),
81+
asname: expected_alias.clone(),
8282
},
8383
binding.range(),
8484
);

crates/ruff_linter/src/rules/flake8_pytest_style/types.rs

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,17 @@ use ruff_macros::CacheKey;
66

77
#[derive(Clone, Copy, Debug, CacheKey, PartialEq, Eq, Serialize, Deserialize)]
88
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
9+
#[derive(Default)]
910
pub enum ParametrizeNameType {
1011
#[serde(rename = "csv")]
1112
Csv,
1213
#[serde(rename = "tuple")]
14+
#[default]
1315
Tuple,
1416
#[serde(rename = "list")]
1517
List,
1618
}
1719

18-
impl Default for ParametrizeNameType {
19-
fn default() -> Self {
20-
Self::Tuple
21-
}
22-
}
23-
2420
impl Display for ParametrizeNameType {
2521
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
2622
match self {
@@ -33,19 +29,15 @@ impl Display for ParametrizeNameType {
3329

3430
#[derive(Clone, Copy, Debug, CacheKey, PartialEq, Eq, Serialize, Deserialize)]
3531
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
32+
#[derive(Default)]
3633
pub enum ParametrizeValuesType {
3734
#[serde(rename = "tuple")]
3835
Tuple,
3936
#[serde(rename = "list")]
37+
#[default]
4038
List,
4139
}
4240

43-
impl Default for ParametrizeValuesType {
44-
fn default() -> Self {
45-
Self::List
46-
}
47-
}
48-
4941
impl Display for ParametrizeValuesType {
5042
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
5143
match self {
@@ -57,19 +49,15 @@ impl Display for ParametrizeValuesType {
5749

5850
#[derive(Clone, Copy, Debug, CacheKey, PartialEq, Eq, Serialize, Deserialize)]
5951
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
52+
#[derive(Default)]
6053
pub enum ParametrizeValuesRowType {
6154
#[serde(rename = "tuple")]
55+
#[default]
6256
Tuple,
6357
#[serde(rename = "list")]
6458
List,
6559
}
6660

67-
impl Default for ParametrizeValuesRowType {
68-
fn default() -> Self {
69-
Self::Tuple
70-
}
71-
}
72-
7361
impl Display for ParametrizeValuesRowType {
7462
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
7563
match self {

crates/ruff_linter/src/rules/flake8_quotes/settings.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,15 @@ use ruff_macros::CacheKey;
99
#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey)]
1010
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
1111
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
12+
#[derive(Default)]
1213
pub enum Quote {
1314
/// Use double quotes.
15+
#[default]
1416
Double,
1517
/// Use single quotes.
1618
Single,
1719
}
1820

19-
impl Default for Quote {
20-
fn default() -> Self {
21-
Self::Double
22-
}
23-
}
24-
2521
impl From<ruff_python_ast::str::Quote> for Quote {
2622
fn from(value: ruff_python_ast::str::Quote) -> Self {
2723
match value {

crates/ruff_linter/src/rules/flake8_simplify/rules/reimplemented_builtin.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ pub(crate) fn convert_for_loop_to_any_all(checker: &Checker, stmt: &Stmt) {
116116

117117
let mut diagnostic = checker.report_diagnostic(
118118
ReimplementedBuiltin {
119-
replacement: contents.to_string(),
119+
replacement: contents.clone(),
120120
},
121121
TextRange::new(stmt.start(), terminal.stmt.end()),
122122
);
@@ -212,7 +212,7 @@ pub(crate) fn convert_for_loop_to_any_all(checker: &Checker, stmt: &Stmt) {
212212

213213
let mut diagnostic = checker.report_diagnostic(
214214
ReimplementedBuiltin {
215-
replacement: contents.to_string(),
215+
replacement: contents.clone(),
216216
},
217217
TextRange::new(stmt.start(), terminal.stmt.end()),
218218
);

crates/ruff_linter/src/rules/flake8_tidy_imports/rules/banned_api.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pub(crate) fn banned_api<T: Ranged>(checker: &Checker, policy: &NameMatchPolicy,
4747
checker.report_diagnostic(
4848
BannedApi {
4949
name: banned_module,
50-
message: reason.msg.to_string(),
50+
message: reason.msg.clone(),
5151
},
5252
node.range(),
5353
);
@@ -74,8 +74,8 @@ pub(crate) fn banned_attribute_access(checker: &Checker, expr: &Expr) {
7474
{
7575
checker.report_diagnostic(
7676
BannedApi {
77-
name: banned_path.to_string(),
78-
message: ban.msg.to_string(),
77+
name: banned_path.clone(),
78+
message: ban.msg.clone(),
7979
},
8080
expr.range(),
8181
);

crates/ruff_linter/src/rules/isort/settings.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,21 +20,17 @@ use super::categorize::ImportSection;
2020
#[derive(Debug, Copy, Clone, PartialEq, Eq, Serialize, Deserialize, CacheKey)]
2121
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
2222
#[cfg_attr(feature = "schemars", derive(schemars::JsonSchema))]
23+
#[derive(Default)]
2324
pub enum RelativeImportsOrder {
2425
/// Place "closer" imports (fewer `.` characters, most local) before
2526
/// "further" imports (more `.` characters, least local).
2627
ClosestToFurthest,
2728
/// Place "further" imports (more `.` characters, least local) imports
2829
/// before "closer" imports (fewer `.` characters, most local).
30+
#[default]
2931
FurthestToClosest,
3032
}
3133

32-
impl Default for RelativeImportsOrder {
33-
fn default() -> Self {
34-
Self::FurthestToClosest
35-
}
36-
}
37-
3834
impl Display for RelativeImportsOrder {
3935
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
4036
match self {

0 commit comments

Comments
 (0)