Skip to content

Commit e3722f0

Browse files
Ertanicalerque
authored andcommitted
Fix tests
1 parent b0fbefb commit e3722f0

File tree

5 files changed

+19
-11
lines changed

5 files changed

+19
-11
lines changed

fluent-syntax/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,3 +64,6 @@ required-features = ["json"]
6464
name = "parser_fixtures"
6565
path = "tests/parser_fixtures.rs"
6666
required-features = ["json"]
67+
68+
[lib]
69+
doctest = false

fluent-syntax/src/ast/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,9 +88,8 @@ mod helper;
8888

8989
#[cfg(feature = "serde")]
9090
use serde::{Deserialize, Serialize};
91-
use std::ops::Deref;
9291
#[cfg(feature = "spans")]
93-
use std::ops::Range;
92+
use std::ops::{Deref, Range};
9493

9594
/// Root node of a Fluent Translation List.
9695
///

fluent-syntax/src/parser/core.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@ use super::{
33
errors::{ErrorKind, ParserError},
44
slice::Slice,
55
};
6-
use crate::ast::{self, Span};
6+
use crate::ast;
7+
#[cfg(feature = "spans")]
8+
use crate::ast::Span;
79

810
pub type Result<T> = std::result::Result<T, ParserError>;
911

fluent-syntax/src/serializer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -577,7 +577,7 @@ mod test {
577577
let mut ast = parse(message).expect("failed to parse ftl resource");
578578

579579
let one_variant = Variant {
580-
key: VariantKey::Identifier { name: "one", span: Span::default() },
580+
key: VariantKey::Identifier { name: "one", #[cfg(feature = "spans")] span: Span::default() },
581581
value: Pattern {
582582
elements: vec![
583583
PatternElement::Placeable {

fluent-syntax/tests/helper/mod.rs

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fn adapt_pattern(pattern: &mut ast::Pattern<String>, crlf: bool) {
1313
let mut elements = vec![];
1414
for element in &pattern.elements {
1515
match element {
16-
ast::PatternElement::TextElement { value } => {
16+
ast::PatternElement::TextElement { value, .. } => {
1717
let mut start = 0;
1818
let len = value.len();
1919
for (i, b) in value.as_bytes().iter().enumerate() {
@@ -22,29 +22,33 @@ fn adapt_pattern(pattern: &mut ast::Pattern<String>, crlf: bool) {
2222
if i > start {
2323
let chunk = &value.as_bytes()[start..=i - 1];
2424
let value = String::from_utf8_lossy(chunk).to_string();
25-
elements.push(ast::PatternElement::TextElement { value });
25+
elements.push(ast::PatternElement::TextElement { value, #[cfg(feature = "spans")] span: ast::Span(start..i) });
2626
}
27+
2728
elements.push(ast::PatternElement::TextElement {
2829
value: "\n".to_string(),
30+
#[cfg(feature = "spans")]
31+
span: ast::Span(i..i+1)
2932
});
3033
} else {
3134
let chunk = &value.as_bytes()[start..=i];
3235
let value = String::from_utf8_lossy(chunk).to_string();
33-
elements.push(ast::PatternElement::TextElement { value });
36+
elements.push(ast::PatternElement::TextElement { value, #[cfg(feature = "spans")] span: ast::Span(start..i+1) });
3437
}
3538
start = i + 1;
3639
}
3740
}
41+
3842
if start < len {
3943
let chunk = &value.as_bytes()[start..len];
4044
let value = String::from_utf8_lossy(chunk).to_string();
41-
elements.push(ast::PatternElement::TextElement { value });
45+
elements.push(ast::PatternElement::TextElement { value, #[cfg(feature = "spans")] span: ast::Span(start..len) });
4246
}
4347
}
44-
ast::PatternElement::Placeable { expression } => {
48+
ast::PatternElement::Placeable { expression, #[cfg(feature = "spans")] span } => {
4549
let mut expression = expression.clone();
4650
adapt_expression(&mut expression, crlf);
47-
elements.push(ast::PatternElement::Placeable { expression });
51+
elements.push(ast::PatternElement::Placeable { expression, #[cfg(feature = "spans")] span: span.clone() });
4852
}
4953
}
5054
}
@@ -58,7 +62,7 @@ fn adapt_expression(expression: &mut ast::Expression<String>, crlf: bool) {
5862
adapt_pattern(&mut variant.value, crlf);
5963
}
6064
}
61-
ast::Expression::Inline(_) => {}
65+
ast::Expression::Inline(..) => {}
6266
}
6367
}
6468

0 commit comments

Comments
 (0)