From 0916eafc12b0ccbbf5b524a273903a0a84f30e74 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Fri, 8 Mar 2019 18:47:25 +0100 Subject: Make labels non-Copy --- dhall_core/src/core.rs | 187 ++++++++++++++++++++++++------------------------- 1 file changed, 91 insertions(+), 96 deletions(-) (limited to 'dhall_core/src') diff --git a/dhall_core/src/core.rs b/dhall_core/src/core.rs index d832a18..343c631 100644 --- a/dhall_core/src/core.rs +++ b/dhall_core/src/core.rs @@ -269,7 +269,7 @@ pub enum Builtin { } pub trait StringLike: - Display + fmt::Debug + Clone + Copy + Hash + Ord + Eq + Into + Default + Display + fmt::Debug + Clone + Hash + Ord + Eq + Into + Default { } @@ -277,7 +277,6 @@ impl StringLike for T where T: Display + fmt::Debug + Clone - + Copy + Hash + Ord + Eq @@ -819,11 +818,11 @@ where pub fn map_record_value<'a, I, K, V, U, F>(it: I, f: F) -> BTreeMap where I: IntoIterator, - K: Eq + Ord + Copy + 'a, + K: Eq + Ord + Clone + 'a, V: 'a, F: FnMut(&V) -> U, { - map_record_value_and_keys(it, f, |&x| x) + map_record_value_and_keys(it, f, |x| x.clone()) } pub fn map_record_value_and_keys<'a, I, K, L, V, U, F, G>( @@ -930,92 +929,90 @@ where /// pub fn shift( d: isize, - v: V