Skip to content

Commit b611fe2

Browse files
MarcAntoine-ArnaudMarcAntoine-Arnaud
committed
refactor: format code
1 parent 0d5a910 commit b611fe2

22 files changed

+65
-70
lines changed

‎derive/src/generate.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use std::collections::HashMap;
22

33
use iref::{InvalidIri, Iri, IriBuf};
44
use proc_macro2::{Span, TokenStream, TokenTree};
5-
use quote::{format_ident, quote, ToTokens};
5+
use quote::{ToTokens, format_ident, quote};
66
use static_iref::iri;
77

88
use syn::{punctuated::Punctuated, spanned::Spanned};
@@ -242,13 +242,13 @@ fn read_type_attributes(attributes: Vec<syn::Attribute>) -> Result<TypeAttribute
242242
return Err(Error::InvalidAttribute(
243243
AttributeError::UnexpectedToken,
244244
token.span(),
245-
))
245+
));
246246
}
247247
None => {
248248
return Err(Error::InvalidAttribute(
249249
AttributeError::MissingPrefixBinding,
250250
span,
251-
))
251+
));
252252
}
253253
}
254254
} else if id == "type" {
@@ -276,35 +276,35 @@ fn read_type_attributes(attributes: Vec<syn::Attribute>) -> Result<TypeAttribute
276276
return Err(Error::InvalidAttribute(
277277
AttributeError::InvalidType,
278278
span,
279-
))
279+
));
280280
}
281281
}
282282
}
283283
Some(token) => {
284284
return Err(Error::InvalidAttribute(
285285
AttributeError::UnexpectedToken,
286286
token.span(),
287-
))
287+
));
288288
}
289289
None => {
290290
return Err(Error::InvalidAttribute(
291291
AttributeError::MissingType,
292292
span,
293-
))
293+
));
294294
}
295295
}
296296
}
297297
Some(token) => {
298298
return Err(Error::InvalidAttribute(
299299
AttributeError::UnexpectedToken,
300300
token.span(),
301-
))
301+
));
302302
}
303303
None => {
304304
return Err(Error::InvalidAttribute(
305305
AttributeError::MissingType,
306306
span,
307-
))
307+
));
308308
}
309309
}
310310
} else {
@@ -319,7 +319,7 @@ fn read_type_attributes(attributes: Vec<syn::Attribute>) -> Result<TypeAttribute
319319
return Err(Error::InvalidAttribute(
320320
AttributeError::UnexpectedToken,
321321
token.span(),
322-
))
322+
));
323323
}
324324
}
325325
}
@@ -328,7 +328,7 @@ fn read_type_attributes(attributes: Vec<syn::Attribute>) -> Result<TypeAttribute
328328
return Err(Error::InvalidAttribute(
329329
AttributeError::InvalidShape,
330330
attr.span(),
331-
))
331+
));
332332
}
333333
}
334334
}
@@ -424,22 +424,22 @@ fn read_field_attributes(attributes: Vec<syn::Attribute>) -> Result<FieldAttribu
424424
return Err(Error::InvalidAttribute(
425425
AttributeError::InvalidCompactIri,
426426
l.span(),
427-
))
427+
));
428428
}
429429
},
430430
l => {
431431
return Err(Error::InvalidAttribute(
432432
AttributeError::ExpectedString,
433433
l.span(),
434-
))
434+
));
435435
}
436436
}
437437
}
438438
token => {
439439
return Err(Error::InvalidAttribute(
440440
AttributeError::UnexpectedToken,
441441
token.span(),
442-
))
442+
));
443443
}
444444
}
445445

@@ -449,7 +449,7 @@ fn read_field_attributes(attributes: Vec<syn::Attribute>) -> Result<FieldAttribu
449449
return Err(Error::InvalidAttribute(
450450
AttributeError::UnexpectedToken,
451451
token.span(),
452-
))
452+
));
453453
}
454454
None => break,
455455
}
@@ -459,7 +459,7 @@ fn read_field_attributes(attributes: Vec<syn::Attribute>) -> Result<FieldAttribu
459459
return Err(Error::InvalidAttribute(
460460
AttributeError::InvalidShape,
461461
attr.span(),
462-
))
462+
));
463463
}
464464
}
465465
}
@@ -489,7 +489,7 @@ fn read_variant_attributes(attributes: Vec<syn::Attribute>) -> Result<VariantAtt
489489
return Err(Error::InvalidAttribute(
490490
AttributeError::InvalidShape,
491491
attr.span(),
492-
))
492+
));
493493
}
494494
}
495495
}

