Skip to content

Commit c83e5eb

Browse files
committed
style: Normalize sort of derives
1 parent 6cf47b6 commit c83e5eb

File tree

15 files changed

+54
-54
lines changed

15 files changed

+54
-54
lines changed

fluent-bundle/examples/custom_type.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use fluent_bundle::{FluentArgs, FluentBundle, FluentResource, FluentValue};
2121
// - timeStyle
2222
//
2323
// with an enum of allowed values.
24-
#[derive(Debug, Default, PartialEq, Eq, Clone, Hash)]
24+
#[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
2525
enum DateTimeStyleValue {
2626
Full,
2727
Long,
@@ -49,7 +49,7 @@ impl From<&FluentValue<'_>> for DateTimeStyleValue {
4949
}
5050
}
5151

52-
#[derive(Debug, PartialEq, Eq, Default, Clone, Hash)]
52+
#[derive(Clone, Debug, Default, Eq, Hash, PartialEq)]
5353
struct DateTimeOptions {
5454
pub date_style: DateTimeStyleValue,
5555
pub time_style: DateTimeStyleValue,
@@ -84,7 +84,7 @@ impl From<&FluentArgs<'_>> for DateTimeOptions {
8484
// Our new custom type will store a value as an epoch number,
8585
// and the options.
8686

87-
#[derive(Debug, PartialEq, Clone)]
87+
#[derive(Clone, Debug, PartialEq)]
8888
struct DateTime {
8989
epoch: usize,
9090
options: DateTimeOptions,

fluent-bundle/src/errors.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::resolver::ResolverError;
22
use fluent_syntax::parser::ParserError;
33
use std::error::Error;
44

5-
#[derive(Debug, PartialEq, Eq, Clone)]
5+
#[derive(Clone, Debug, Eq, PartialEq)]
66
pub enum EntryKind {
77
Message,
88
Term,
@@ -23,7 +23,7 @@ impl std::fmt::Display for EntryKind {
2323
///
2424
/// It contains three main types of errors that may come up
2525
/// during runtime use of the fluent-bundle crate.
26-
#[derive(Debug, PartialEq, Eq, Clone)]
26+
#[derive(Clone, Debug, Eq, PartialEq)]
2727
pub enum FluentError {
2828
/// An error which occurs when
2929
/// [`FluentBundle::add_resource`](crate::bundle::FluentBundle::add_resource)

fluent-bundle/src/resolver/errors.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use std::error::Error;
44
/// Maps an [`InlineExpression`] into the kind of reference, with owned strings
55
/// that identify the expression. This makes it so that the [`InlineExpression`] can
66
/// be used to generate an error string.
7-
#[derive(Debug, PartialEq, Eq, Clone)]
7+
#[derive(Clone, Debug, Eq, PartialEq)]
88
pub enum ReferenceKind {
99
Function {
1010
id: String,
@@ -49,7 +49,7 @@ where
4949

5050
/// Errors generated during the process of resolving a fluent message into a string.
5151
/// This process takes place in the `write` method of the `WriteValue` trait.
52-
#[derive(Debug, PartialEq, Eq, Clone)]
52+
#[derive(Clone, Debug, Eq, PartialEq)]
5353
pub enum ResolverError {
5454
Reference(ReferenceKind),
5555
NoValue(String),

fluent-bundle/src/types/number.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use intl_pluralrules::operands::PluralOperands;
88
use crate::args::FluentArgs;
99
use crate::types::FluentValue;
1010

11-
#[derive(Debug, Default, Copy, Clone, Hash, PartialEq, Eq)]
11+
#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
1212
pub enum FluentNumberType {
1313
#[default]
1414
Cardinal,
@@ -25,7 +25,7 @@ impl From<&str> for FluentNumberType {
2525
}
2626
}
2727

28-
#[derive(Debug, Copy, Clone, Default, Hash, PartialEq, Eq)]
28+
#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
2929
pub enum FluentNumberStyle {
3030
#[default]
3131
Decimal,
@@ -44,7 +44,7 @@ impl From<&str> for FluentNumberStyle {
4444
}
4545
}
4646

47-
#[derive(Debug, Copy, Clone, Default, Hash, PartialEq, Eq)]
47+
#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
4848
pub enum FluentNumberCurrencyDisplayStyle {
4949
#[default]
5050
Symbol,
@@ -63,7 +63,7 @@ impl From<&str> for FluentNumberCurrencyDisplayStyle {
6363
}
6464
}
6565

66-
#[derive(Debug, Clone, Hash, PartialEq, Eq)]
66+
#[derive(Clone, Debug, Eq, Hash, PartialEq)]
6767
pub struct FluentNumberOptions {
6868
pub r#type: FluentNumberType,
6969
pub style: FluentNumberStyle,
@@ -134,7 +134,7 @@ impl FluentNumberOptions {
134134
}
135135
}
136136

137-
#[derive(Debug, PartialEq, Clone)]
137+
#[derive(Clone, Debug, PartialEq)]
138138
pub struct FluentNumber {
139139
pub value: f64,
140140
pub options: FluentNumberOptions,

fluent-bundle/tests/custom_types.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ fn fluent_custom_type() {
4747

4848
#[test]
4949
fn fluent_date_time_builtin() {
50-
#[derive(Debug, Default, PartialEq, Clone)]
50+
#[derive(Clone, Debug, Default, PartialEq)]
5151
enum DateTimeStyleValue {
5252
Full,
5353
Long,
@@ -73,7 +73,7 @@ fn fluent_date_time_builtin() {
7373
}
7474
}
7575

76-
#[derive(Debug, PartialEq, Default, Clone)]
76+
#[derive(Clone, Debug, Default, PartialEq)]
7777
struct DateTimeOptions {
7878
pub date_style: DateTimeStyleValue,
7979
pub time_style: DateTimeStyleValue,
@@ -99,7 +99,7 @@ fn fluent_date_time_builtin() {
9999
}
100100
}
101101

102-
#[derive(Debug, PartialEq, Clone)]
102+
#[derive(Clone, Debug, PartialEq)]
103103
struct DateTime {
104104
epoch: usize,
105105
options: DateTimeOptions,

fluent-bundle/tests/helpers/mod.rs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ pub fn get_defaults(path: &str) -> Result<TestDefaults, io::Error> {
8888
Ok(serde_yaml::from_str(&s).expect("Parsing YAML failed."))
8989
}
9090

91-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
91+
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
9292
#[serde(deny_unknown_fields)]
9393
pub struct TestBundle {
9494
pub name: Option<String>,
@@ -102,7 +102,7 @@ pub struct TestBundle {
102102
pub errors: Vec<TestError>,
103103
}
104104

105-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
105+
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
106106
#[serde(deny_unknown_fields)]
107107
pub struct TestResource {
108108
pub name: Option<String>,
@@ -111,7 +111,7 @@ pub struct TestResource {
111111
pub source: String,
112112
}
113113

114-
#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
114+
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
115115
#[serde(deny_unknown_fields)]
116116
pub struct TestSetup {
117117
#[serde(skip_serializing_if = "Vec::is_empty", default)]
@@ -120,23 +120,23 @@ pub struct TestSetup {
120120
pub resources: Vec<TestResource>,
121121
}
122122

123-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
123+
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
124124
#[serde(deny_unknown_fields)]
125125
pub struct TestError {
126126
#[serde(rename = "type")]
127127
pub error_type: String,
128128
pub desc: Option<String>,
129129
}
130130

131-
#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
131+
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
132132
#[serde(deny_unknown_fields)]
133133
#[serde(untagged)]
134134
pub enum TestArgumentValue {
135135
String(String),
136136
Number(f64),
137137
}
138138

139-
#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
139+
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
140140
#[serde(deny_unknown_fields)]
141141
pub struct TestAssert {
142142
pub bundle: Option<String>,
@@ -149,7 +149,7 @@ pub struct TestAssert {
149149
pub missing: Option<bool>,
150150
}
151151

152-
#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
152+
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
153153
#[serde(deny_unknown_fields)]
154154
pub struct Test {
155155
pub name: String,
@@ -163,7 +163,7 @@ pub struct Test {
163163
pub asserts: Vec<TestAssert>,
164164
}
165165

166-
#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
166+
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
167167
#[serde(deny_unknown_fields)]
168168
pub struct TestSuite {
169169
pub name: String,
@@ -180,13 +180,13 @@ pub struct TestSuite {
180180
pub suites: Vec<TestSuite>,
181181
}
182182

183-
#[derive(Debug, PartialEq, Serialize, Deserialize, Clone)]
183+
#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
184184
#[serde(deny_unknown_fields)]
185185
pub struct TestFixture {
186186
pub suites: Vec<TestSuite>,
187187
}
188188

189-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
189+
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
190190
#[serde(deny_unknown_fields)]
191191
pub struct BundleDefaults {
192192
#[serde(rename = "useIsolating")]
@@ -195,7 +195,7 @@ pub struct BundleDefaults {
195195
pub locales: Option<Vec<String>>,
196196
}
197197

198-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone)]
198+
#[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
199199
#[serde(deny_unknown_fields)]
200200
pub struct TestDefaults {
201201
pub bundle: BundleDefaults,

fluent-fallback/src/errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use fluent_bundle::FluentError;
22
use std::error::Error;
33
use unic_langid::LanguageIdentifier;
44

5-
#[derive(Debug, PartialEq, Eq)]
5+
#[derive(Debug, Eq, PartialEq)]
66
pub enum LocalizationError {
77
Bundle {
88
error: FluentError,

fluent-fallback/src/types.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ impl<'l> From<&'l str> for L10nKey<'l> {
1616
}
1717
}
1818

19-
#[derive(Debug, Clone)]
19+
#[derive(Clone, Debug)]
2020
pub struct L10nAttribute<'l> {
2121
pub name: Cow<'l, str>,
2222
pub value: Cow<'l, str>,
2323
}
2424

25-
#[derive(Debug, Clone)]
25+
#[derive(Clone, Debug)]
2626
pub struct L10nMessage<'l> {
2727
pub value: Option<Cow<'l, str>>,
2828
pub attributes: Vec<L10nAttribute<'l>>,
2929
}
3030

31-
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
31+
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
3232
pub enum ResourceType {
3333
/// This is a required resource.
3434
///
@@ -53,7 +53,7 @@ pub enum ResourceType {
5353
}
5454

5555
/// A resource identifier for a localization resource.
56-
#[derive(Debug, Clone)]
56+
#[derive(Clone, Debug)]
5757
pub struct ResourceId {
5858
/// The resource identifier.
5959
pub value: String,

fluent-resmgr/src/resource_manager.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ impl ResourceManager {
144144
}
145145

146146
/// Errors generated during the process of retrieving the localization resources
147-
#[derive(Error, Debug)]
147+
#[derive(Debug, Error)]
148148
pub enum ResourceManagerError {
149149
/// Error while reading the resource file
150150
#[error("{0}")]

fluent-syntax/src/ast/helper.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use super::Comment;
55
// This is a helper struct used to properly deserialize referential
66
// JSON comments which are single continuous String, into a vec of
77
// content slices.
8-
#[derive(Debug, PartialEq, Eq, Clone)]
8+
#[derive(Clone, Debug, Eq, PartialEq)]
99
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
1010
#[cfg_attr(feature = "serde", serde(untagged))]
1111
pub enum CommentDef<S> {

0 commit comments

Comments
 (0)