From 531e51267996cacc0afc1a542d009f4b0ecc29b6 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 25 May 2020 12:52:36 -0700
Subject: [PATCH 01/65] Convert export expansion to loop

---
 src/lib.rs | 141 ++++++++++++++++++++++++++---------------------------
 1 file changed, 69 insertions(+), 72 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 16d7823..7754e06 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -262,84 +262,81 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
     };
 
     let from = export.from;
-    let rules = export
-        .macros
-        .into_iter()
-        .map(|Macro { name, export_as }| {
-            let actual_name = actual_proc_macro_name(&name);
-            let dispatch = dispatch_macro_name(&name);
-            let call_site = call_site_macro_name(&name);
-
-            let export_dispatch = if args.support_nested {
-                quote! {
-                    #[doc(hidden)]
-                    #vis use proc_macro_nested::dispatch as #dispatch;
-                }
-            } else {
-                quote!()
-            };
+    let mut rules = TokenStream::new();
+    for Macro { name, export_as } in export.macros {
+        let actual_name = actual_proc_macro_name(&name);
+        let dispatch = dispatch_macro_name(&name);
+        let call_site = call_site_macro_name(&name);
 
-            let proc_macro_call = if args.support_nested {
-                let extra_bangs = (0..args.internal_macro_calls)
-                    .map(|_| TokenTree::Punct(Punct::new('!', Spacing::Alone)))
-                    .collect::<TokenStream>();
-                quote! {
-                    #crate_prefix #dispatch! { ($($proc_macro)*) #extra_bangs }
-                }
-            } else {
-                quote! {
-                    proc_macro_call!()
-                }
-            };
-
-            let export_call_site = if args.fake_call_site {
-                quote! {
-                    #[doc(hidden)]
-                    #vis use proc_macro_hack::fake_call_site as #call_site;
-                }
-            } else {
-                quote!()
-            };
+        let export_dispatch = if args.support_nested {
+            quote! {
+                #[doc(hidden)]
+                #vis use proc_macro_nested::dispatch as #dispatch;
+            }
+        } else {
+            quote!()
+        };
 
-            let do_derive = if !args.fake_call_site {
-                quote! {
-                    #[derive(#crate_prefix #actual_name)]
-                }
-            } else if crate_prefix.is_some() {
-                quote! {
-                    use #crate_prefix #actual_name;
-                    #[#crate_prefix #call_site ($($proc_macro)*)]
-                    #[derive(#actual_name)]
-                }
-            } else {
-                quote! {
-                    #[#call_site ($($proc_macro)*)]
-                    #[derive(#actual_name)]
-                }
-            };
+        let proc_macro_call = if args.support_nested {
+            let extra_bangs = (0..args.internal_macro_calls)
+                .map(|_| TokenTree::Punct(Punct::new('!', Spacing::Alone)))
+                .collect::<TokenStream>();
+            quote! {
+                #crate_prefix #dispatch! { ($($proc_macro)*) #extra_bangs }
+            }
+        } else {
+            quote! {
+                proc_macro_call!()
+            }
+        };
 
+        let export_call_site = if args.fake_call_site {
             quote! {
                 #[doc(hidden)]
-                #vis use #from::#actual_name;
-
-                #export_dispatch
-                #export_call_site
-
-                #attrs
-                #macro_export
-                macro_rules! #export_as {
-                    ($($proc_macro:tt)*) => {{
-                        #do_derive
-                        #[allow(dead_code)]
-                        enum ProcMacroHack {
-                            #enum_variant = (stringify! { $($proc_macro)* }, 0).1,
-                        }
-                        #proc_macro_call
-                    }};
-                }
+                #vis use proc_macro_hack::fake_call_site as #call_site;
+            }
+        } else {
+            quote!()
+        };
+
+        let do_derive = if !args.fake_call_site {
+            quote! {
+                #[derive(#crate_prefix #actual_name)]
             }
-        })
-        .collect();
+        } else if crate_prefix.is_some() {
+            quote! {
+                use #crate_prefix #actual_name;
+                #[#crate_prefix #call_site ($($proc_macro)*)]
+                #[derive(#actual_name)]
+            }
+        } else {
+            quote! {
+                #[#call_site ($($proc_macro)*)]
+                #[derive(#actual_name)]
+            }
+        };
+
+        rules.extend(quote! {
+            #[doc(hidden)]
+            #vis use #from::#actual_name;
+
+            #export_dispatch
+            #export_call_site
+
+            #attrs
+            #macro_export
+            macro_rules! #export_as {
+                ($($proc_macro:tt)*) => {{
+                    #do_derive
+                    #[allow(dead_code)]
+                    enum ProcMacroHack {
+                        #enum_variant = (stringify! { $($proc_macro)* }, 0).1,
+                    }
+                    #proc_macro_call
+                }};
+            }
+        });
+    }
 
     wrap_in_enum_hack(dummy, rules)
 }

From 74f71a0ba180e948acd7506de63aec7c68fec86a Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 25 May 2020 13:02:08 -0700
Subject: [PATCH 02/65] Join exports into one `use`

---
 src/lib.rs | 94 +++++++++++++++++++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 36 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 7754e06..8bb22d2 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -262,42 +262,29 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
     };
 
     let from = export.from;
