util.serialization: Make errors fatal by default (like the previous implementation)

2 files changed, 12 insertions, 2 deletions

diff --git a/spec/util_serialization_spec.lua b/spec/util_serialization_spec.lua
index f50bdf23..180a2135 100644
--- a/spec/util_serialization_spec.lua
+++ b/spec/util_serialization_spec.lua
@@ -7,9 +7,19 @@ describe("util.serialization", function ()
 			assert.is_string(serialization.serialize(nil));
 			assert.is_string(serialization.serialize(1));
 			assert.is_string(serialization.serialize(true));
-			assert.is_string(serialization.serialize(function () end));
 		end);
 
+		it("rejects function by default", function ()
+			assert.has_error(function ()
+				serialization.serialize(function () end)
+			end);
+		end);
+
+		it("makes a string in debug mode", function ()
+			assert.is_string(serialization.serialize(function () end, "debug"));
+		end);
+
+
 		it("roundtrips", function ()
 			local function test(data)
 				local serialized = serialization.serialize(data);
diff --git a/util/serialization.lua b/util/serialization.lua
index 5a8eef81..628c9d33 100644
--- a/util/serialization.lua
+++ b/util/serialization.lua
@@ -103,7 +103,7 @@ local function new(opt)
 		opt.equals = opt.equals or "=";
 	end
 
-	local fallback = opt.fatal and fatal_error or opt.fallback or default_fallback;
+	local fallback = opt.fallback or opt.fatal == false and default_fallback or fatal_error;
 
 	local function ser(v)
 		return (types[type(v)] or fallback)(v);