From 2ec0dc3f470be85a093caf1ebaa8898576c8c478 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 17 Mar 2019 22:35:05 +0100 Subject: Clean up some mess relating to Clone bounds --- dhall_core/src/parser.rs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'dhall_core/src/parser.rs') 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; pub type ParsedText = InterpolatedText; -pub type ParsedTextContents<'a> = OwnedInterpolatedTextContents<'a, X, Import>; +pub type ParsedTextContents<'a> = InterpolatedTextContents<'a, X, Import>; pub type RcExpr = Rc; pub type ParseError = pest::error::Error; @@ -438,10 +438,10 @@ rule!(double_quote_literal; // TODO: parse escapes rule!(double_quote_chunk>; children!(c: interpolation) => { - OwnedInterpolatedTextContents::Expr(c) + InterpolatedTextContents::Expr(c) }, captured_str!(s) => { - OwnedInterpolatedTextContents::Text(s) + InterpolatedTextContents::Text(s) }, ); @@ -462,16 +462,16 @@ rule!(interpolation; rule!(single_quote_continue>>; 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![] -- cgit v1.2.3