-    let mut rules = TokenStream::new();
+    let mut actual_names = TokenStream::new();
+    let mut export_dispatch = TokenStream::new();
+    let mut export_call_site = TokenStream::new();
+    let mut macro_rules = TokenStream::new();
     for Macro { name, export_as } in export.macros {
         let actual_name = actual_proc_macro_name(&name);
         let dispatch = dispatch_macro_name(&name);
         let call_site = call_site_macro_name(&name);
 
-        let export_dispatch = if args.support_nested {
-            quote! {
-                #[doc(hidden)]
-                #vis use proc_macro_nested::dispatch as #dispatch;
-            }
-        } else {
-            quote!()
-        };
+        if !actual_names.is_empty() {
+            actual_names.extend(quote!(,));
+        }
+        actual_names.extend(quote!(#actual_name));
 
-        let proc_macro_call = if args.support_nested {
-            let extra_bangs = (0..args.internal_macro_calls)
-                .map(|_| TokenTree::Punct(Punct::new('!', Spacing::Alone)))
-                .collect::<TokenStream>();
-            quote! {
-                #crate_prefix #dispatch! { ($($proc_macro)*) #extra_bangs }
-            }
-        } else {
-            quote! {
-                proc_macro_call!()
-            }
-        };
+        if !export_dispatch.is_empty() {
+            export_dispatch.extend(quote!(,));
+        }
+        export_dispatch.extend(quote!(dispatch as #dispatch));
 
-        let export_call_site = if args.fake_call_site {
-            quote! {
-                #[doc(hidden)]
-                #vis use proc_macro_hack::fake_call_site as #call_site;
-            }
-        } else {
-            quote!()
-        };
+        if !export_call_site.is_empty() {
+            export_call_site.extend(quote!(,));
+        }
+        export_call_site.extend(quote!(fake_call_site as #call_site));
 
         let do_derive = if !args.fake_call_site {
             quote! {
@@ -316,13 +303,20 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
             }
         };
 
-        rules.extend(quote! {
-            #[doc(hidden)]
-            #vis use #from::#actual_name;
-
-            #export_dispatch
-            #export_call_site
+        let proc_macro_call = if args.support_nested {
+            let extra_bangs = (0..args.internal_macro_calls)
+                .map(|_| TokenTree::Punct(Punct::new('!', Spacing::Alone)))
+                .collect::<TokenStream>();
+            quote! {
+                #crate_prefix #dispatch! { ($($proc_macro)*) #extra_bangs }
+            }
+        } else {
+            quote! {
+                proc_macro_call!()
+            }
+        };
 
+        macro_rules.extend(quote! {
             #attrs
             #macro_export
             macro_rules! #export_as {
@@ -338,7 +332,35 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
         });
     }
 
-    wrap_in_enum_hack(dummy, rules)
+    let export_dispatch = if args.support_nested {
+        quote! {
+            #[doc(hidden)]
+            #vis use proc_macro_nested::{#export_dispatch};
+        }
+    } else {
+        quote!()
+    };
+
+    let export_call_site = if args.fake_call_site {
+        quote! {
+            #[doc(hidden)]
+            #vis use proc_macro_hack::{#export_call_site};
+        }
+    } else {
+        quote!()
+    };
+
+    let expanded = quote! {
+        #[doc(hidden)]
+        #vis use #from::{#actual_names};
+
+        #export_dispatch
+        #export_call_site
+
+        #macro_rules
+    };
+
+    wrap_in_enum_hack(dummy, expanded)
 }
 
 fn expand_define(define: Define) -> TokenStream {

From 9fea5855a5edce776a039f6743b8c87ec8128fbc Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 25 May 2020 13:04:03 -0700
Subject: [PATCH 03/65] Avoid unneeded braces in `use`

---
 src/lib.rs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 8bb22d2..b6cde26 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -266,7 +266,7 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
     let mut export_dispatch = TokenStream::new();
     let mut export_call_site = TokenStream::new();
     let mut macro_rules = TokenStream::new();
-    for Macro { name, export_as } in export.macros {
+    for Macro { name, export_as } in &export.macros {
         let actual_name = actual_proc_macro_name(&name);
         let dispatch = dispatch_macro_name(&name);
         let call_site = call_site_macro_name(&name);
@@ -332,10 +332,16 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
         });
     }
 
+    if export.macros.len() != 1 {
+        export_dispatch = quote!({#export_dispatch});
+        export_call_site = quote!({#export_call_site});
+        actual_names = quote!({#actual_names});
+    }
+
     let export_dispatch = if args.support_nested {
         quote! {
             #[doc(hidden)]
-            #vis use proc_macro_nested::{#export_dispatch};
+            #vis use proc_macro_nested::#export_dispatch;
         }
     } else {
         quote!()
@@ -344,7 +350,7 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
     let export_call_site = if args.fake_call_site {
         quote! {
             #[doc(hidden)]
-            #vis use proc_macro_hack::{#export_call_site};
+            #vis use proc_macro_hack::#export_call_site;
         }
     } else {
         quote!()
@@ -352,7 +358,7 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
 
     let expanded = quote! {
         #[doc(hidden)]
-        #vis use #from::{#actual_names};
+        #vis use #from::#actual_names;
 
         #export_dispatch
         #export_call_site

From b928826d4c246ad0f186ec2b644f2ad01a85221c Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 25 May 2020 13:07:48 -0700
Subject: [PATCH 04/65] Allow macro calls anywhere in declaration crate

---
 build.rs   | 30 ++++++++++++++++++++++++++++++
 src/lib.rs | 12 ++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 build.rs

diff --git a/build.rs b/build.rs
new file mode 100644
index 0000000..d383837
--- /dev/null
+++ b/build.rs
@@ -0,0 +1,30 @@
+use std::env;
+use std::process::Command;
+use std::str;
+
+fn main() {
+    let compiler = match rustc_version() {
+        Some(compiler) => compiler,
+        None => return,
+    };
+
+    if compiler.minor < 33 {
+        println!("cargo:rustc-cfg=proc_macro_hack_no_crate_as_underscore");
+    }
+}
+
+struct Compiler {
+    minor: u32,
+}
+
+fn rustc_version() -> Option<Compiler> {
+    let rustc = env::var_os("RUSTC")?;
+    let output = Command::new(rustc).arg("--version").output().ok()?;
+    let version = str::from_utf8(&output.stdout).ok()?;
+    let mut pieces = version.split('.');
+    if pieces.next() != Some("rustc 1") {
+        return None;
+    }
+    let minor = pieces.next()?.parse().ok()?;
+    Some(Compiler { minor })
+}
diff --git a/src/lib.rs b/src/lib.rs
index b6cde26..8c83622 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -332,6 +332,16 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
         });
     }
 
+    let extern_crate = if cfg!(proc_macro_hack_no_crate_as_underscore) {
+        quote!()
+    } else {
+        quote! {
+            #[allow(unused_imports)]
+            #[macro_use]
+            extern crate #from as _;
+        }
+    };
+
     if export.macros.len() != 1 {
         export_dispatch = quote!({#export_dispatch});
         export_call_site = quote!({#export_call_site});
@@ -357,6 +367,8 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
     };
 
     let expanded = quote! {
+        #extern_crate
+
         #[doc(hidden)]
         #vis use #from::#actual_names;
 

From a7793198b95ae03e60035e095b72aac4254e8a0d Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 25 May 2020 13:11:57 -0700
Subject: [PATCH 05/65] Release 0.5.17

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1f75add..4eabee2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proc-macro-hack"
-version = "0.5.16"
+version = "0.5.17"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

From 769b04169b68b17cd1a4b7d4cdd9b869e6f789f4 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 25 May 2020 13:23:28 -0700
Subject: [PATCH 06/65] Revert "Allow macro calls anywhere in declaration
 crate"

If a module contained more than one separate `use` from the same
implementation crate:

    error: `proc_macro_hack_macroname` is already in scope
      --> src/lib.rs:10:1
       |
    10 | #[proc_macro_hack]
       | ^^^^^^^^^^^^^^^^^^
       |
       = note: macro-expanded `#[macro_use]`s may not shadow existing macros (see RFC 1560)
       = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)

This reverts commit b928826d4c246ad0f186ec2b644f2ad01a85221c.
---
 build.rs   | 30 ------------------------------
 src/lib.rs | 12 ------------
 2 files changed, 42 deletions(-)
 delete mode 100644 build.rs

diff --git a/build.rs b/build.rs
deleted file mode 100644
index d383837..0000000
--- a/build.rs
+++ /dev/null
@@ -1,30 +0,0 @@
-use std::env;
-use std::process::Command;
-use std::str;
-
-fn main() {
-    let compiler = match rustc_version() {
-        Some(compiler) => compiler,
-        None => return,
-    };
-
-    if compiler.minor < 33 {
-        println!("cargo:rustc-cfg=proc_macro_hack_no_crate_as_underscore");
-    }
-}
-
-struct Compiler {
-    minor: u32,
-}
-
-fn rustc_version() -> Option<Compiler> {
-    let rustc = env::var_os("RUSTC")?;
-    let output = Command::new(rustc).arg("--version").output().ok()?;
-    let version = str::from_utf8(&output.stdout).ok()?;
-    let mut pieces = version.split('.');
-    if pieces.next() != Some("rustc 1") {
-        return None;
-    }
-    let minor = pieces.next()?.parse().ok()?;
-    Some(Compiler { minor })
-}
diff --git a/src/lib.rs b/src/lib.rs
index 8c83622..b6cde26 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -332,16 +332,6 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
         });
     }
 
-    let extern_crate = if cfg!(proc_macro_hack_no_crate_as_underscore) {
-        quote!()
-    } else {
-        quote! {
-            #[allow(unused_imports)]
-            #[macro_use]
-            extern crate #from as _;
-        }
-    };
-
     if export.macros.len() != 1 {
         export_dispatch = quote!({#export_dispatch});
         export_call_site = quote!({#export_call_site});
@@ -367,8 +357,6 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
     };
 
     let expanded = quote! {
-        #extern_crate
-
         #[doc(hidden)]
         #vis use #from::#actual_names;
 

From af66eddc4887f568532e8e7997cd20b841636c90 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Thu, 4 Jun 2020 22:10:54 -0700
Subject: [PATCH 07/65] More concise statement of version support

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d6a6463..2ed1179 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ statements or expressions.
 This crate implements an alternative type of procedural macro that can be
 invoked in statement or expression position.
 
-This approach works with any stable or nightly Rust version 1.31+.
+This approach works with any Rust version 1.31+.
 
 ## Defining procedural macros
 

From 7f73f06a093c72c315a177fea0c4328cd2e82d68 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sun, 7 Jun 2020 13:55:38 -0700
Subject: [PATCH 08/65] Add rerun-if-changed to proc-macro-nested build script

---
 nested/build.rs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nested/build.rs b/nested/build.rs
index b4aec63..e08addc 100644
--- a/nested/build.rs
+++ b/nested/build.rs
@@ -16,6 +16,9 @@ macro_rules! count {
 */
 
 fn main() {
+    // Tell Cargo not to rerun on src/lib.rs changes.
+    println!("cargo:rerun-if-changed=build.rs");
+
     let out_dir = env::var("OUT_DIR").unwrap();
     let dest_path = Path::new(&out_dir).join("count.rs");
     let mut f = File::create(&dest_path).unwrap();

From 3bc2adc4c78fa66e6d6310f13939473c7a86dea4 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sun, 7 Jun 2020 13:56:41 -0700
Subject: [PATCH 09/65] Release proc-macro-nested 0.1.5

---
 nested/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nested/Cargo.toml b/nested/Cargo.toml
index a6d323f..0d6bc81 100644
--- a/nested/Cargo.toml
+++ b/nested/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proc-macro-nested"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "Support for nested proc-macro-hack invocations"

From 3dd7561eace18fe63d9885b14342a6d773e00213 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 13 Jun 2020 18:14:32 -0700
Subject: [PATCH 10/65] Simplify build script using fs::write

---
 nested/build.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nested/build.rs b/nested/build.rs
index e08addc..d67e7ad 100644
--- a/nested/build.rs
+++ b/nested/build.rs
@@ -1,6 +1,5 @@
 use std::env;
-use std::fs::File;
-use std::io::Write;
+use std::fs;
 use std::iter;
 use std::path::Path;
 
@@ -21,7 +20,6 @@ fn main() {
 
     let out_dir = env::var("OUT_DIR").unwrap();
     let dest_path = Path::new(&out_dir).join("count.rs");
-    let mut f = File::create(&dest_path).unwrap();
 
     let mut content = String::new();
     content += "
@@ -40,5 +38,5 @@ fn main() {
         }
     ";
 
-    f.write_all(content.as_bytes()).unwrap();
+    fs::write(dest_path, content).unwrap();
 }

From 689af3233a66c9c17847775144e2c7f7c2e6a679 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 13 Jun 2020 18:15:29 -0700
Subject: [PATCH 11/65] Avoid bumping count.rs filetime if content is up to
 date

---
 nested/build.rs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/nested/build.rs b/nested/build.rs
index d67e7ad..c5a6fee 100644
--- a/nested/build.rs
+++ b/nested/build.rs
@@ -18,9 +18,6 @@ fn main() {
     // Tell Cargo not to rerun on src/lib.rs changes.
     println!("cargo:rerun-if-changed=build.rs");
 
-    let out_dir = env::var("OUT_DIR").unwrap();
-    let dest_path = Path::new(&out_dir).join("count.rs");
-
     let mut content = String::new();
     content += "
         #[doc(hidden)]
@@ -38,5 +35,16 @@ fn main() {
         }
     ";
 
-    fs::write(dest_path, content).unwrap();
+    let content = content.as_bytes();
+    let out_dir = env::var("OUT_DIR").unwrap();
+    let ref dest_path = Path::new(&out_dir).join("count.rs");
+
+    // Avoid bumping filetime if content is up to date. Possibly related to
+    // https://github.com/dtolnay/proc-macro-hack/issues/56 ...?
+    if fs::read(dest_path)
+        .map(|existing| existing != content)
+        .unwrap_or(true)
+    {
+        fs::write(dest_path, content).unwrap();
+    }
 }

From 6c89d167e3b07dc4df08e610f61b086ec6357647 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 13 Jun 2020 18:20:22 -0700
Subject: [PATCH 12/65] Generate formatted count.rs for easier examination

---
 nested/build.rs | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/nested/build.rs b/nested/build.rs
index c5a6fee..ef56f8e 100644
--- a/nested/build.rs
+++ b/nested/build.rs
@@ -19,21 +19,17 @@ fn main() {
     println!("cargo:rerun-if-changed=build.rs");
 
     let mut content = String::new();
-    content += "
-        #[doc(hidden)]
-        #[macro_export]
-        macro_rules! count {
-    ";
+    content += "#[doc(hidden)]\n";
+    content += "#[macro_export]\n";
+    content += "macro_rules! count {\n";
     for i in 0..=64 {
         let bangs = iter::repeat("!").take(i).collect::<String>();
-        content += &format!("({}) => {{ proc_macro_call_{}!() }};", bangs, i);
+        content += &format!("    ({}) => {{ proc_macro_call_{}!() }};\n", bangs, i);
     }
-    content += "
-            ($(!)+) => {
-                compile_error!(\"this macro does not support >64 nested macro invocations\")
-            };
-        }
-    ";
+    content += "    ($(!)+) => {\n";
+    content += "        compile_error! { \"this macro does not support >64 nested macro invocations\" }\n";
+    content += "    };\n";
+    content += "}\n";
 
     let content = content.as_bytes();
     let out_dir = env::var("OUT_DIR").unwrap();

From 8a3cec3cfc7b8417ef8cc2970f7de27ff2b6a023 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 13 Jun 2020 18:21:18 -0700
Subject: [PATCH 13/65] Release proc-macro-nested 0.1.6

---
 nested/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nested/Cargo.toml b/nested/Cargo.toml
index 0d6bc81..fd0fa99 100644
--- a/nested/Cargo.toml
+++ b/nested/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proc-macro-nested"
-version = "0.1.5"
+version = "0.1.6"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "Support for nested proc-macro-hack invocations"

From 9e08476044fc77b0ad10230481c1e0d0579dd98c Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sun, 14 Jun 2020 13:20:32 -0700
Subject: [PATCH 14/65] Add a sponsors link

---
 .github/FUNDING.yml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..7507077
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: dtolnay

From 6790ad4abcbf0539d0a09caa60fb97ea0a4be804 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 25 Jul 2020 16:26:15 -0700
Subject: [PATCH 15/65] Remove 'extern crate proc_macro' from example code

---
 .github/workflows/ci.yml  | 4 +++-
 README.md                 | 2 --
 demo-hack-impl/src/lib.rs | 2 --
 src/lib.rs                | 4 ++--
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fea412f..ca24eac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,11 +12,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, beta, stable, 1.31.0]
+        rust: [nightly, beta, stable, 1.42.0, 1.31.0]
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust}}
+      - if: matrix.rust == '1.31.0'
+        run: echo 'extern crate proc_macro;' >> demo-hack-impl/src/lib.rs
       - run: cargo run --manifest-path example/Cargo.toml
       - run: cargo test --all
diff --git a/README.md b/README.md
index 2ed1179..104ed7c 100644
--- a/README.md
+++ b/README.md
@@ -33,8 +33,6 @@ The function signature is the same as for ordinary function-like procedural
 macros.
 
 ```rust
-extern crate proc_macro;
-
 use proc_macro::TokenStream;
 use proc_macro_hack::proc_macro_hack;
 use quote::quote;
diff --git a/demo-hack-impl/src/lib.rs b/demo-hack-impl/src/lib.rs
index ecfed2c..8d0f4b0 100644
--- a/demo-hack-impl/src/lib.rs
+++ b/demo-hack-impl/src/lib.rs
@@ -1,5 +1,3 @@
-extern crate proc_macro;
-
 use proc_macro::TokenStream;
 use proc_macro_hack::proc_macro_hack;
 use quote::quote;
diff --git a/src/lib.rs b/src/lib.rs
index b6cde26..352e837 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -31,8 +31,8 @@
 //! macros.
 //!
 //! ```
-//! extern crate proc_macro;
-//!
+//! # extern crate proc_macro;
+//! #
 //! use proc_macro::TokenStream;
 //! use proc_macro_hack::proc_macro_hack;
 //! use quote::quote;

From a3b681b369f60a39de5c9f8f71a26f871a913510 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 25 Jul 2020 23:23:31 -0700
Subject: [PATCH 16/65] Note that 1.45 proc macros support expr position
 natively

---
 README.md  | 12 +++++++++---
 src/lib.rs |  8 +++++++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 104ed7c..df7a2ec 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,15 @@ Procedural macros in expression position
 [<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-proc--macro--hack-66c2a5?style=for-the-badge&labelColor=555555&logoColor=white&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDUxMiA1MTIiPjxwYXRoIGZpbGw9IiNmNWY1ZjUiIGQ9Ik00ODguNiAyNTAuMkwzOTIgMjE0VjEwNS41YzAtMTUtOS4zLTI4LjQtMjMuNC0zMy43bC0xMDAtMzcuNWMtOC4xLTMuMS0xNy4xLTMuMS0yNS4zIDBsLTEwMCAzNy41Yy0xNC4xIDUuMy0yMy40IDE4LjctMjMuNCAzMy43VjIxNGwtOTYuNiAzNi4yQzkuMyAyNTUuNSAwIDI2OC45IDAgMjgzLjlWMzk0YzAgMTMuNiA3LjcgMjYuMSAxOS45IDMyLjJsMTAwIDUwYzEwLjEgNS4xIDIyLjEgNS4xIDMyLjIgMGwxMDMuOS01MiAxMDMuOSA1MmMxMC4xIDUuMSAyMi4xIDUuMSAzMi4yIDBsMTAwLTUwYzEyLjItNi4xIDE5LjktMTguNiAxOS45LTMyLjJWMjgzLjljMC0xNS05LjMtMjguNC0yMy40LTMzLjd6TTM1OCAyMTQuOGwtODUgMzEuOXYtNjguMmw4NS0zN3Y3My4zek0xNTQgMTA0LjFsMTAyLTM4LjIgMTAyIDM4LjJ2LjZsLTEwMiA0MS40LTEwMi00MS40di0uNnptODQgMjkxLjFsLTg1IDQyLjV2LTc5LjFsODUtMzguOHY3NS40em0wLTExMmwtMTAyIDQxLjQtMTAyLTQxLjR2LS42bDEwMi0zOC4yIDEwMiAzOC4ydi42em0yNDAgMTEybC04NSA0Mi41di03OS4xbDg1LTM4Ljh2NzUuNHptMC0xMTJsLTEwMiA0MS40LTEwMi00MS40di0uNmwxMDItMzguMiAxMDIgMzguMnYuNnoiPjwvcGF0aD48L3N2Zz4K" height="20">](https://docs.rs/proc-macro-hack)
 [<img alt="build status" src="https://img.shields.io/github/workflow/status/dtolnay/proc-macro-hack/CI/master?style=for-the-badge" height="20">](https://github.com/dtolnay/proc-macro-hack/actions?query=branch%3Amaster)
 
-As of Rust 1.30, the language supports user-defined function-like procedural
-macros. However these can only be invoked in item position, not in
-statements or expressions.
+<table><tr><td><hr>
+<b>Note:</b> <i>As of Rust 1.45 this crate is superseded by native support for
+#[proc_macro] in expression position. Only consider using this crate if you care
+about supporting compilers between 1.31 and 1.45.</i>
+<hr></td></tr></table>
+
+Since Rust 1.30, the language supports user-defined function-like procedural
+macros. However these can only be invoked in item position, not in statements or
+expressions.
 
 This crate implements an alternative type of procedural macro that can be
 invoked in statement or expression position.
diff --git a/src/lib.rs b/src/lib.rs
index 352e837..901a719 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,7 +6,13 @@
 //!
 //! <br>
 //!
-//! As of Rust 1.30, the language supports user-defined function-like procedural
+//! <table><tr><td><hr>
+//! <b>Note:</b> <i>As of Rust 1.45 this crate is superseded by native support
+//! for #[proc_macro] in expression position. Only consider using this crate if
+//! you care about supporting compilers between 1.31 and 1.45.</i>
+//! <hr></td></tr></table>
+//!
+//! Since Rust 1.30, the language supports user-defined function-like procedural
 //! macros. However these can only be invoked in item position, not in
 //! statements or expressions.
 //!

From 3da1be8f9519c725b1f425a954b06a1a0a8b25ac Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 25 Jul 2020 23:37:42 -0700
Subject: [PATCH 17/65] Release 0.5.18

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 4eabee2..153d880 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proc-macro-hack"
-version = "0.5.17"
+version = "0.5.18"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

From 9e68d2484577fd39c860f129118094fc49469a19 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 14:45:25 -0700
Subject: [PATCH 18/65] Wrap long line in proc-macro-nested build script

---
 nested/build.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nested/build.rs b/nested/build.rs
index ef56f8e..d451b74 100644
--- a/nested/build.rs
+++ b/nested/build.rs
@@ -27,7 +27,9 @@ fn main() {
         content += &format!("    ({}) => {{ proc_macro_call_{}!() }};\n", bangs, i);
     }
     content += "    ($(!)+) => {\n";
-    content += "        compile_error! { \"this macro does not support >64 nested macro invocations\" }\n";
+    content += "        compile_error! {\n";
+    content += "            \"this macro does not support >64 nested macro invocations\"\n";
+    content += "        }\n";
     content += "    };\n";
     content += "}\n";
 

From eadb0254626ab853e2e1176a7648c8c3795bfeb9 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 14:51:49 -0700
Subject: [PATCH 19/65] Format with rustfmt 2.0.0-rc.2

---
 src/parse.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/parse.rs b/src/parse.rs
index de7c599..5539dea 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -189,7 +189,7 @@ pub(crate) fn parse_export_args(tokens: Iter) -> Result<ExportArgs, Error> {
                 return Err(Error::new(
                     tt.span(),
                     "expected one of: `support_nested`, `internal_macro_calls`, `fake_call_site`",
-                ))
+                ));
             }
         }
         if tokens.peek().is_none() {

From c73e24d509c41647248532cfd86cf7337d46bb66 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 14:39:01 -0700
Subject: [PATCH 20/65] Add ui test of unexpected args on macro definition

---
 tests/ui/unexpected-arg.rs     | 8 ++++++++
 tests/ui/unexpected-arg.stderr | 7 +++++++
 2 files changed, 15 insertions(+)
 create mode 100644 tests/ui/unexpected-arg.rs
 create mode 100644 tests/ui/unexpected-arg.stderr

diff --git a/tests/ui/unexpected-arg.rs b/tests/ui/unexpected-arg.rs
new file mode 100644
index 0000000..376fc0d
--- /dev/null
+++ b/tests/ui/unexpected-arg.rs
@@ -0,0 +1,8 @@
+use proc_macro_hack::proc_macro_hack;
+
+#[proc_macro_hack(fake_call_site)]
+pub fn my_macro(input: TokenStream) -> TokenStream {
+    unimplemented!()
+}
+
+fn main() {}
diff --git a/tests/ui/unexpected-arg.stderr b/tests/ui/unexpected-arg.stderr
new file mode 100644
index 0000000..785b0c4
--- /dev/null
+++ b/tests/ui/unexpected-arg.stderr
@@ -0,0 +1,7 @@
+error: unexpected input
+ --> $DIR/unexpected-arg.rs:3:1
+  |
+3 | #[proc_macro_hack(fake_call_site)]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+  |
+  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)

From dc246ed5d3dc8b9bf152c851f6aa680886121a86 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 14:40:58 -0700
Subject: [PATCH 21/65] Improve unexpected argument error

---
 src/parse.rs                   | 10 ++++++----
 tests/ui/unexpected-arg.stderr |  8 +++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/parse.rs b/src/parse.rs
index 5539dea..7d98a43 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -202,10 +202,12 @@ pub(crate) fn parse_export_args(tokens: Iter) -> Result<ExportArgs, Error> {
 }
 
 pub(crate) fn parse_define_args(tokens: Iter) -> Result<(), Error> {
-    if tokens.peek().is_none() {
-        Ok(())
-    } else {
-        Err(Error::new(Span::call_site(), "unexpected input"))
+    match tokens.peek() {
+        None => Ok(()),
+        Some(token) => Err(Error::new(
+            token.span(),
+            "unexpected argument to proc_macro_hack macro implementation; args are only accepted on the macro declaration (the `pub use`)",
+        )),
     }
 }
 
diff --git a/tests/ui/unexpected-arg.stderr b/tests/ui/unexpected-arg.stderr
index 785b0c4..6895e82 100644
--- a/tests/ui/unexpected-arg.stderr
+++ b/tests/ui/unexpected-arg.stderr
@@ -1,7 +1,5 @@
-error: unexpected input
- --> $DIR/unexpected-arg.rs:3:1
+error: unexpected argument to proc_macro_hack macro implementation; args are only accepted on the macro declaration (the `pub use`)
+ --> $DIR/unexpected-arg.rs:3:19
   |
 3 | #[proc_macro_hack(fake_call_site)]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-  |
-  = note: this error originates in an attribute macro (in Nightly builds, run with -Z macro-backtrace for more info)
+  |                   ^^^^^^^^^^^^^^

From 0ba7439fb540608cb0b9e0ee95d992c51c5ca1b1 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 16:08:03 -0700
Subject: [PATCH 22/65] Avoid having to recreate a new pub token

---
 src/lib.rs   | 4 ++--
 src/parse.rs | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 901a719..6ce1b1f 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -156,7 +156,7 @@ use crate::parse::{
 use proc_macro::{Ident, Punct, Spacing, Span, TokenStream, TokenTree};
 use std::fmt::Write;
 
-type Visibility = Option<Span>;
+type Visibility = Option<Ident>;
 
 enum Input {
     Export(Export),
@@ -250,7 +250,7 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
     let dummy = dummy_name_for_export(&export);
 
     let attrs = export.attrs;
-    let ref vis = export.vis.map(|span| Ident::new("pub", span));
+    let vis = export.vis;
     let macro_export = match vis {
         Some(_) => quote!(#[macro_export]),
         None => quote!(),
diff --git a/src/parse.rs b/src/parse.rs
index 7d98a43..de51fd2 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -139,7 +139,10 @@ fn parse_group(tokens: Iter, delimiter: Delimiter) -> Result<IterImpl, Error> {
 fn parse_visibility(tokens: Iter) -> Result<Visibility, Error> {
     if let Some(TokenTree::Ident(ident)) = tokens.peek() {
         if ident.to_string() == "pub" {
-            return Ok(Some(tokens.next().unwrap().span()));
+            match tokens.next().unwrap() {
+                TokenTree::Ident(vis) => return Ok(Some(vis)),
+                _ => unreachable!(),
+            }
         }
     }
     Ok(None)

From c194c0b2c873eb6f6f6cfa4ec3d77936a6e536c7 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 16:21:21 -0700
Subject: [PATCH 23/65] Clarify that 'actual name' is the pub macro in
 implementation crate

---
 src/lib.rs | 72 +++++++++++++++++++++++++++---------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 6ce1b1f..0231fdb 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -273,14 +273,14 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
     let mut export_call_site = TokenStream::new();
     let mut macro_rules = TokenStream::new();
     for Macro { name, export_as } in &export.macros {
-        let actual_name = actual_proc_macro_name(&name);
+        let pub_name = pub_proc_macro_name(&name);
         let dispatch = dispatch_macro_name(&name);
         let call_site = call_site_macro_name(&name);
 
         if !actual_names.is_empty() {
             actual_names.extend(quote!(,));
         }
-        actual_names.extend(quote!(#actual_name));
+        actual_names.extend(quote!(#pub_name));
 
         if !export_dispatch.is_empty() {
             export_dispatch.extend(quote!(,));
@@ -294,18 +294,18 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
 
         let do_derive = if !args.fake_call_site {
             quote! {
-                #[derive(#crate_prefix #actual_name)]
+                #[derive(#crate_prefix #pub_name)]
             }
         } else if crate_prefix.is_some() {
             quote! {
-                use #crate_prefix #actual_name;
+                use #crate_prefix #pub_name;
                 #[#crate_prefix #call_site ($($proc_macro)*)]
-                #[derive(#actual_name)]
+                #[derive(#pub_name)]
             }
         } else {
             quote! {
                 #[#call_site ($($proc_macro)*)]
-                #[derive(#actual_name)]
+                #[derive(#pub_name)]
             }
         };
 
@@ -378,18 +378,18 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
 fn expand_define(define: Define) -> TokenStream {
     let attrs = define.attrs;
     let name = define.name;
-    let dummy = actual_proc_macro_name(&name);
+    let pub_name = pub_proc_macro_name(&name);
     let body = define.body;
 
     quote! {
-        mod #dummy {
+        mod #pub_name {
             extern crate proc_macro;
             pub use self::proc_macro::*;
         }
 
         #attrs
-        #[proc_macro_derive(#dummy)]
-        pub fn #dummy(input: #dummy::TokenStream) -> #dummy::TokenStream {
+        #[proc_macro_derive(#pub_name)]
+        pub fn #pub_name(input: #pub_name::TokenStream) -> #pub_name::TokenStream {
             use std::iter::FromIterator;
 
             let mut iter = input.into_iter();
@@ -399,7 +399,7 @@ fn expand_define(define: Define) -> TokenStream {
             iter.next().unwrap(); // `[allow(dead_code)]`
 
             let mut braces = match iter.next().unwrap() {
-                #dummy::TokenTree::Group(group) => group.stream().into_iter(),
+                #pub_name::TokenTree::Group(group) => group.stream().into_iter(),
                 _ => unimplemented!(),
             };
             let variant = braces.next().unwrap(); // `Value` or `Nested`
@@ -408,29 +408,29 @@ fn expand_define(define: Define) -> TokenStream {
             braces.next().unwrap(); // `=`
 
             let mut parens = match braces.next().unwrap() {
-                #dummy::TokenTree::Group(group) => group.stream().into_iter(),
+                #pub_name::TokenTree::Group(group) => group.stream().into_iter(),
                 _ => unimplemented!(),
             };
             parens.next().unwrap(); // `stringify`
             parens.next().unwrap(); // `!`
 
             let inner = match parens.next().unwrap() {
-                #dummy::TokenTree::Group(group) => group.stream(),
+                #pub_name::TokenTree::Group(group) => group.stream(),
                 _ => unimplemented!(),
             };
 
-            let output: #dummy::TokenStream = #name(inner.clone());
+            let output: #pub_name::TokenStream = #name(inner.clone());
 
-            fn count_bangs(input: #dummy::TokenStream) -> usize {
+            fn count_bangs(input: #pub_name::TokenStream) -> usize {
                 let mut count = 0;
                 for token in input {
                     match token {
-                        #dummy::TokenTree::Punct(punct) => {
+                        #pub_name::TokenTree::Punct(punct) => {
                             if punct.as_char() == '!' {
                                 count += 1;
                             }
                         }
-                        #dummy::TokenTree::Group(group) => {
+                        #pub_name::TokenTree::Group(group) => {
                             count += count_bangs(group.stream());
                         }
                         _ => {}
@@ -442,15 +442,15 @@ fn expand_define(define: Define) -> TokenStream {
             // macro_rules! proc_macro_call {
             //     () => { #output }
             // }
-            #dummy::TokenStream::from_iter(vec![
-                #dummy::TokenTree::Ident(
-                    #dummy::Ident::new("macro_rules", #dummy::Span::call_site()),
+            #pub_name::TokenStream::from_iter(vec![
+                #pub_name::TokenTree::Ident(
+                    #pub_name::Ident::new("macro_rules", #pub_name::Span::call_site()),
                 ),
-                #dummy::TokenTree::Punct(
-                    #dummy::Punct::new('!', #dummy::Spacing::Alone),
+                #pub_name::TokenTree::Punct(
+                    #pub_name::Punct::new('!', #pub_name::Spacing::Alone),
                 ),
-                #dummy::TokenTree::Ident(
-                    #dummy::Ident::new(
+                #pub_name::TokenTree::Ident(
+                    #pub_name::Ident::new(
                         &if support_nested {
                             let extra_bangs = if varname == "Nested" {
                                 0
@@ -461,22 +461,22 @@ fn expand_define(define: Define) -> TokenStream {
                         } else {
                             String::from("proc_macro_call")
                         },
-                        #dummy::Span::call_site(),
+                        #pub_name::Span::call_site(),
                     ),
                 ),
-                #dummy::TokenTree::Group(
-                    #dummy::Group::new(#dummy::Delimiter::Brace, #dummy::TokenStream::from_iter(vec![
-                        #dummy::TokenTree::Group(
-                            #dummy::Group::new(#dummy::Delimiter::Parenthesis, #dummy::TokenStream::new()),
+                #pub_name::TokenTree::Group(
+                    #pub_name::Group::new(#pub_name::Delimiter::Brace, #pub_name::TokenStream::from_iter(vec![
+                        #pub_name::TokenTree::Group(
+                            #pub_name::Group::new(#pub_name::Delimiter::Parenthesis, #pub_name::TokenStream::new()),
                         ),
-                        #dummy::TokenTree::Punct(
-                            #dummy::Punct::new('=', #dummy::Spacing::Joint),
+                        #pub_name::TokenTree::Punct(
+                            #pub_name::Punct::new('=', #pub_name::Spacing::Joint),
                         ),
-                        #dummy::TokenTree::Punct(
-                            #dummy::Punct::new('>', #dummy::Spacing::Alone),
+                        #pub_name::TokenTree::Punct(
+                            #pub_name::Punct::new('>', #pub_name::Spacing::Alone),
                         ),
-                        #dummy::TokenTree::Group(
-                            #dummy::Group::new(#dummy::Delimiter::Brace, output),
+                        #pub_name::TokenTree::Group(
+                            #pub_name::Group::new(#pub_name::Delimiter::Brace, output),
                         ),
                     ])),
                 ),
@@ -487,7 +487,7 @@ fn expand_define(define: Define) -> TokenStream {
     }
 }
 
-fn actual_proc_macro_name(conceptual: &Ident) -> Ident {
+fn pub_proc_macro_name(conceptual: &Ident) -> Ident {
     Ident::new(
         &format!("proc_macro_hack_{}", conceptual),
         conceptual.span(),

From 5cc836b52081d8cf89e3eaddda658b250c1b7f39 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 14:56:50 -0700
Subject: [PATCH 24/65] Parse only_hack_old_rustc arg

---
 src/lib.rs                  | 1 +
 src/parse.rs                | 6 +++++-
 tests/ui/unknown-arg.stderr | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 0231fdb..d3ab533 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -244,6 +244,7 @@ struct ExportArgs {
     support_nested: bool,
     internal_macro_calls: u16,
     fake_call_site: bool,
+    only_hack_old_rustc: bool,
 }
 
 fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
diff --git a/src/parse.rs b/src/parse.rs
index de51fd2..fe074f1 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -171,6 +171,7 @@ pub(crate) fn parse_export_args(tokens: Iter) -> Result<ExportArgs, Error> {
         support_nested: false,
         internal_macro_calls: 0,
         fake_call_site: false,
+        only_hack_old_rustc: false,
     };
 
     while let Some(tt) = tokens.next() {
@@ -188,10 +189,13 @@ pub(crate) fn parse_export_args(tokens: Iter) -> Result<ExportArgs, Error> {
             TokenTree::Ident(ident) if ident.to_string() == "fake_call_site" => {
                 args.fake_call_site = true;
             }
+            TokenTree::Ident(ident) if ident.to_string() == "only_hack_old_rustc" => {
+                args.only_hack_old_rustc = true;
+            }
             _ => {
                 return Err(Error::new(
                     tt.span(),
-                    "expected one of: `support_nested`, `internal_macro_calls`, `fake_call_site`",
+                    "expected one of: `support_nested`, `internal_macro_calls`, `fake_call_site`, `only_hack_old_rustc`",
                 ));
             }
         }
diff --git a/tests/ui/unknown-arg.stderr b/tests/ui/unknown-arg.stderr
index d3cd8c9..ffe3705 100644
--- a/tests/ui/unknown-arg.stderr
+++ b/tests/ui/unknown-arg.stderr
@@ -1,4 +1,4 @@
-error: expected one of: `support_nested`, `internal_macro_calls`, `fake_call_site`
+error: expected one of: `support_nested`, `internal_macro_calls`, `fake_call_site`, `only_hack_old_rustc`
  --> $DIR/unknown-arg.rs:3:35
   |
 3 | #[proc_macro_hack(fake_call_site, support_nexted)]

From 26dc7014116498c4bd6fa1b14a737c376f0fc002 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 26 Oct 2020 13:13:49 -0700
Subject: [PATCH 25/65] Detect rustc support for native proc macro

---
 build.rs | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 build.rs

diff --git a/build.rs b/build.rs
new file mode 100644
index 0000000..6ab4098
--- /dev/null
+++ b/build.rs
@@ -0,0 +1,31 @@
+use std::env;
+use std::process::Command;
+use std::str;
+
+// The rustc-cfg strings below are *not* public API. Please let us know by
+// opening a GitHub issue if your build environment requires some way to enable
+// these cfgs other than by executing our build script.
+fn main() {
+    let minor = match rustc_minor_version() {
+        Some(minor) => minor,
+        None => return,
+    };
+
+    // Function-like procedural macros in expressions, patterns, and statements
+    // stabilized in Rust 1.45:
+    // https://blog.rust-lang.org/2020/07/16/Rust-1.45.0.html#stabilizing-function-like-procedural-macros-in-expressions-patterns-and-statements
+    if minor < 45 {
+        println!("cargo:rustc-cfg=need_proc_macro_hack");
+    }
+}
+
+fn rustc_minor_version() -> Option<u32> {
+    let rustc = env::var_os("RUSTC")?;
+    let output = Command::new(rustc).arg("--version").output().ok()?;
+    let version = str::from_utf8(&output.stdout).ok()?;
+    let mut pieces = version.split('.');
+    if pieces.next() != Some("rustc 1") {
+        return None;
+    }
+    pieces.next()?.parse().ok()
+}

From 11e5ad645844ea107ae36e6ba38ec34b661f5790 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 15:54:18 -0700
Subject: [PATCH 26/65] Also export the unmodified proc macro behavior

---
 src/lib.rs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index d3ab533..ef71809 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -380,6 +380,7 @@ fn expand_define(define: Define) -> TokenStream {
     let attrs = define.attrs;
     let name = define.name;
     let pub_name = pub_proc_macro_name(&name);
+    let nohack = original_proc_macro_name(&name);
     let body = define.body;
 
     quote! {
@@ -484,6 +485,13 @@ fn expand_define(define: Define) -> TokenStream {
             ])
         }
 
+        #attrs
+        #[doc(hidden)]
+        #[proc_macro]
+        pub fn #nohack(input: #pub_name::TokenStream) -> #pub_name::TokenStream {
+            #name(input)
+        }
+
         fn #name #body
     }
 }
@@ -495,6 +503,13 @@ fn pub_proc_macro_name(conceptual: &Ident) -> Ident {
     )
 }
 
+fn original_proc_macro_name(conceptual: &Ident) -> Ident {
+    Ident::new(
+        &format!("proc_macro_nohack_{}", conceptual),
+        conceptual.span(),
+    )
+}
+
 fn dispatch_macro_name(conceptual: &Ident) -> Ident {
     Ident::new(
         &format!("proc_macro_call_{}", conceptual),

From f6407e0f92fc5ce75dba85104b88c28dcc3a5599 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 16:31:47 -0700
Subject: [PATCH 27/65] Switch public name to the one that new rustc can
 re-export directly

---
 src/lib.rs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index ef71809..27c914c 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -274,14 +274,14 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
     let mut export_call_site = TokenStream::new();
     let mut macro_rules = TokenStream::new();
     for Macro { name, export_as } in &export.macros {
-        let pub_name = pub_proc_macro_name(&name);
+        let hacked = hacked_proc_macro_name(&name);
         let dispatch = dispatch_macro_name(&name);
         let call_site = call_site_macro_name(&name);
 
         if !actual_names.is_empty() {
             actual_names.extend(quote!(,));
         }
-        actual_names.extend(quote!(#pub_name));
+        actual_names.extend(quote!(#hacked));
 
         if !export_dispatch.is_empty() {
             export_dispatch.extend(quote!(,));
@@ -295,18 +295,18 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
 
         let do_derive = if !args.fake_call_site {
             quote! {
-                #[derive(#crate_prefix #pub_name)]
+                #[derive(#crate_prefix #hacked)]
             }
         } else if crate_prefix.is_some() {
             quote! {
-                use #crate_prefix #pub_name;
+                use #crate_prefix #hacked;
                 #[#crate_prefix #call_site ($($proc_macro)*)]
-                #[derive(#pub_name)]
+                #[derive(#hacked)]
             }
         } else {
             quote! {
                 #[#call_site ($($proc_macro)*)]
-                #[derive(#pub_name)]
+                #[derive(#hacked)]
             }
         };
 
@@ -380,7 +380,7 @@ fn expand_define(define: Define) -> TokenStream {
     let attrs = define.attrs;
     let name = define.name;
     let pub_name = pub_proc_macro_name(&name);
-    let nohack = original_proc_macro_name(&name);
+    let hacked = hacked_proc_macro_name(&name);
     let body = define.body;
 
     quote! {
@@ -390,8 +390,9 @@ fn expand_define(define: Define) -> TokenStream {
         }
 
         #attrs
-        #[proc_macro_derive(#pub_name)]
-        pub fn #pub_name(input: #pub_name::TokenStream) -> #pub_name::TokenStream {
+        #[doc(hidden)]
+        #[proc_macro_derive(#hacked)]
+        pub fn #hacked(input: #pub_name::TokenStream) -> #pub_name::TokenStream {
             use std::iter::FromIterator;
 
             let mut iter = input.into_iter();
@@ -486,9 +487,8 @@ fn expand_define(define: Define) -> TokenStream {
         }
 
         #attrs
-        #[doc(hidden)]
         #[proc_macro]
-        pub fn #nohack(input: #pub_name::TokenStream) -> #pub_name::TokenStream {
+        pub fn #pub_name(input: #pub_name::TokenStream) -> #pub_name::TokenStream {
             #name(input)
         }
 
@@ -503,9 +503,9 @@ fn pub_proc_macro_name(conceptual: &Ident) -> Ident {
     )
 }
 
-fn original_proc_macro_name(conceptual: &Ident) -> Ident {
+fn hacked_proc_macro_name(conceptual: &Ident) -> Ident {
     Ident::new(
-        &format!("proc_macro_nohack_{}", conceptual),
+        &format!("_proc_macro_hack_{}", conceptual),
         conceptual.span(),
     )
 }

From a6107565dc80e90040a5f133603fa4a14caf4a93 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 16:05:49 -0700
Subject: [PATCH 28/65] Expand to direct re-export on new rustc if
 only_hack_old_rustc

---
 src/lib.rs | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/src/lib.rs b/src/lib.rs
index 27c914c..2a06815 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -248,6 +248,10 @@ struct ExportArgs {
 }
 
 fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
+    if args.only_hack_old_rustc && cfg!(not(need_proc_macro_hack)) {
+        return expand_export_nohack(export);
+    }
+
     let dummy = dummy_name_for_export(&export);
 
     let attrs = export.attrs;
@@ -376,6 +380,30 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
     wrap_in_enum_hack(dummy, expanded)
 }
 
+fn expand_export_nohack(export: Export) -> TokenStream {
+    let attrs = export.attrs;
+    let vis = export.vis;
+    let from = export.from;
+    let mut names = TokenStream::new();
+
+    for Macro { name, export_as } in &export.macros {
+        let pub_name = pub_proc_macro_name(&name);
+        if !names.is_empty() {
+            names.extend(quote!(,));
+        }
+        names.extend(quote!(#pub_name as #export_as));
+    }
+
+    if export.macros.len() != 1 {
+        names = quote!({#names});
+    }
+
+    quote! {
+        #attrs
+        #vis use #from::#names;
+    }
+}
+
 fn expand_define(define: Define) -> TokenStream {
     let attrs = define.attrs;
     let name = define.name;

From a991a7eca28f2730384173b9b18bfd87496a7f64 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 16:38:36 -0700
Subject: [PATCH 29/65] Add CI coverage of only_hack_old_rustc

---
 .github/workflows/ci.yml | 2 +-
 demo-hack/src/lib.rs     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ca24eac..c4d0fa9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, beta, stable, 1.42.0, 1.31.0]
+        rust: [nightly, beta, stable, 1.45.0, 1.42.0, 1.31.0]
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@master
diff --git a/demo-hack/src/lib.rs b/demo-hack/src/lib.rs
index 0eebdc9..f37c8f9 100644
--- a/demo-hack/src/lib.rs
+++ b/demo-hack/src/lib.rs
@@ -3,5 +3,5 @@ use proc_macro_hack::proc_macro_hack;
 /// Add one to an expression.
 ///
 /// (Documentation goes here on the re-export, not in the other crate.)
-#[proc_macro_hack]
+#[proc_macro_hack(only_hack_old_rustc)]
 pub use demo_hack_impl::add_one;

From d686d312d85a1cb041fc2615fd512f59a6b40415 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 16:46:42 -0700
Subject: [PATCH 30/65] Document only_hack_old_rustc

---
 README.md  | 7 +++++++
 src/lib.rs | 8 ++++++++
 2 files changed, 15 insertions(+)

diff --git a/README.md b/README.md
index df7a2ec..c734710 100644
--- a/README.md
+++ b/README.md
@@ -126,6 +126,13 @@ fn main() {
   macro input, use `#[proc_macro_hack(fake_call_site)]` on the re-export in your
   declaration crate. *Most macros won't need this.*
 
+- On compilers that are new enough to natively support proc macros in expression
+  position, proc-macro-hack does not automatically use that support, since the
+  hygiene can be subtly different between the two implementations. To opt in to
+  compiling your macro to native `#[proc_macro]` on sufficiently new compilers,
+  use `#[proc_macro_hack(only_hack_old_rustc)]` on the re-export in your
+  declaration crate.
+
 [#10]: https://github.com/dtolnay/proc-macro-hack/issues/10
 [#20]: https://github.com/dtolnay/proc-macro-hack/issues/20
 [`proc-macro-nested`]: https://docs.rs/proc-macro-nested
diff --git a/src/lib.rs b/src/lib.rs
index 2a06815..90b04fd 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -132,6 +132,14 @@
 //!   in the macro input, use `#[proc_macro_hack(fake_call_site)]` on the
 //!   re-export in your declaration crate. *Most macros won't need this.*
 //!
+//! - On compilers that are new enough to natively support proc macros in
+//!   expression position, proc-macro-hack does not automatically use that
+//!   support, since the hygiene can be subtly different between the two
+//!   implementations. To opt in to compiling your macro to native
+//!   `#[proc_macro]` on sufficiently new compilers, use
+//!   `#[proc_macro_hack(only_hack_old_rustc)]` on the re-export in your
+//!   declaration crate.
+//!
 //! [#10]: https://github.com/dtolnay/proc-macro-hack/issues/10
 //! [#20]: https://github.com/dtolnay/proc-macro-hack/issues/20
 //! [`proc-macro-nested`]: https://docs.rs/proc-macro-nested

From 758784bb05c3d68569ca5001972fe5c31b8175c5 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Tue, 27 Oct 2020 17:02:02 -0700
Subject: [PATCH 31/65] Release 0.5.19

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 153d880..61150b4 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proc-macro-hack"
-version = "0.5.18"
+version = "0.5.19"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

From ba711b02d6f78fc29e10011b2d34b0f464237b1f Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Thu, 31 Dec 2020 00:45:09 -0800
Subject: [PATCH 32/65] Run clippy linter in CI

---
 .github/workflows/ci.yml | 8 ++++++++
 src/lib.rs               | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c4d0fa9..33d7352 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,3 +22,11 @@ jobs:
         run: echo 'extern crate proc_macro;' >> demo-hack-impl/src/lib.rs
       - run: cargo run --manifest-path example/Cargo.toml
       - run: cargo test --all
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: dtolnay/rust-toolchain@clippy
+      - run: cargo clippy --tests -- -Dclippy::all
diff --git a/src/lib.rs b/src/lib.rs
index 90b04fd..8f20c14 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -145,7 +145,12 @@
 //! [`proc-macro-nested`]: https://docs.rs/proc-macro-nested
 
 #![recursion_limit = "512"]
-#![allow(clippy::needless_doctest_main, clippy::toplevel_ref_arg)]
+#![allow(
+    clippy::manual_strip,
+    clippy::needless_doctest_main,
+    clippy::toplevel_ref_arg,
+    clippy::unnecessary_wraps
+)]
 
 extern crate proc_macro;
 

From f4ccf0e4e50de4c63d6aa0fdcd3df8d46e27a0be Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Thu, 31 Dec 2020 00:46:41 -0800
Subject: [PATCH 33/65] Resolve unnecessary_wraps clippy lint

---
 src/lib.rs   | 3 +--
 src/parse.rs | 8 ++++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 8f20c14..652fb85 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -148,8 +148,7 @@
 #![allow(
     clippy::manual_strip,
     clippy::needless_doctest_main,
-    clippy::toplevel_ref_arg,
-    clippy::unnecessary_wraps
+    clippy::toplevel_ref_arg
 )]
 
 extern crate proc_macro;
diff --git a/src/parse.rs b/src/parse.rs
index fe074f1..f9c3b80 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -5,7 +5,7 @@ use proc_macro::{Delimiter, Ident, Span, TokenStream, TokenTree};
 
 pub(crate) fn parse_input(tokens: Iter) -> Result<Input, Error> {
     let attrs = parse_attributes(tokens)?;
-    let vis = parse_visibility(tokens)?;
+    let vis = parse_visibility(tokens);
     let kw = parse_ident(tokens)?;
     if kw.to_string() == "use" {
         parse_export(attrs, vis, tokens).map(Input::Export)
@@ -136,16 +136,16 @@ fn parse_group(tokens: Iter, delimiter: Delimiter) -> Result<IterImpl, Error> {
     }
 }
 
-fn parse_visibility(tokens: Iter) -> Result<Visibility, Error> {
+fn parse_visibility(tokens: Iter) -> Visibility {
     if let Some(TokenTree::Ident(ident)) = tokens.peek() {
         if ident.to_string() == "pub" {
             match tokens.next().unwrap() {
-                TokenTree::Ident(vis) => return Ok(Some(vis)),
+                TokenTree::Ident(vis) => return Some(vis),
                 _ => unreachable!(),
             }
         }
     }
-    Ok(None)
+    None
 }
 
 fn parse_attributes(tokens: Iter) -> Result<TokenStream, Error> {

From 10bb830de3ef7f8315514979d2cb789970c97b36 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Thu, 31 Dec 2020 00:47:24 -0800
Subject: [PATCH 34/65] Opt in to pedantic clippy lints

---
 .github/workflows/ci.yml | 2 +-
 src/lib.rs               | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 33d7352..9720ea8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,4 +29,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@clippy
-      - run: cargo clippy --tests -- -Dclippy::all
+      - run: cargo clippy --tests -- -Dclippy::pedantic
diff --git a/src/lib.rs b/src/lib.rs
index 652fb85..17391e5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -146,8 +146,12 @@
 
 #![recursion_limit = "512"]
 #![allow(
+    clippy::doc_markdown,
     clippy::manual_strip,
+    clippy::module_name_repetitions,
     clippy::needless_doctest_main,
+    clippy::needless_pass_by_value,
+    clippy::too_many_lines,
     clippy::toplevel_ref_arg
 )]
 

From c01123bdf7811705a3d2d1f589123f034a9b229a Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Thu, 31 Dec 2020 00:47:40 -0800
Subject: [PATCH 35/65] Inform clippy of supported compiler version in
 clippy.toml

---
 .clippy.toml | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 .clippy.toml

diff --git a/.clippy.toml b/.clippy.toml
new file mode 100644
index 0000000..3d30690
--- /dev/null
+++ b/.clippy.toml
@@ -0,0 +1 @@
+msrv = "1.31.0"

From bccfc64736fa0676db38f3d577489509f748c521 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 4 Jan 2021 23:49:04 -0800
Subject: [PATCH 36/65] Fix catching clippy warnings as CI failures

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9720ea8..55a562f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,4 +29,4 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@clippy
-      - run: cargo clippy --tests -- -Dclippy::pedantic
+      - run: cargo clippy --tests -- -Dclippy::all -Dclippy::pedantic

From 89bdd2641429e739168eb0e68d8ef3cadd96064b Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Wed, 13 Jan 2021 11:42:12 -0800
Subject: [PATCH 37/65] Add windows builder in CI

---
 .github/workflows/ci.yml | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 55a562f..54e6973 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -7,12 +7,17 @@ on:
 
 jobs:
   test:
-    name: Rust ${{matrix.rust}}
-    runs-on: ubuntu-latest
+    name: ${{matrix.name || format('Rust {0}', matrix.rust)}}
+    runs-on: ${{matrix.os || 'ubuntu'}}-latest
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, beta, stable, 1.45.0, 1.42.0, 1.31.0]
+        rust: [beta, stable, 1.45.0, 1.42.0, 1.31.0]
+        include:
+          - rust: nightly
+          - rust: nightly
+            name: Windows
+            os: windows
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@master

From fe92ebc8d9867ee2e4595e0252991b0cd28e7f6a Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Wed, 13 Jan 2021 13:55:19 -0800
Subject: [PATCH 38/65] Work around UNC path join

---
 nested/build.rs   | 4 +++-
 nested/src/lib.rs | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nested/build.rs b/nested/build.rs
index d451b74..01dbc0d 100644
--- a/nested/build.rs
+++ b/nested/build.rs
@@ -1,7 +1,7 @@
 use std::env;
 use std::fs;
 use std::iter;
-use std::path::Path;
+use std::path::{self, Path};
 
 /*
 #[doc(hidden)]
@@ -45,4 +45,6 @@ fn main() {
     {
         fs::write(dest_path, content).unwrap();
     }
+
+    println!("cargo:rustc-env=PATH_SEPARATOR={}", path::MAIN_SEPARATOR);
 }
diff --git a/nested/src/lib.rs b/nested/src/lib.rs
index 0cd8302..0a8a675 100644
--- a/nested/src/lib.rs
+++ b/nested/src/lib.rs
@@ -40,7 +40,7 @@
 
 #![no_std]
 
-include!(concat!(env!("OUT_DIR"), "/count.rs"));
+include!(concat!(env!("OUT_DIR"), env!("PATH_SEPARATOR"), "count.rs"));
 
 #[doc(hidden)]
 #[macro_export]

From 0d6c7a078176d77e3fc8911c00bf4bb06d3ba9bd Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Wed, 13 Jan 2021 14:18:53 -0800
Subject: [PATCH 39/65] Release proc-macro-nested 0.1.7

---
 nested/Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nested/Cargo.toml b/nested/Cargo.toml
index fd0fa99..aa306db 100644
--- a/nested/Cargo.toml
+++ b/nested/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proc-macro-nested"
-version = "0.1.6"
+version = "0.1.7"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 license = "MIT OR Apache-2.0"
 description = "Support for nested proc-macro-hack invocations"

From dc9bbc40689fa5af8c852048e424a224efa76110 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Thu, 18 Feb 2021 19:28:19 -0800
Subject: [PATCH 40/65] Ignore let_underscore_drop pedantic clippy lint

---
 src/lib.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/lib.rs b/src/lib.rs
index 17391e5..671231e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -147,6 +147,7 @@
 #![recursion_limit = "512"]
 #![allow(
     clippy::doc_markdown,
+    clippy::let_underscore_drop,
     clippy::manual_strip,
     clippy::module_name_repetitions,
     clippy::needless_doctest_main,

From d8069c65eb546c63730ca73217ab0800c8b52581 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Fri, 4 Jun 2021 20:28:10 -0700
Subject: [PATCH 41/65] Resolve needless_borrow clippy lints

    error: this expression borrows a reference (`&proc_macro::Ident`) that is immediately dereferenced by the compiler
       --> src/lib.rs:298:45
        |
    298 |         let hacked = hacked_proc_macro_name(&name);
        |                                             ^^^^^ help: change this to: `name`
        |
        = note: `-D clippy::needless-borrow` implied by `-D clippy::all`
        = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow

    error: this expression borrows a reference (`&proc_macro::Ident`) that is immediately dereferenced by the compiler
       --> src/lib.rs:299:44
        |
    299 |         let dispatch = dispatch_macro_name(&name);
        |                                            ^^^^^ help: change this to: `name`
        |
        = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow

    error: this expression borrows a reference (`&proc_macro::Ident`) that is immediately dereferenced by the compiler
       --> src/lib.rs:300:46
        |
    300 |         let call_site = call_site_macro_name(&name);
        |                                              ^^^^^ help: change this to: `name`
        |
        = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow

    error: this expression borrows a reference (`&proc_macro::Ident`) that is immediately dereferenced by the compiler
       --> src/lib.rs:407:44
        |
    407 |         let pub_name = pub_proc_macro_name(&name);
        |                                            ^^^^^ help: change this to: `name`
        |
        = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow
---
 src/lib.rs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lib.rs b/src/lib.rs
index 671231e..e616498 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -295,9 +295,9 @@ fn expand_export(export: Export, args: ExportArgs) -> TokenStream {
     let mut export_call_site = TokenStream::new();
     let mut macro_rules = TokenStream::new();
     for Macro { name, export_as } in &export.macros {
-        let hacked = hacked_proc_macro_name(&name);
-        let dispatch = dispatch_macro_name(&name);
-        let call_site = call_site_macro_name(&name);
+        let hacked = hacked_proc_macro_name(name);
+        let dispatch = dispatch_macro_name(name);
+        let call_site = call_site_macro_name(name);
 
         if !actual_names.is_empty() {
             actual_names.extend(quote!(,));
@@ -404,7 +404,7 @@ fn expand_export_nohack(export: Export) -> TokenStream {
     let mut names = TokenStream::new();
 
     for Macro { name, export_as } in &export.macros {
-        let pub_name = pub_proc_macro_name(&name);
+        let pub_name = pub_proc_macro_name(name);
         if !names.is_empty() {
             names.extend(quote!(,));
         }

From bca911aa72a1419be8d93c63ec587a217fefcd13 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Fri, 2 Jul 2021 20:59:51 -0700
Subject: [PATCH 42/65] Ignore buggy nonstandard_macro_braces clippy lint

Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422

    error: use of irregular braces for `vec!` macro
     --> demo-hack-impl/src/lib.rs:6:1
      |
    6 | #[proc_macro_hack]
      | ^^^^^^^^^^^^^^^^^^
      |
      = note: `-D clippy::nonstandard-macro-braces` implied by `-D clippy::all`
    help: consider writing `#[proc_macro_hack]`
     --> demo-hack-impl/src/lib.rs:6:1
      |
    6 | #[proc_macro_hack]
      | ^^^^^^^^^^^^^^^^^^
      = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#nonstandard_macro_braces
      = note: this error originates in the attribute macro `proc_macro_hack` (in Nightly builds, run with -Z macro-backtrace for more info)
---
 demo-hack-impl/src/lib.rs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/demo-hack-impl/src/lib.rs b/demo-hack-impl/src/lib.rs
index 8d0f4b0..80b2a41 100644
--- a/demo-hack-impl/src/lib.rs
+++ b/demo-hack-impl/src/lib.rs
@@ -1,3 +1,8 @@
+#![allow(
+    // Clippy bug: https://github.com/rust-lang/rust-clippy/issues/7422
+    clippy::nonstandard_macro_braces,
+)]
+
 use proc_macro::TokenStream;
 use proc_macro_hack::proc_macro_hack;
 use quote::quote;

From 2f10e9de5ce68e9b04687a24b4ebe01bfc27e70e Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 7 Aug 2021 20:38:43 -0700
Subject: [PATCH 43/65] Raise minimum tested compiler to rustc 1.34

---
 .github/workflows/ci.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54e6973..aada932 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [beta, stable, 1.45.0, 1.42.0, 1.31.0]
+        rust: [beta, stable, 1.45.0, 1.42.0, 1.34.0, 1.31.0]
         include:
           - rust: nightly
           - rust: nightly
@@ -23,10 +23,11 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust}}
-      - if: matrix.rust == '1.31.0'
+      - if: matrix.rust == '1.31.0' || matrix.rust == '1.34.0'
         run: echo 'extern crate proc_macro;' >> demo-hack-impl/src/lib.rs
       - run: cargo run --manifest-path example/Cargo.toml
-      - run: cargo test --all
+      - if: matrix.rust != '1.31.0'
+        run: cargo test --all
 
   clippy:
     name: Clippy

From 9a41ef1e834332f95c20c8f8e23ec1913e593125 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 18 Sep 2021 16:36:35 -0700
Subject: [PATCH 44/65] Skip clippy job on pull requests

---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aada932..98cbf9a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,6 +32,7 @@ jobs:
   clippy:
     name: Clippy
     runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@clippy

From 39b540419f19e79a7ec48070bb7f5e4a9ec606a6 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 2 Oct 2021 02:16:46 -0400
Subject: [PATCH 45/65] Declare minimum Rust version in Cargo metadata

---
 Cargo.toml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Cargo.toml b/Cargo.toml
index 61150b4..cde0b6e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -3,6 +3,7 @@ name = "proc-macro-hack"
 version = "0.5.19"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 edition = "2018"
+rust-version = "1.31"
 license = "MIT OR Apache-2.0"
 description = "Procedural macros in expression position"
 repository = "https://github.com/dtolnay/proc-macro-hack"

From 4231d34bb9a168fdf743a1e898033677a7566ae8 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Thu, 7 Oct 2021 00:46:13 -0400
Subject: [PATCH 46/65] Update ui test files

---
 tests/ui/private.stderr        | 2 +-
 tests/ui/unexpected-arg.stderr | 2 +-
 tests/ui/unexpected.stderr     | 2 +-
 tests/ui/unknown-arg.stderr    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/ui/private.stderr b/tests/ui/private.stderr
index be79443..c4f4c5f 100644
--- a/tests/ui/private.stderr
+++ b/tests/ui/private.stderr
@@ -1,5 +1,5 @@
 error: functions tagged with `#[proc_macro_hack]` must be `pub`
- --> $DIR/private.rs:4:1
+ --> $DIR/tests/ui/private.rs:4:1
   |
 4 | fn my_macro(input: TokenStream) -> TokenStream {
   | ^^
diff --git a/tests/ui/unexpected-arg.stderr b/tests/ui/unexpected-arg.stderr
index 6895e82..1243ead 100644
--- a/tests/ui/unexpected-arg.stderr
+++ b/tests/ui/unexpected-arg.stderr
@@ -1,5 +1,5 @@
 error: unexpected argument to proc_macro_hack macro implementation; args are only accepted on the macro declaration (the `pub use`)
- --> $DIR/unexpected-arg.rs:3:19
+ --> $DIR/tests/ui/unexpected-arg.rs:3:19
   |
 3 | #[proc_macro_hack(fake_call_site)]
   |                   ^^^^^^^^^^^^^^
diff --git a/tests/ui/unexpected.stderr b/tests/ui/unexpected.stderr
index e3da97a..afe2bd4 100644
--- a/tests/ui/unexpected.stderr
+++ b/tests/ui/unexpected.stderr
@@ -1,5 +1,5 @@
 error: unexpected input to #[proc_macro_hack]
- --> $DIR/unexpected.rs:4:5
+ --> $DIR/tests/ui/unexpected.rs:4:5
   |
 4 | pub struct What;
   |     ^^^^^^
diff --git a/tests/ui/unknown-arg.stderr b/tests/ui/unknown-arg.stderr
index ffe3705..2f685c0 100644
--- a/tests/ui/unknown-arg.stderr
+++ b/tests/ui/unknown-arg.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `support_nested`, `internal_macro_calls`, `fake_call_site`, `only_hack_old_rustc`
- --> $DIR/unknown-arg.rs:3:35
+ --> $DIR/tests/ui/unknown-arg.rs:3:35
   |
 3 | #[proc_macro_hack(fake_call_site, support_nexted)]
   |                                   ^^^^^^^^^^^^^^

From 35813d46ec5e0326dd157857511686698e76280b Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Fri, 8 Oct 2021 01:50:20 -0400
Subject: [PATCH 47/65] Add actions job to notice outdated dependencies

---
 .github/workflows/ci.yml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 98cbf9a..940bd74 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,3 +37,11 @@ jobs:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@clippy
       - run: cargo clippy --tests -- -Dclippy::all -Dclippy::pedantic
+
+  outdated:
+    name: Outdated
+    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
+    steps:
+      - uses: actions/checkout@v2
+      - run: cargo outdated --exit-code 1

From 98ef3c69fcd1b3143a0d3ae67655fc8f182627fb Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Fri, 8 Oct 2021 02:51:09 -0400
Subject: [PATCH 48/65] Ui test changes for trybuild 1.0.49

---
 Cargo.toml                     | 2 +-
 tests/ui/private.stderr        | 2 +-
 tests/ui/unexpected-arg.stderr | 2 +-
 tests/ui/unexpected.stderr     | 2 +-
 tests/ui/unknown-arg.stderr    | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index cde0b6e..cfa8285 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ demo-hack-impl = { version = "0.0.5", path = "demo-hack-impl" }
 quote = "1.0"
 rustversion = "1.0"
 syn = "1.0.5"
-trybuild = "1.0"
+trybuild = "1.0.49"
 
 [workspace]
 members = ["demo-hack", "demo-hack-impl", "example", "nested"]
diff --git a/tests/ui/private.stderr b/tests/ui/private.stderr
index c4f4c5f..d3a3ea7 100644
--- a/tests/ui/private.stderr
+++ b/tests/ui/private.stderr
@@ -1,5 +1,5 @@
 error: functions tagged with `#[proc_macro_hack]` must be `pub`
- --> $DIR/tests/ui/private.rs:4:1
+ --> tests/ui/private.rs:4:1
   |
 4 | fn my_macro(input: TokenStream) -> TokenStream {
   | ^^
diff --git a/tests/ui/unexpected-arg.stderr b/tests/ui/unexpected-arg.stderr
index 1243ead..f32f05a 100644
--- a/tests/ui/unexpected-arg.stderr
+++ b/tests/ui/unexpected-arg.stderr
@@ -1,5 +1,5 @@
 error: unexpected argument to proc_macro_hack macro implementation; args are only accepted on the macro declaration (the `pub use`)
- --> $DIR/tests/ui/unexpected-arg.rs:3:19
+ --> tests/ui/unexpected-arg.rs:3:19
   |
 3 | #[proc_macro_hack(fake_call_site)]
   |                   ^^^^^^^^^^^^^^
diff --git a/tests/ui/unexpected.stderr b/tests/ui/unexpected.stderr
index afe2bd4..60761b5 100644
--- a/tests/ui/unexpected.stderr
+++ b/tests/ui/unexpected.stderr
@@ -1,5 +1,5 @@
 error: unexpected input to #[proc_macro_hack]
- --> $DIR/tests/ui/unexpected.rs:4:5
+ --> tests/ui/unexpected.rs:4:5
   |
 4 | pub struct What;
   |     ^^^^^^
diff --git a/tests/ui/unknown-arg.stderr b/tests/ui/unknown-arg.stderr
index 2f685c0..772e667 100644
--- a/tests/ui/unknown-arg.stderr
+++ b/tests/ui/unknown-arg.stderr
@@ -1,5 +1,5 @@
 error: expected one of: `support_nested`, `internal_macro_calls`, `fake_call_site`, `only_hack_old_rustc`
- --> $DIR/tests/ui/unknown-arg.rs:3:35
+ --> tests/ui/unknown-arg.rs:3:35
   |
 3 | #[proc_macro_hack(fake_call_site, support_nexted)]
   |                                   ^^^^^^^^^^^^^^

From aee39c97871ca2d30cf08e3ed23fd2ad901c644a Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Fri, 8 Oct 2021 02:51:26 -0400
Subject: [PATCH 49/65] Opt in to experimental trybuild diffs

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index cfa8285..238c2db 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -19,7 +19,7 @@ demo-hack-impl = { version = "0.0.5", path = "demo-hack-impl" }
 quote = "1.0"
 rustversion = "1.0"
 syn = "1.0.5"
-trybuild = "1.0.49"
+trybuild = { version = "1.0.49", features = ["diff"] }
 
 [workspace]
 members = ["demo-hack", "demo-hack-impl", "example", "nested"]

From fdf50c88ab8e83f25e052ca3f489f0fe5ba0f419 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Wed, 17 Nov 2021 13:29:48 -0800
Subject: [PATCH 50/65] Install newest build of cargo-outdated

The old version available by default in the GitHub Actions image fails
with:

    thread 'main' panicked at 'package cache lock is not currently held, Cargo forgot to call `acquire_package_cache_lock` before we got to this stack frame', /usr/share/rust/.cargo/registry/src/github.com-1ecc6299db9ec823/cargo-0.57.0/src/cargo/util/config/mod.rs:1542:9
    note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
---
 .github/workflows/ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 940bd74..1ac0f29 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -44,4 +44,5 @@ jobs:
     if: github.event_name != 'pull_request'
     steps:
       - uses: actions/checkout@v2
+      - uses: dtolnay/install@cargo-outdated
       - run: cargo outdated --exit-code 1

From b6d8b67578fa81660b54a2b724612ad499dff20b Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Sat, 11 Dec 2021 18:44:13 -0800
Subject: [PATCH 51/65] Raise minimum rustc for test suite from 1.34 to 1.36

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1ac0f29..7fefc4d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [beta, stable, 1.45.0, 1.42.0, 1.34.0, 1.31.0]
+        rust: [beta, stable, 1.45.0, 1.42.0, 1.36.0, 1.31.0]
         include:
           - rust: nightly
           - rust: nightly
@@ -23,7 +23,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust}}
-      - if: matrix.rust == '1.31.0' || matrix.rust == '1.34.0'
+      - if: matrix.rust == '1.31.0' || matrix.rust == '1.36.0'
         run: echo 'extern crate proc_macro;' >> demo-hack-impl/src/lib.rs
       - run: cargo run --manifest-path example/Cargo.toml
       - if: matrix.rust != '1.31.0'

From bcd41e2da47949ce44eaae4b7c166e749048907b Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Fri, 31 Dec 2021 22:20:01 -0800
Subject: [PATCH 52/65] Detect warnings in CI

---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7fefc4d..6395f4b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,9 @@ on:
   pull_request:
   schedule: [cron: "40 1 * * *"]
 
+env:
+  RUSTFLAGS: '-Dwarnings'
+
 jobs:
   test:
     name: ${{matrix.name || format('Rust {0}', matrix.rust)}}

From 287c21f6830a2637723fe406c4992ddea1ce1673 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 25 Apr 2022 02:05:50 -0700
Subject: [PATCH 53/65] Update workflows to actions/checkout@v3

---
 .github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6395f4b..62a78e3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
             name: Windows
             os: windows
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust}}
@@ -37,7 +37,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@clippy
       - run: cargo clippy --tests -- -Dclippy::all -Dclippy::pedantic
 
@@ -46,6 +46,6 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: dtolnay/install@cargo-outdated
       - run: cargo outdated --exit-code 1

From 78f71b9f8eb422f35bbc62ed9495a96f947b9a32 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:09:24 -0800
Subject: [PATCH 54/65] Drop unneeded quoting from env variable in workflows
 yaml

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 62a78e3..41a2bac 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,7 +6,7 @@ on:
   schedule: [cron: "40 1 * * *"]
 
 env:
-  RUSTFLAGS: '-Dwarnings'
+  RUSTFLAGS: -Dwarnings
 
 jobs:
   test:

From 29071f0972ec0cca9a8553779d436475099e774b Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:16:08 -0800
Subject: [PATCH 55/65] Raise minimum tested toolchain to rust 1.56

Required by the transitive dev-dependency on once_cell.

    error: failed to download `once_cell v1.16.0`

    Caused by:
      unable to get packages from source

    Caused by:
      failed to parse manifest at `github.com-1ecc6299db9ec823/once_cell-1.16.0/Cargo.toml`

    Caused by:
      feature `edition2021` is required

      The package requires the Cargo feature called `edition2021`, but that feature is not stabilized in this version of Cargo (1.55.0 (32da73ab1 2021-08-23)).
      Consider trying a newer version of Cargo (this may require the nightly release).
      See https://doc.rust-lang.org/nightly/cargo/reference/unstable.html#edition-2021 for more information about the status of this feature.
---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 41a2bac..bc96e04 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [beta, stable, 1.45.0, 1.42.0, 1.36.0, 1.31.0]
+        rust: [beta, stable, 1.56.0, 1.31.0]
         include:
           - rust: nightly
           - rust: nightly
@@ -26,7 +26,7 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{matrix.rust}}
-      - if: matrix.rust == '1.31.0' || matrix.rust == '1.36.0'
+      - if: matrix.rust == '1.31.0'
         run: echo 'extern crate proc_macro;' >> demo-hack-impl/src/lib.rs
       - run: cargo run --manifest-path example/Cargo.toml
       - if: matrix.rust != '1.31.0'

From 757605fe7a934ae3645076db5aa5b0abbf435e6f Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:13:51 -0800
Subject: [PATCH 56/65] Fix warning about let_underscore_drop lint removal from
 clippy

    warning: lint `clippy::let_underscore_drop` has been renamed to `let_underscore_drop`
       --> src/lib.rs:150:5
        |
    150 |     clippy::let_underscore_drop,
        |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use the new name: `let_underscore_drop`
        |
        = note: `#[warn(renamed_and_removed_lints)]` on by default
---
 src/lib.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib.rs b/src/lib.rs
index e616498..7b8b43b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -147,7 +147,6 @@
 #![recursion_limit = "512"]
 #![allow(
     clippy::doc_markdown,
-    clippy::let_underscore_drop,
     clippy::manual_strip,
     clippy::module_name_repetitions,
     clippy::needless_doctest_main,

From 6961bdf52f4115c8e43f6e6c554034ce9f681216 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:10:13 -0800
Subject: [PATCH 57/65] Check all crates in workspace for outdated deps

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bc96e04..5170819 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,4 +48,4 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/install@cargo-outdated
-      - run: cargo outdated --exit-code 1
+      - run: cargo outdated --workspace --exit-code 1

From 2c1764cc2c1586a2225ba422cb99fcfab6d1e345 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:10:32 -0800
Subject: [PATCH 58/65] GitHub Workflows security hardening

---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5170819..cba28d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,6 +5,9 @@ on:
   pull_request:
   schedule: [cron: "40 1 * * *"]
 
+permissions:
+  contents: read
+
 env:
   RUSTFLAGS: -Dwarnings
 

From 16443d68d7fb65986df205900d0093d544ba6373 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:10:50 -0800
Subject: [PATCH 59/65] Time out workflows after 45 minutes

---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cba28d4..6031016 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,6 +24,7 @@ jobs:
           - rust: nightly
             name: Windows
             os: windows
+    timeout-minutes: 45
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@master
@@ -39,6 +40,7 @@ jobs:
     name: Clippy
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
+    timeout-minutes: 45
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/rust-toolchain@clippy
@@ -48,6 +50,7 @@ jobs:
     name: Outdated
     runs-on: ubuntu-latest
     if: github.event_name != 'pull_request'
+    timeout-minutes: 45
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/install@cargo-outdated

From 4945af4050d29b0fb8d31e443da2be0db336273f Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:11:09 -0800
Subject: [PATCH 60/65] Update build status badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c734710..e6211ea 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Procedural macros in expression position
 [<img alt="github" src="https://img.shields.io/badge/github-dtolnay/proc--macro--hack-8da0cb?style=for-the-badge&labelColor=555555&logo=github" height="20">](https://github.com/dtolnay/proc-macro-hack)
 [<img alt="crates.io" src="https://img.shields.io/crates/v/proc-macro-hack.svg?style=for-the-badge&color=fc8d62&logo=rust" height="20">](https://crates.io/crates/proc-macro-hack)
 [<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-proc--macro--hack-66c2a5?style=for-the-badge&labelColor=555555&logoColor=white&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDUxMiA1MTIiPjxwYXRoIGZpbGw9IiNmNWY1ZjUiIGQ9Ik00ODguNiAyNTAuMkwzOTIgMjE0VjEwNS41YzAtMTUtOS4zLTI4LjQtMjMuNC0zMy43bC0xMDAtMzcuNWMtOC4xLTMuMS0xNy4xLTMuMS0yNS4zIDBsLTEwMCAzNy41Yy0xNC4xIDUuMy0yMy40IDE4LjctMjMuNCAzMy43VjIxNGwtOTYuNiAzNi4yQzkuMyAyNTUuNSAwIDI2OC45IDAgMjgzLjlWMzk0YzAgMTMuNiA3LjcgMjYuMSAxOS45IDMyLjJsMTAwIDUwYzEwLjEgNS4xIDIyLjEgNS4xIDMyLjIgMGwxMDMuOS01MiAxMDMuOSA1MmMxMC4xIDUuMSAyMi4xIDUuMSAzMi4yIDBsMTAwLTUwYzEyLjItNi4xIDE5LjktMTguNiAxOS45LTMyLjJWMjgzLjljMC0xNS05LjMtMjguNC0yMy40LTMzLjd6TTM1OCAyMTQuOGwtODUgMzEuOXYtNjguMmw4NS0zN3Y3My4zek0xNTQgMTA0LjFsMTAyLTM4LjIgMTAyIDM4LjJ2LjZsLTEwMiA0MS40LTEwMi00MS40di0uNnptODQgMjkxLjFsLTg1IDQyLjV2LTc5LjFsODUtMzguOHY3NS40em0wLTExMmwtMTAyIDQxLjQtMTAyLTQxLjR2LS42bDEwMi0zOC4yIDEwMiAzOC4ydi42em0yNDAgMTEybC04NSA0Mi41di03OS4xbDg1LTM4Ljh2NzUuNHptMC0xMTJsLTEwMiA0MS40LTEwMi00MS40di0uNmwxMDItMzguMiAxMDIgMzguMnYuNnoiPjwvcGF0aD48L3N2Zz4K" height="20">](https://docs.rs/proc-macro-hack)
-[<img alt="build status" src="https://img.shields.io/github/workflow/status/dtolnay/proc-macro-hack/CI/master?style=for-the-badge" height="20">](https://github.com/dtolnay/proc-macro-hack/actions?query=branch%3Amaster)
+[<img alt="build status" src="https://img.shields.io/github/actions/workflow/status/dtolnay/proc-macro-hack/ci.yml?branch=master&style=for-the-badge" height="20">](https://github.com/dtolnay/proc-macro-hack/actions?query=branch%3Amaster)
 
 <table><tr><td><hr>
 <b>Note:</b> <i>As of Rust 1.45 this crate is superseded by native support for

From d6e23bcacdf25b52e77dee05d7c4473edb435ddc Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:11:32 -0800
Subject: [PATCH 61/65] Use upstreamed docs.rs icon in docs.rs badge

---
 README.md  | 2 +-
 src/lib.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e6211ea..b72b8ef 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Procedural macros in expression position
 
 [<img alt="github" src="https://img.shields.io/badge/github-dtolnay/proc--macro--hack-8da0cb?style=for-the-badge&labelColor=555555&logo=github" height="20">](https://github.com/dtolnay/proc-macro-hack)
 [<img alt="crates.io" src="https://img.shields.io/crates/v/proc-macro-hack.svg?style=for-the-badge&color=fc8d62&logo=rust" height="20">](https://crates.io/crates/proc-macro-hack)
-[<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-proc--macro--hack-66c2a5?style=for-the-badge&labelColor=555555&logoColor=white&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDUxMiA1MTIiPjxwYXRoIGZpbGw9IiNmNWY1ZjUiIGQ9Ik00ODguNiAyNTAuMkwzOTIgMjE0VjEwNS41YzAtMTUtOS4zLTI4LjQtMjMuNC0zMy43bC0xMDAtMzcuNWMtOC4xLTMuMS0xNy4xLTMuMS0yNS4zIDBsLTEwMCAzNy41Yy0xNC4xIDUuMy0yMy40IDE4LjctMjMuNCAzMy43VjIxNGwtOTYuNiAzNi4yQzkuMyAyNTUuNSAwIDI2OC45IDAgMjgzLjlWMzk0YzAgMTMuNiA3LjcgMjYuMSAxOS45IDMyLjJsMTAwIDUwYzEwLjEgNS4xIDIyLjEgNS4xIDMyLjIgMGwxMDMuOS01MiAxMDMuOSA1MmMxMC4xIDUuMSAyMi4xIDUuMSAzMi4yIDBsMTAwLTUwYzEyLjItNi4xIDE5LjktMTguNiAxOS45LTMyLjJWMjgzLjljMC0xNS05LjMtMjguNC0yMy40LTMzLjd6TTM1OCAyMTQuOGwtODUgMzEuOXYtNjguMmw4NS0zN3Y3My4zek0xNTQgMTA0LjFsMTAyLTM4LjIgMTAyIDM4LjJ2LjZsLTEwMiA0MS40LTEwMi00MS40di0uNnptODQgMjkxLjFsLTg1IDQyLjV2LTc5LjFsODUtMzguOHY3NS40em0wLTExMmwtMTAyIDQxLjQtMTAyLTQxLjR2LS42bDEwMi0zOC4yIDEwMiAzOC4ydi42em0yNDAgMTEybC04NSA0Mi41di03OS4xbDg1LTM4Ljh2NzUuNHptMC0xMTJsLTEwMiA0MS40LTEwMi00MS40di0uNmwxMDItMzguMiAxMDIgMzguMnYuNnoiPjwvcGF0aD48L3N2Zz4K" height="20">](https://docs.rs/proc-macro-hack)
+[<img alt="docs.rs" src="https://img.shields.io/badge/docs.rs-proc--macro--hack-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs" height="20">](https://docs.rs/proc-macro-hack)
 [<img alt="build status" src="https://img.shields.io/github/actions/workflow/status/dtolnay/proc-macro-hack/ci.yml?branch=master&style=for-the-badge" height="20">](https://github.com/dtolnay/proc-macro-hack/actions?query=branch%3Amaster)
 
 <table><tr><td><hr>
diff --git a/src/lib.rs b/src/lib.rs
index 7b8b43b..9a5a8ac 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -2,7 +2,7 @@
 //!
 //! [github]: https://img.shields.io/badge/github-8da0cb?style=for-the-badge&labelColor=555555&logo=github
 //! [crates-io]: https://img.shields.io/badge/crates.io-fc8d62?style=for-the-badge&labelColor=555555&logo=rust
-//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logoColor=white&logo=data:image/svg+xml;base64,PHN2ZyByb2xlPSJpbWciIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgdmlld0JveD0iMCAwIDUxMiA1MTIiPjxwYXRoIGZpbGw9IiNmNWY1ZjUiIGQ9Ik00ODguNiAyNTAuMkwzOTIgMjE0VjEwNS41YzAtMTUtOS4zLTI4LjQtMjMuNC0zMy43bC0xMDAtMzcuNWMtOC4xLTMuMS0xNy4xLTMuMS0yNS4zIDBsLTEwMCAzNy41Yy0xNC4xIDUuMy0yMy40IDE4LjctMjMuNCAzMy43VjIxNGwtOTYuNiAzNi4yQzkuMyAyNTUuNSAwIDI2OC45IDAgMjgzLjlWMzk0YzAgMTMuNiA3LjcgMjYuMSAxOS45IDMyLjJsMTAwIDUwYzEwLjEgNS4xIDIyLjEgNS4xIDMyLjIgMGwxMDMuOS01MiAxMDMuOSA1MmMxMC4xIDUuMSAyMi4xIDUuMSAzMi4yIDBsMTAwLTUwYzEyLjItNi4xIDE5LjktMTguNiAxOS45LTMyLjJWMjgzLjljMC0xNS05LjMtMjguNC0yMy40LTMzLjd6TTM1OCAyMTQuOGwtODUgMzEuOXYtNjguMmw4NS0zN3Y3My4zek0xNTQgMTA0LjFsMTAyLTM4LjIgMTAyIDM4LjJ2LjZsLTEwMiA0MS40LTEwMi00MS40di0uNnptODQgMjkxLjFsLTg1IDQyLjV2LTc5LjFsODUtMzguOHY3NS40em0wLTExMmwtMTAyIDQxLjQtMTAyLTQxLjR2LS42bDEwMi0zOC4yIDEwMiAzOC4ydi42em0yNDAgMTEybC04NSA0Mi41di03OS4xbDg1LTM4Ljh2NzUuNHptMC0xMTJsLTEwMiA0MS40LTEwMi00MS40di0uNmwxMDItMzguMiAxMDIgMzguMnYuNnoiPjwvcGF0aD48L3N2Zz4K
+//! [docs-rs]: https://img.shields.io/badge/docs.rs-66c2a5?style=for-the-badge&labelColor=555555&logo=docs.rs
 //!
 //! <br>
 //!

From 62448ecf55b71a6c6adc3e94f8ebd71e309d8a0f Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:12:15 -0800
Subject: [PATCH 62/65] Sort package entries in Cargo.toml

---
 Cargo.toml                | 8 ++++----
 demo-hack-impl/Cargo.toml | 4 ++--
 demo-hack/Cargo.toml      | 4 ++--
 example/Cargo.toml        | 4 ++--
 nested/Cargo.toml         | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 238c2db..651dfa2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,13 +2,13 @@
 name = "proc-macro-hack"
 version = "0.5.19"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
+categories = ["development-tools::procedural-macro-helpers"]
+description = "Procedural macros in expression position"
 edition = "2018"
-rust-version = "1.31"
 license = "MIT OR Apache-2.0"
-description = "Procedural macros in expression position"
-repository = "https://github.com/dtolnay/proc-macro-hack"
-categories = ["development-tools::procedural-macro-helpers"]
 readme = "README.md"
+repository = "https://github.com/dtolnay/proc-macro-hack"
+rust-version = "1.31"
 
 [lib]
 proc-macro = true
diff --git a/demo-hack-impl/Cargo.toml b/demo-hack-impl/Cargo.toml
index dc9d85e..54c2db9 100644
--- a/demo-hack-impl/Cargo.toml
+++ b/demo-hack-impl/Cargo.toml
@@ -2,10 +2,10 @@
 name = "demo-hack-impl"
 version = "0.0.5"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
-license = "MIT OR Apache-2.0"
 description = "Demo of proc-macro-hack"
-repository = "https://github.com/dtolnay/proc-macro-hack"
 edition = "2018"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/dtolnay/proc-macro-hack"
 
 [lib]
 proc-macro = true
diff --git a/demo-hack/Cargo.toml b/demo-hack/Cargo.toml
index 238b96c..50f81c1 100644
--- a/demo-hack/Cargo.toml
+++ b/demo-hack/Cargo.toml
@@ -2,10 +2,10 @@
 name = "demo-hack"
 version = "0.0.5"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
-license = "MIT OR Apache-2.0"
 description = "Demo of proc-macro-hack"
-repository = "https://github.com/dtolnay/proc-macro-hack"
 edition = "2018"
+license = "MIT OR Apache-2.0"
+repository = "https://github.com/dtolnay/proc-macro-hack"
 
 [dependencies]
 proc-macro-hack = { version = "0.5", path = ".." }
diff --git a/example/Cargo.toml b/example/Cargo.toml
index 4c69129..e9ad4f3 100644
--- a/example/Cargo.toml
+++ b/example/Cargo.toml
@@ -2,10 +2,10 @@
 name = "example"
 version = "0.0.0"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
-license = "MIT OR Apache-2.0"
-repository = "https://github.com/dtolnay/proc-macro-hack"
 edition = "2018"
+license = "MIT OR Apache-2.0"
 publish = false
+repository = "https://github.com/dtolnay/proc-macro-hack"
 
 [dependencies]
 demo-hack = { path = "../demo-hack" }
diff --git a/nested/Cargo.toml b/nested/Cargo.toml
index aa306db..1dfa83b 100644
--- a/nested/Cargo.toml
+++ b/nested/Cargo.toml
@@ -2,8 +2,8 @@
 name = "proc-macro-nested"
 version = "0.1.7"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
-license = "MIT OR Apache-2.0"
 description = "Support for nested proc-macro-hack invocations"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/proc-macro-hack"
 
 [package.metadata.docs.rs]

From 4c26b5be642f39bef8f9048898a59018f0915404 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:12:57 -0800
Subject: [PATCH 63/65] Remove default package.readme metadata from Cargo.toml

Since cargo 1.46.0, README.md is recognized by default.
---
 Cargo.toml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 651dfa2..0e3d293 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -6,7 +6,6 @@ categories = ["development-tools::procedural-macro-helpers"]
 description = "Procedural macros in expression position"
 edition = "2018"
 license = "MIT OR Apache-2.0"
-readme = "README.md"
 repository = "https://github.com/dtolnay/proc-macro-hack"
 rust-version = "1.31"
 

From fe0889cb7a67adfe070fad449066034e7a662f56 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:21:28 -0800
Subject: [PATCH 64/65] Release 0.5.20

---
 Cargo.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.toml b/Cargo.toml
index 0e3d293..7e8b88e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "proc-macro-hack"
-version = "0.5.19"
+version = "0.5.20+deprecated"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["development-tools::procedural-macro-helpers"]
 description = "Procedural macros in expression position"

From 9a299b12ba7c21d0e2fe2b3fc7a24874c17896b9 Mon Sep 17 00:00:00 2001
From: David Tolnay <dtolnay@gmail.com>
Date: Mon, 19 Dec 2022 10:37:39 -0800
Subject: [PATCH 65/65] Add documentation metadata linking to docs.rs

---
 Cargo.toml        | 1 +
 nested/Cargo.toml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index 7e8b88e..7dab558 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,6 +4,7 @@ version = "0.5.20+deprecated"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 categories = ["development-tools::procedural-macro-helpers"]
 description = "Procedural macros in expression position"
+documentation = "https://docs.rs/proc-macro-hack"
 edition = "2018"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/proc-macro-hack"
diff --git a/nested/Cargo.toml b/nested/Cargo.toml
index 1dfa83b..8ff7b3d 100644
--- a/nested/Cargo.toml
+++ b/nested/Cargo.toml
@@ -3,6 +3,7 @@ name = "proc-macro-nested"
 version = "0.1.7"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
 description = "Support for nested proc-macro-hack invocations"
+documentation = "https://docs.rs/proc-macro-nested"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/proc-macro-hack"