From 4939101769d96c23ecf4ea69d8d057ca9c2e5757 Mon Sep 17 00:00:00 2001
From: Jim Blandy <jimb@red-bean.com>
Date: Sun, 13 Jun 2021 14:43:57 -0700
Subject: [PATCH] json-macro: Update for 2nd edition.

---
 json-macro/Cargo.toml    |  1 +
 json-macro/src/lib.rs    |  6 +++++-
 json-macro/src/macros.rs | 10 +++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/json-macro/Cargo.toml b/json-macro/Cargo.toml
index 2ba7946..0910959 100644
--- a/json-macro/Cargo.toml
+++ b/json-macro/Cargo.toml
@@ -2,5 +2,6 @@
 name = "json-macro"
 version = "0.1.0"
 authors = ["You <you@example.com>"]
+edition = "2018"
 
 [dependencies]
diff --git a/json-macro/src/lib.rs b/json-macro/src/lib.rs
index 3f26d74..808f42c 100644
--- a/json-macro/src/lib.rs
+++ b/json-macro/src/lib.rs
@@ -1,3 +1,6 @@
+#![warn(rust_2018_idioms)]
+#![allow(elided_lifetimes_in_paths)]
+
 use std::collections::HashMap;
 
 #[macro_use] mod macros;
@@ -42,4 +45,5 @@ macro_rules! impl_from_num_for_json {
     };
 }
 
-impl_from_num_for_json!(u8 i8 u16 i16 u32 i32 u64 i64 usize isize f32 f64);
+impl_from_num_for_json!(u8 i8 u16 i16 u32 i32 u64 i64 u128 i128
+                        usize isize f32 f64);
diff --git a/json-macro/src/macros.rs b/json-macro/src/macros.rs
index 7752002..77ba040 100644
--- a/json-macro/src/macros.rs
+++ b/json-macro/src/macros.rs
@@ -15,8 +15,10 @@ macro_rules! json {
         {
             let mut fields = $crate::macros::Box::new(
                 $crate::macros::HashMap::new());
-            $( fields.insert($crate::macros::ToString::to_string($key),
-                             json!($value)); )*
+            $(
+                fields.insert($crate::macros::ToString::to_string($key),
+                              json!($value));
+            )*
             $crate::Json::Object(fields)
         }
     };
@@ -25,11 +27,9 @@ macro_rules! json {
     };
 }
 
-
-
 #[cfg(test)]
 mod tests {
-    use ::Json;
+    use crate::Json;
 
     #[test]
     fn json_with_rust_expressions() {