‎derive/src/generate/de.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ use std::collections::HashMap;
33
use proc_macro2::TokenStream;
44

55
use quote::{format_ident, quote};
6-
use syn::{spanned::Spanned, DeriveInput};
6+
use syn::{DeriveInput, spanned::Spanned};
77

88
use super::{
9-
read_field_attributes, read_type_attributes, Error, InterpretationBounds, TypeAttributes,
9+
Error, InterpretationBounds, TypeAttributes, read_field_attributes, read_type_attributes,
1010
};
1111

1212
mod r#enum;

‎derive/src/generate/de/enum.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
use proc_macro2::{Ident, TokenStream};
22
use quote::quote;
33

4-
use super::{generate_fields, Error};
4+
use super::{Error, generate_fields};
55
use crate::generate::{
6-
extend_generics, read_variant_attributes, InterpretationBounds, TypeAttributes,
7-
VocabularyBounds,
6+
InterpretationBounds, TypeAttributes, VocabularyBounds, extend_generics,
7+
read_variant_attributes,
88
};
99

1010
pub fn generate(

‎derive/src/generate/de/struct.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use proc_macro2::{Ident, TokenStream};
22
use quote::quote;
33

4-
use crate::generate::{extend_generics, TypeAttributes, VocabularyBounds};
4+
use crate::generate::{TypeAttributes, VocabularyBounds, extend_generics};
55

6-
use super::{generate_fields, Error, FieldsDeserialization};
6+
use super::{Error, FieldsDeserialization, generate_fields};
77

88
pub fn generate(
99
attrs: &TypeAttributes,

‎derive/src/generate/ser.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use proc_macro2::{Ident, TokenStream};
22
use quote::quote;
3-
use syn::{spanned::Spanned, DeriveInput};
3+
use syn::{DeriveInput, spanned::Spanned};
44

5-
use super::{read_field_attributes, read_type_attributes, Error, TypeAttributes, VocabularyBounds};
5+
use super::{Error, TypeAttributes, VocabularyBounds, read_field_attributes, read_type_attributes};
66

77
mod r#enum;
88
mod r#struct;

‎derive/src/generate/ser/enum.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ use syn::{punctuated::Punctuated, spanned::Spanned};
55

66
use crate::{
77
generate::{
8-
extend_generics, read_variant_attributes, InterpretationBounds, TypeAttributes,
9-
VariantAttributes, VocabularyBounds,
8+
InterpretationBounds, TypeAttributes, VariantAttributes, VocabularyBounds, extend_generics,
9+
read_variant_attributes,
1010
},
1111
utils::UsesGenericParam,
1212
};
1313

14-
use super::{variant_compound_fields, Error};
14+
use super::{Error, variant_compound_fields};
1515

1616
pub fn generate(
1717
attrs: &TypeAttributes,

‎derive/src/generate/ser/struct.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
use proc_macro2::{Ident, Span, TokenStream};
22
use quote::quote;
33

4-
use crate::generate::{extend_generics, InterpretationBounds, TypeAttributes, RDF_TYPE};
4+
use crate::generate::{InterpretationBounds, RDF_TYPE, TypeAttributes, extend_generics};
55

6-
use super::{variant_compound_fields, Error};
6+
use super::{Error, variant_compound_fields};
77

88
pub fn generate(
99
attrs: &TypeAttributes,

‎examples/derive.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use iref::IriBuf;
2-
use linked_data_next::{to_quads, Deserialize, Serialize};
3-
use rdf_types::{generator, RdfDisplay};
2+
use linked_data_next::{Deserialize, Serialize, to_quads};
3+
use rdf_types::{RdfDisplay, generator};
44

55
#[derive(Serialize, Deserialize)]
66
#[ld(prefix("ex" = "http://example.org/"))]

‎examples/derive_enum.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use linked_data_next::{to_quads, Deserialize, LinkedDataResource, Serialize};
2-
use rdf_types::{generator, RdfDisplay};
1+
use linked_data_next::{Deserialize, LinkedDataResource, Serialize, to_quads};
2+
use rdf_types::{RdfDisplay, generator};
33

44
#[derive(Serialize, Deserialize)]
55
#[ld(prefix("ex" = "http://example.org/"))]

‎examples/deserialize.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
use iref::IriBuf;
2-
use linked_data_next::{to_quads, LinkedDataDeserializeSubject};
2+
use linked_data_next::{LinkedDataDeserializeSubject, to_quads};
33
use linked_data_next_derive::{Deserialize, Serialize};
44
use rdf_types::dataset::IndexedBTreeDataset;
5-
use rdf_types::{generator, Term};
5+
use rdf_types::{Term, generator};
66

77
#[derive(Debug, Serialize, Deserialize)]
88
#[ld(prefix("ex" = "http://example.org/"))]

‎examples/graph.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use iref::IriBuf;
2-
use linked_data_next::{to_quads, Deserialize, Serialize};
3-
use rdf_types::{generator, RdfDisplay};
2+
use linked_data_next::{Deserialize, Serialize, to_quads};
3+
use rdf_types::{RdfDisplay, generator};
44

55
#[derive(Serialize, Deserialize)]
66
#[ld(prefix("ex" = "http://example.org/"))]

‎src/anonymous.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use iref::Iri;
2-
use rdf_types::{vocabulary::IriVocabularyMut, Interpretation, Vocabulary};
2+
use rdf_types::{Interpretation, Vocabulary, vocabulary::IriVocabularyMut};
33

44
use crate::{
55
GraphVisitor, LinkedData, LinkedDataGraph, LinkedDataPredicateObjects, LinkedDataResource,

‎src/datatypes/de.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use rdf_types::{
2+
Interpretation, RDF_LANG_STRING, Vocabulary,
23
interpretation::{ReverseIriInterpretation, ReverseLiteralInterpretation},
34
vocabulary::LiteralVocabulary,
4-
Interpretation, Vocabulary, RDF_LANG_STRING,
55
};
66

77
use crate::{

‎src/datatypes/ser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rdf_types::{
2-
vocabulary::{IriVocabularyMut, LiteralVocabularyMut},
32
Id, Interpretation, Term, Vocabulary,
3+
vocabulary::{IriVocabularyMut, LiteralVocabularyMut},
44
};
55

66
use crate::{

‎src/impl/rdf_types/dataset_graph_view.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use rdf_types::{
2-
dataset::{DatasetGraphView, PatternMatchingDataset, PredicateTraversableDataset},
32
Dataset, Interpretation, Vocabulary,
3+
dataset::{DatasetGraphView, PatternMatchingDataset, PredicateTraversableDataset},
44
};
55
use std::hash::Hash;
66

‎src/impl/rdf_types/dataset_view.rs

+3-6
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ use crate::{
55
LinkedDataSubject, PredicateObjectsVisitor, ResourceInterpretation, SubjectVisitor,
66
};
77
use rdf_types::{
8+
Dataset, Interpretation, Quad, Vocabulary,
89
dataset::{
910
DatasetView, PatternMatchingDataset, PredicateTraversableDataset, SubjectTraversableDataset,
1011
},
11-
Dataset, Interpretation, Quad, Vocabulary,
1212
};
1313

1414
impl<I: Interpretation, V: Vocabulary, D> LinkedDataGraph<I, V> for DatasetView<'_, D>
@@ -157,11 +157,8 @@ struct Subject<'a, 'v, D: Dataset> {
157157
visit_predicates: bool,
158158
}
159159

160-
impl<
161-
'a,
162-
'v,
163-
D: SubjectTraversableDataset + PredicateTraversableDataset + PatternMatchingDataset,
164-
> Subject<'a, 'v, D>
160+
impl<'a, 'v, D: SubjectTraversableDataset + PredicateTraversableDataset + PatternMatchingDataset>
161+
Subject<'a, 'v, D>
165162
where
166163
D::Resource: Eq + Hash,
167164
{

‎src/lib.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ use iref::{Iri, IriBuf};
4646
#[cfg(feature = "derive")]
4747
pub use linked_data_next_derive::{Deserialize, Serialize};
4848
use rdf_types::{
49+
Interpretation, Vocabulary,
4950
dataset::{PatternMatchingDataset, TraversableDataset},
5051
interpretation::ReverseIriInterpretation,
5152
vocabulary::IriVocabulary,
52-
Interpretation, Vocabulary,
5353
};
5454

5555
#[doc(hidden)]
@@ -80,9 +80,9 @@ pub use anonymous::*;
8080
pub use graph::*;
8181
pub use predicate::*;
8282
pub use quads::{
83-
to_interpreted_graph_quads, to_interpreted_quads, to_interpreted_subject_quads,
83+
IntoQuadsError, to_interpreted_graph_quads, to_interpreted_quads, to_interpreted_subject_quads,
8484
to_lexical_quads, to_lexical_quads_with, to_lexical_subject_quads,
85-
to_lexical_subject_quads_with, to_quads, to_quads_with, IntoQuadsError,
85+
to_lexical_subject_quads_with, to_quads, to_quads_with,
8686
};
8787
pub use rdf::*;
8888
pub use reference::*;

‎src/predicate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
use iref::{Iri, IriBuf};
22
use rdf_types::{
3+
BlankId, BlankIdBuf, Id, Interpretation, Vocabulary,
34
dataset::PatternMatchingDataset,
45
interpretation::{
56
ReverseBlankIdInterpretation, ReverseIdInterpretation, ReverseIriInterpretation,
67
},
78
vocabulary::{BlankIdVocabularyMut, IriVocabularyMut},
8-
BlankId, BlankIdBuf, Id, Interpretation, Vocabulary,
99
};
1010

1111
use crate::{

‎src/quads.rs

+5-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use educe::Educe;
22
use iref::IriBuf;
33
use rdf_types::{
4+
Generator, Id, Interpretation, InterpretationMut, Quad, Term, Vocabulary,
45
interpretation::{
56
self, BlankIdInterpretationMut, IriInterpretationMut, LiteralInterpretationMut,
67
ReverseBlankIdInterpretation, ReverseIriInterpretation, ReverseTermInterpretation,
@@ -9,7 +10,6 @@ use rdf_types::{
910
vocabulary::{
1011
EmbedIntoVocabulary, ExtractedFromVocabulary, IriVocabularyMut, LiteralVocabularyMut,
1112
},
12-
Generator, Id, Interpretation, InterpretationMut, Quad, Term, Vocabulary,
1313
};
1414

1515
use crate::{
@@ -170,8 +170,10 @@ pub fn to_lexical_quads<G: Generator>(
170170
pub fn to_lexical_subject_quads<G: Generator>(
171171
generator: G,
172172
graph: Option<&Id>,
173-
value: &(impl LinkedDataSubject<interpretation::WithGenerator<G>>
174-
+ LinkedDataResource<interpretation::WithGenerator<G>>),
173+
value: &(
174+
impl LinkedDataSubject<interpretation::WithGenerator<G>>
175+
+ LinkedDataResource<interpretation::WithGenerator<G>>
176+
),
175177
) -> Result<(Id, Vec<RdfQuad>), IntoQuadsError> {
176178
let mut interpretation = rdf_types::interpretation::WithGenerator::new((), generator);
177179
to_lexical_subject_quads_with(&mut (), &mut interpretation, graph, value)

‎src/rdf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ use std::borrow::Borrow;
44
use educe::Educe;
55
use iref::Iri;
66
use rdf_types::{
7+
Id, Interpretation, LiteralType, LiteralTypeRef, Quad, Term, Vocabulary,
78
vocabulary::{
89
BlankIdVocabulary, EmbedIntoVocabulary, IriVocabulary, IriVocabularyMut, LiteralVocabulary,
910
LiteralVocabularyMut,
1011
},
11-
Id, Interpretation, LiteralType, LiteralTypeRef, Quad, Term, Vocabulary,
1212
};
1313

1414
pub type RdfId<V> = Id<<V as IriVocabulary>::Iri, <V as BlankIdVocabulary>::BlankId>;

0 commit comments

Comments
 (0)