Json merge prettyencoder and encoder#19496

Closed

oli-obk wants to merge 6 commits intorust-lang:masterfrom

oli-obk:json_merge_prettyencoder_and_encoder

Commits on Jan 13, 2015

json-encoder: report error when hash map key is not string or numeric

Oliver 'ker' Schneider
authored and
Oliver Schneider
committed
lower FnMut to FnOnce since json-hack is no longer required

Oliver 'ker' Schneider
authored and
Oliver Schneider
committed
add unit test for non string/numeric map keys

Oliver 'ker' Schneider
authored and
Oliver Schneider
committed
ugly hack to convert BadHashMapKey error to general fmt::Error

Oliver 'ker' Schneider
authored and
Oliver Schneider
committed
make next commit more readable
Oliver Schneider
committed

Commits on Jan 14, 2015

merge json::PrettyEncoder and json::Encoder
Oliver Schneider
committed