From 4d9082f33b81ddd0f7191e38d5f945f6c9f76b21 Mon Sep 17 00:00:00 2001 From: Tom Lemmens Date: Sun, 16 Jun 2024 16:53:35 +0200 Subject: [PATCH] replace-formatting --- AbstractXsdTypes.jl/Project.toml | 2 +- AbstractXsdTypes.jl/src/AbstractXsdTypes.jl | 2 +- AbstractXsdTypes.jl/src/restrictions/numeric_restrictions.jl | 2 +- XmlStructWriter.jl/Project.toml | 1 - XmlStructWriter.jl/src/XmlStructWriter.jl | 4 ++-- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/AbstractXsdTypes.jl/Project.toml b/AbstractXsdTypes.jl/Project.toml index 7090b4d..90ac29e 100644 --- a/AbstractXsdTypes.jl/Project.toml +++ b/AbstractXsdTypes.jl/Project.toml @@ -4,5 +4,5 @@ authors = ["Tom Lemmens", "Matthijs Cox"] version = "0.1.0" [deps] -Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0" +Format = "1fa38f19-a742-5d3f-a2b9-30dd87b9d5f8" Memoization = "6fafb56a-5788-4b4e-91ca-c0cea6611c73" diff --git a/AbstractXsdTypes.jl/src/AbstractXsdTypes.jl b/AbstractXsdTypes.jl/src/AbstractXsdTypes.jl index 3039549..a25a516 100644 --- a/AbstractXsdTypes.jl/src/AbstractXsdTypes.jl +++ b/AbstractXsdTypes.jl/src/AbstractXsdTypes.jl @@ -1,7 +1,7 @@ module AbstractXsdTypes using Memoization -using Formatting +using Format include("type_definitions.jl") include("construction_and_conversion_functions.jl") diff --git a/AbstractXsdTypes.jl/src/restrictions/numeric_restrictions.jl b/AbstractXsdTypes.jl/src/restrictions/numeric_restrictions.jl index 211bfb2..28a1c5b 100644 --- a/AbstractXsdTypes.jl/src/restrictions/numeric_restrictions.jl +++ b/AbstractXsdTypes.jl/src/restrictions/numeric_restrictions.jl @@ -88,7 +88,7 @@ end # format into string and parse back, if these are equal we are ok max_fraction_digits = get_max_fraction_digits(T) - value_string = sprintf1("%.$(max_fraction_digits)f", value) + value_string = cfmt("%.$(max_fraction_digits)f", value) if parse(S, value_string) != value throw( diff --git a/XmlStructWriter.jl/Project.toml b/XmlStructWriter.jl/Project.toml index da9f089..ef3fd6d 100644 --- a/XmlStructWriter.jl/Project.toml +++ b/XmlStructWriter.jl/Project.toml @@ -5,7 +5,6 @@ version = "0.1.0" [deps] AbstractXsdTypes = "1d4aff4b-e088-40cb-b713-ffe4caf1580b" -Formatting = "59287772-0a20-5a39-b81b-1366585eb4c0" LightXML = "9c8b4983-aa76-5018-a973-4c85ecc9e179" Printf = "de0858da-6303-5e67-8744-51eddeeeb8d7" TimeZones = "f269a46b-ccf7-5d73-abea-4c690281aa53" diff --git a/XmlStructWriter.jl/src/XmlStructWriter.jl b/XmlStructWriter.jl/src/XmlStructWriter.jl index 87fe6f6..8fbd59b 100644 --- a/XmlStructWriter.jl/src/XmlStructWriter.jl +++ b/XmlStructWriter.jl/src/XmlStructWriter.jl @@ -3,7 +3,7 @@ module XmlStructWriter using LightXML using TimeZones using Printf -using Formatting +using Format using AbstractXsdTypes export write_xml @@ -149,7 +149,7 @@ function generate_xml_string(xml_object::AbstractXsdTypes.AbstractXSDFloat)::Str @debug "Generating XML string from $xml_object" if AbstractXsdTypes.fraction_digits_check in AbstractXsdTypes.get_restriction_checks(typeof(xml_object)) max_fraction_digits = AbstractXsdTypes.get_max_fraction_digits(typeof(xml_object)) - xml_object = sprintf1("%.$(max_fraction_digits)f", xml_object) + xml_object = cfmt("%.$(max_fraction_digits)f", xml_object) else xml_object = @sprintf("%f", xml_object) end