From 20e75122354dc44468fa58c40e94a43a128aa764 Mon Sep 17 00:00:00 2001
From: Nadrieril
Date: Tue, 10 Sep 2019 15:42:11 +0200
Subject: Use proc_macro_hack to avoid the need for the proc_macro_hygiene
 feature

---
 Cargo.lock                     | 13 +++++++++++++
 dhall_syntax/src/lib.rs        |  1 -
 pest_consume/Cargo.toml        |  1 +
 pest_consume/src/lib.rs        |  4 +++-
 pest_consume_macros/Cargo.toml |  1 +
 pest_consume_macros/src/lib.rs |  2 +-
 6 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dd650ff..bf9f18a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -244,12 +244,14 @@ version = "0.1.0"
 dependencies = [
  "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "pest_consume_macros 0.1.0",
+ "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "pest_consume_macros"
 version = "0.1.0"
 dependencies = [
+ "proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -296,6 +298,16 @@ dependencies = [
  "output_vt100 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "proc-macro-hack"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "proc-macro2"
 version = "1.0.2"
@@ -504,6 +516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 "checksum pest_meta 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "df43fd99896fd72c485fe47542c7b500e4ac1e8700bf995544d1317a60ded547"
 "checksum pretty 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f60c0d9f6fc88ecdd245d90c1920ff76a430ab34303fc778d33b1d0a4c3bf6d3"
 "checksum pretty_assertions 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3f81e1644e1b54f5a68959a29aa86cde704219254669da328ecfdf6a1f09d427"
+"checksum proc-macro-hack 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e688f31d92ffd7c1ddc57a1b4e6d773c0f2a14ee437a4b0a4f5a69c80eb221c8"
 "checksum proc-macro2 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "175a40b9cf564ce9bf050654633dbf339978706b8ead1a907bb970b63185dd95"
 "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe"
 "checksum same-file 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "585e8ddcedc187886a30fa705c47985c3fa88d06624095856b36ca0b82ff4421"
diff --git a/dhall_syntax/src/lib.rs b/dhall_syntax/src/lib.rs
index 95f40c2..3e6db80 100644
--- a/dhall_syntax/src/lib.rs
+++ b/dhall_syntax/src/lib.rs
@@ -1,7 +1,6 @@
 #![feature(trace_macros)]
 #![feature(slice_patterns)]
 #![feature(never_type)]
-#![feature(proc_macro_hygiene)]
 #![allow(
     clippy::many_single_char_names,
     clippy::should_implement_trait,
diff --git a/pest_consume/Cargo.toml b/pest_consume/Cargo.toml
index 7b26d56..70bdd22 100644
--- a/pest_consume/Cargo.toml
+++ b/pest_consume/Cargo.toml
@@ -10,4 +10,5 @@ repository = "https://github.com/Nadrieril/dhall-rust"
 
 [dependencies]
 pest = "2.1"
+proc-macro-hack = "0.5.9"
 pest_consume_macros = { path = "../pest_consume_macros" }
diff --git a/pest_consume/src/lib.rs b/pest_consume/src/lib.rs
index 1579f81..439effb 100644
--- a/pest_consume/src/lib.rs
+++ b/pest_consume/src/lib.rs
@@ -3,7 +3,9 @@ use pest::iterators::{Pair, Pairs};
 use pest::Parser as PestParser;
 use pest::{RuleType, Span};
 
-pub use pest_consume_macros::{make_parser, match_inputs};
+pub use pest_consume_macros::make_parser;
+#[proc_macro_hack::proc_macro_hack]
+pub use pest_consume_macros::match_inputs;
 
 static UNIT: () = ();
 
diff --git a/pest_consume_macros/Cargo.toml b/pest_consume_macros/Cargo.toml
index dd65d95..317fd29 100644
--- a/pest_consume_macros/Cargo.toml
+++ b/pest_consume_macros/Cargo.toml
@@ -15,4 +15,5 @@ doctest = false
 [dependencies]
 quote = "1.0.2"
 proc-macro2 = "1.0.2"
+proc-macro-hack = "0.5.9"
 syn = { version = "1.0.5", features = ["full", "extra-traits"] }
diff --git a/pest_consume_macros/src/lib.rs b/pest_consume_macros/src/lib.rs
index b5368ec..3929974 100644
--- a/pest_consume_macros/src/lib.rs
+++ b/pest_consume_macros/src/lib.rs
@@ -19,7 +19,7 @@ pub fn make_parser(attrs: TokenStream, input: TokenStream) -> TokenStream {
     })
 }
 
-#[proc_macro]
+#[proc_macro_hack::proc_macro_hack]
 pub fn match_inputs(input: TokenStream) -> TokenStream {
     TokenStream::from(match match_inputs::match_inputs(input) {
         Ok(tokens) => tokens,
-- 
cgit v1.2.3