Skip to content

Commit 2be5eb3

Browse files
committed
Merge branch 'span' of https://github.com/Ertanic/fluent-rs into span
2 parents 19855ec + 33d2d38 commit 2be5eb3

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.gitattributes

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
*.ftl eol=lf
22

3-
fluent-syntax/tests/fixtures/crlf.ftl eol=crlf
43
fluent-syntax/tests/fixtures/cr.ftl eol=cr
4+
fluent-syntax/tests/fixtures/crlf.ftl eol=crlf
5+
fluent-syntax/tests/fixtures/formatted/cr.ftl eol=cr
6+
fluent-syntax/tests/fixtures/formatted/junked/cr.ftl eol=cr

fluent-syntax/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ path = "tests/parser_fixtures.rs"
6666
required-features = ["json"]
6767

6868
[lib]
69-
doctest = false
69+
doctest = false

fluent-syntax/src/ast/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ pub struct Variant<S> {
780780
/// }
781781
/// );
782782
/// ```
783-
#[derive(Debug, PartialEq, Eq, Clone)]
783+
#[derive(Debug, PartialEq, Clone)]
784784
#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
785785
#[cfg_attr(feature = "serde", serde(tag = "type"))]
786786
pub enum VariantKey<S> {

fluent-syntax/src/parser/comment.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ where
2020
#[cfg(feature = "spans")]
2121
let start_pos = self.ptr;
2222

23+
#[cfg(feature = "spans")]
24+
let start_pos = self.ptr;
25+
2326
while self.ptr < self.length {
2427
let line_level = self.get_comment_level();
2528
if line_level == Level::None {

0 commit comments

Comments
 (0)