From 0388d9858627693bab2433f134eb4ed1d6e9b164 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Fri, 6 Sep 2019 18:17:36 +0200
Subject: Make ParseInput independent from dhall-specific types

---
 dhall_syntax/src/core/expr.rs | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'dhall_syntax/src/core')

diff --git a/dhall_syntax/src/core/expr.rs b/dhall_syntax/src/core/expr.rs
index 455e42a..74b481f 100644
--- a/dhall_syntax/src/core/expr.rs
+++ b/dhall_syntax/src/core/expr.rs
@@ -334,8 +334,8 @@ impl<E> Expr<E> {
     pub fn as_mut(&mut self) -> &mut RawExpr<E> {
         &mut self.0.as_mut().0
     }
-    pub fn span(&self) -> Option<&Span> {
-        self.0.as_ref().1.as_ref()
+    pub fn span(&self) -> Option<Span> {
+        self.0.as_ref().1.clone()
     }
 
     pub(crate) fn new(x: RawExpr<E>, n: Span) -> Self {
@@ -397,10 +397,6 @@ pub fn rc<E>(x: RawExpr<E>) -> Expr<E> {
     Expr::from_expr_no_span(x)
 }
 
-pub(crate) fn spanned<E>(span: Span, x: RawExpr<E>) -> Expr<E> {
-    Expr::new(x, span)
-}
-
 /// Add an isize to an usize
 /// Panics on over/underflow
 fn add_ui(u: usize, i: isize) -> Option<usize> {
-- 
cgit v1.2.3