From a9b8d274aa316b510178a36e24f5037956ce2040 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 29 Apr 2019 19:37:07 -0400 Subject: [PATCH 1/2] Use map instead of mapValues in XMLCoderElement.flatten --- Sources/XMLCoder/Auxiliaries/XMLCoderElement.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Sources/XMLCoder/Auxiliaries/XMLCoderElement.swift b/Sources/XMLCoder/Auxiliaries/XMLCoderElement.swift index 0ee030f9..fba2478f 100644 --- a/Sources/XMLCoder/Auxiliaries/XMLCoderElement.swift +++ b/Sources/XMLCoder/Auxiliaries/XMLCoderElement.swift @@ -45,9 +45,9 @@ struct XMLCoderElement: Equatable { } func flatten() -> KeyedBox { - let attributes = KeyedStorage(self.attributes.mapValues { - StringBox($0) as SimpleBox - }.shuffled()) + let attributes = KeyedStorage(self.attributes.map { (key, value) in + (key: key, value: StringBox(value) as SimpleBox) + }) let storage = KeyedStorage() var elements = self.elements.reduce(storage) { $0.merge(element: $1) } From aa86b9a9ffe9841e9a0cbde94b8c26359f9faa23 Mon Sep 17 00:00:00 2001 From: James Date: Mon, 29 Apr 2019 19:53:19 -0400 Subject: [PATCH 2/2] Remove whitespace --- Sources/XMLCoder/Auxiliaries/XMLCoderElement.swift | 1 - 1 file changed, 1 deletion(-) diff --git a/Sources/XMLCoder/Auxiliaries/XMLCoderElement.swift b/Sources/XMLCoder/Auxiliaries/XMLCoderElement.swift index fba2478f..508c2161 100644 --- a/Sources/XMLCoder/Auxiliaries/XMLCoderElement.swift +++ b/Sources/XMLCoder/Auxiliaries/XMLCoderElement.swift @@ -49,7 +49,6 @@ struct XMLCoderElement: Equatable { (key: key, value: StringBox(value) as SimpleBox) }) let storage = KeyedStorage() - var elements = self.elements.reduce(storage) { $0.merge(element: $1) } // Handle attributed unkeyed value zap