diff options
author | Nadrieril | 2019-03-17 22:35:05 +0100 |
---|---|---|
committer | Nadrieril | 2019-03-17 22:35:05 +0100 |
commit | 2ec0dc3f470be85a093caf1ebaa8898576c8c478 (patch) | |
tree | 8fa3a188f1be9cc5dfa3217eb5a9e28580d0f835 /dhall_core/src/parser.rs | |
parent | 4c08c603946fa0ac483317d85a71dd1f709eec74 (diff) |
Clean up some mess relating to Clone bounds
Diffstat (limited to '')
-rw-r--r-- | dhall_core/src/parser.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/dhall_core/src/parser.rs b/dhall_core/src/parser.rs index 682e081..9487ebc 100644 --- a/dhall_core/src/parser.rs +++ b/dhall_core/src/parser.rs @@ -16,7 +16,7 @@ use crate::core::*; pub type ParsedExpr = Expr<X, Import>; pub type ParsedText = InterpolatedText<X, Import>; -pub type ParsedTextContents<'a> = OwnedInterpolatedTextContents<'a, X, Import>; +pub type ParsedTextContents<'a> = InterpolatedTextContents<'a, X, Import>; pub type RcExpr = Rc<ParsedExpr>; pub type ParseError = pest::error::Error<Rule>; @@ -438,10 +438,10 @@ rule!(double_quote_literal<ParsedText>; // TODO: parse escapes rule!(double_quote_chunk<ParsedTextContents<'a>>; children!(c: interpolation) => { - OwnedInterpolatedTextContents::Expr(c) + InterpolatedTextContents::Expr(c) }, captured_str!(s) => { - OwnedInterpolatedTextContents::Text(s) + InterpolatedTextContents::Text(s) }, ); @@ -462,16 +462,16 @@ rule!(interpolation<RcExpr>; rule!(single_quote_continue<Vec<ParsedTextContents<'a>>>; children!(c: interpolation, rest: single_quote_continue) => { - rest.push(OwnedInterpolatedTextContents::Expr(c)); rest + rest.push(InterpolatedTextContents::Expr(c)); rest }, children!(c: escaped_quote_pair, rest: single_quote_continue) => { - rest.push(OwnedInterpolatedTextContents::Text(c)); rest + rest.push(InterpolatedTextContents::Text(c)); rest }, children!(c: escaped_interpolation, rest: single_quote_continue) => { - rest.push(OwnedInterpolatedTextContents::Text(c)); rest + rest.push(InterpolatedTextContents::Text(c)); rest }, children!(c: raw_str, rest: single_quote_continue) => { - rest.push(OwnedInterpolatedTextContents::Text(c)); rest + rest.push(InterpolatedTextContents::Text(c)); rest }, children!() => { vec![] |