Merge pull request #25 from dtolnay/up

Update to proc-macro-hack 0.5

.travis.yml

@@ -3,7 +3,7 @@ language: rust
 
 matrix:
   include:
-    - rust: 1.15.0
+    - rust: 1.30.0
     - rust: stable
     - rust: beta
     - rust: nightly

Cargo.toml

@@ -14,7 +14,7 @@ unstable = ["indoc-impl/unstable"]
 
 [dependencies]
 indoc-impl = { version = "0.2", path = "impl" }
-proc-macro-hack = "0.4"
+proc-macro-hack = "0.5"
 
 [workspace]
 members = ["impl", "tests", "unindent"]

README.md

@@ -18,8 +18,8 @@ Release notes are available under [GitHub releases](https://github.com/dtolnay/i
 ## Using Indoc
 
 ```rust
-#[macro_use]
 extern crate indoc;
+use indoc::indoc;
 
 fn main() {
     let testing = indoc!("
@@ -36,8 +36,8 @@ fn main() {
 Indoc also works with raw string literals:
 
 ```rust
-#[macro_use]
 extern crate indoc;
+use indoc::indoc;
 
 fn main() {
     let testing = indoc!(r#"
@@ -54,8 +54,8 @@ fn main() {
 And byte string literals:
 
 ```rust
-#[macro_use]
 extern crate indoc;
+use indoc::indoc;
 
 fn main() {
     let testing = indoc!(b"

impl/Cargo.toml

@@ -16,7 +16,7 @@ unstable = []
 proc-macro = true
 
 [dependencies]
-proc-macro-hack = "0.4"
+proc-macro-hack = "0.5"
 proc-macro2 = { version = "0.4", default-features = false }
 quote = { version = "0.6", default-features = false }
 syn = { version = "0.15", default-features = false, features = ["derive", "parsing", "printing"] }

impl/src/lib.rs

@@ -8,48 +8,30 @@
 
 #![doc(html_root_url = "https://docs.rs/indoc-impl/0.2.8")]
 
-#[cfg(feature = "unstable")]
 extern crate proc_macro;
 
 #[cfg(not(feature = "unstable"))]
-#[macro_use]
 extern crate proc_macro_hack;
 
+#[cfg(not(feature = "unstable"))]
+use proc_macro_hack::proc_macro_hack;
+
 extern crate proc_macro2;
 extern crate syn;
 
-#[macro_use]
 extern crate quote;
+use quote::quote;
 
 extern crate unindent;
 use unindent::*;
 
 use proc_macro2::TokenStream;
 use syn::{Lit, LitByteStr, LitStr};
 
-use std::fmt::Debug;
-use std::str::FromStr;
-
-#[cfg(feature = "unstable")]
-#[proc_macro]
+#[cfg_attr(feature = "unstable", proc_macro)]
+#[cfg_attr(not(feature = "unstable"), proc_macro_hack)]
 pub fn indoc(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
-    expand(&input)
-}
-
-#[cfg(not(feature = "unstable"))]
-proc_macro_expr_impl! {
-    pub fn indoc_impl(input: &str) -> String {
-        expand(input)
-    }
-}
-
-fn expand<T, R>(input: &T) -> R
-where
-    T: ?Sized + ToString,
-    R: FromStr,
-    R::Err: Debug,
-{
-    let source = input.to_string().parse::<TokenStream>().unwrap();
+    let source = TokenStream::from(input);
 
     let len = source.clone().into_iter().count();
     if len != 1 {
@@ -80,5 +62,5 @@ where
         }
     };
 
-    quote!(#lit).to_string().parse().unwrap()
+    proc_macro::TokenStream::from(quote!(#lit))
 }

src/lib.rs

@@ -25,9 +25,8 @@
     doc = " #![feature(proc_macro_hygiene)]"
 )]
 #![cfg_attr(feature = "unstable", doc = "")]
-#![cfg_attr(not(feature = "unstable"), doc = " #[macro_use]")]
 //! extern crate indoc;
-#![cfg_attr(feature = "unstable", doc = " use indoc::indoc;")]
+//! use indoc::indoc;
 //!
 //! fn main() {
 //!     let testing = indoc!("
@@ -49,9 +48,8 @@
     doc = " #![feature(proc_macro_hygiene)]"
 )]
 #![cfg_attr(feature = "unstable", doc = "")]
-#![cfg_attr(not(feature = "unstable"), doc = " #[macro_use]")]
 //! extern crate indoc;
-#![cfg_attr(feature = "unstable", doc = " use indoc::indoc;")]
+//! use indoc::indoc;
 //!
 //! fn main() {
 //!     let testing = indoc!(r#"
@@ -73,9 +71,8 @@
     doc = " #![feature(proc_macro_hygiene)]"
 )]
 #![cfg_attr(feature = "unstable", doc = "")]
-#![cfg_attr(not(feature = "unstable"), doc = " #[macro_use]")]
 //! extern crate indoc;
-#![cfg_attr(feature = "unstable", doc = " use indoc::indoc;")]
+//! use indoc::indoc;
 //!
 //! fn main() {
 //!     let testing = indoc!(b"
@@ -117,22 +114,12 @@
 #![no_std]
 
 #[cfg(not(feature = "unstable"))]
-#[macro_use]
 extern crate proc_macro_hack;
 
-#[allow(unused_imports)]
-#[cfg_attr(not(feature = "unstable"), macro_use)]
-pub extern crate indoc_impl;
-
-#[cfg(feature = "unstable")]
-pub use indoc_impl::indoc;
+extern crate indoc_impl;
 
 #[cfg(not(feature = "unstable"))]
-#[doc(hidden)]
-pub use indoc_impl::*;
+use proc_macro_hack::proc_macro_hack;
 
-#[cfg(not(feature = "unstable"))]
-proc_macro_expr_decl! {
-    #[doc(hidden)]
-    indoc! => indoc_impl
-}
+#[cfg_attr(not(feature = "unstable"), proc_macro_hack)]
+pub use indoc_impl::indoc;

tests/tests/run-pass.rs

@@ -9,10 +9,7 @@
 #![cfg_attr(feature = "unstable", feature(proc_macro_hygiene))]
 #![cfg_attr(rustfmt, rustfmt_skip)]
 
-#[cfg_attr(not(feature = "unstable"), macro_use)]
 extern crate indoc;
-
-#[cfg(feature = "unstable")]
 use indoc::indoc;
 
 #[test]

tests/tests/ui-stable/no-arguments.rs

@@ -6,8 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use]
 extern crate indoc;
+use indoc::indoc;
 
 fn main() {
     indoc!();

tests/tests/ui-stable/non-lit.rs

@@ -6,8 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use]
 extern crate indoc;
+use indoc::indoc;
 
 fn main() {
     indoc!(fail);

tests/tests/ui-stable/non-string.rs

@@ -6,8 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use]
 extern crate indoc;
+use indoc::indoc;
 
 fn main() {
     indoc!(64);

tests/tests/ui-stable/two-arguments.rs

@@ -6,8 +6,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use]
 extern crate indoc;
+use indoc::indoc;
 
 fn main() {
     indoc!("

tests/tests/ui-unstable/no-arguments.rs

@@ -8,8 +8,8 @@
 
 #![feature(proc_macro_hygiene)]
 
-#[macro_use]
 extern crate indoc;
+use indoc::indoc;
 
 fn main() {
     indoc!();

tests/tests/ui-unstable/non-lit.rs

@@ -8,8 +8,8 @@
 
 #![feature(proc_macro_hygiene)]
 
-#[macro_use]
 extern crate indoc;
+use indoc::indoc;
 
 fn main() {
     indoc!(fail);

tests/tests/ui-unstable/non-string.rs

@@ -8,8 +8,8 @@
 
 #![feature(proc_macro_hygiene)]
 
-#[macro_use]
 extern crate indoc;
+use indoc::indoc;
 
 fn main() {
     indoc!(64);

tests/tests/ui-unstable/two-arguments.rs

@@ -8,8 +8,8 @@
 
 #![feature(proc_macro_hygiene)]
 
-#[macro_use]
 extern crate indoc;
+use indoc::indoc;
 
 fn main() {
     indoc!("