summaryrefslogtreecommitdiff
path: root/dhall_syntax/src/parser.rs
diff options
context:
space:
mode:
Diffstat (limited to 'dhall_syntax/src/parser.rs')
-rw-r--r--dhall_syntax/src/parser.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/dhall_syntax/src/parser.rs b/dhall_syntax/src/parser.rs
index 40784ec..1262774 100644
--- a/dhall_syntax/src/parser.rs
+++ b/dhall_syntax/src/parser.rs
@@ -564,15 +564,15 @@ impl Parsers {
},
))
}
- fn path(input: ParseInput<Rule>) -> ParseResult<File> {
+ fn path(input: ParseInput<Rule>) -> ParseResult<FilePath> {
Ok(parse_children!(input;
[path_component(components)..] => {
- File { file_path: components.collect() }
+ FilePath { file_path: components.collect() }
}
))
}
- fn local(input: ParseInput<Rule>) -> ParseResult<(FilePrefix, File)> {
+ fn local(input: ParseInput<Rule>) -> ParseResult<(FilePrefix, FilePath)> {
Ok(parse_children!(input;
[parent_path(l)] => l,
[here_path(l)] => l,
@@ -581,24 +581,24 @@ impl Parsers {
))
}
- fn parent_path(input: ParseInput<Rule>) -> ParseResult<(FilePrefix, File)> {
+ fn parent_path(input: ParseInput<Rule>) -> ParseResult<(FilePrefix, FilePath)> {
Ok(parse_children!(input;
[path(p)] => (FilePrefix::Parent, p)
))
}
- fn here_path(input: ParseInput<Rule>) -> ParseResult<(FilePrefix, File)> {
+ fn here_path(input: ParseInput<Rule>) -> ParseResult<(FilePrefix, FilePath)> {
Ok(parse_children!(input;
[path(p)] => (FilePrefix::Here, p)
))
}
- fn home_path(input: ParseInput<Rule>) -> ParseResult<(FilePrefix, File)> {
+ fn home_path(input: ParseInput<Rule>) -> ParseResult<(FilePrefix, FilePath)> {
Ok(parse_children!(input;
[path(p)] => (FilePrefix::Home, p)
))
}
fn absolute_path(
input: ParseInput<Rule>,
- ) -> ParseResult<(FilePrefix, File)> {
+ ) -> ParseResult<(FilePrefix, FilePath)> {
Ok(parse_children!(input;
[path(p)] => (FilePrefix::Absolute, p)
))