Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Remove some stuff which is now unnecessary
  • Loading branch information
JohnTitor committed Oct 15, 2021
1 parent d8cfc43 commit 6941e82
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 9 deletions.
4 changes: 2 additions & 2 deletions phf/src/lib.rs
Expand Up @@ -97,14 +97,14 @@ extern crate std as core;
/// assert_eq!(MY_MAP["hello"], 1);
/// }
/// ```
#[::proc_macro_hack::proc_macro_hack]
#[proc_macro_hack::proc_macro_hack]
pub use phf_macros::phf_map;

#[cfg(feature = "macros")]
/// Macro to create a `static` (compile-time) [`OrderedMap`].
///
/// Requires the `macros` feature. Same usage as [`phf_map`].
#[::proc_macro_hack::proc_macro_hack]
#[proc_macro_hack::proc_macro_hack]
pub use phf_macros::phf_ordered_map;

#[cfg(feature = "macros")]
Expand Down
11 changes: 4 additions & 7 deletions phf_macros/src/lib.rs
Expand Up @@ -3,9 +3,6 @@
//!
//! [phf]: https://docs.rs/phf

// FIXME: Remove `extern crate` below when we bump MSRV to 1.42 or higher.
extern crate proc_macro;

use phf_generator::HashState;
use phf_shared::PhfHash;
use proc_macro::TokenStream;
Expand Down Expand Up @@ -288,15 +285,15 @@ fn build_ordered_map(entries: &[Entry], state: HashState) -> proc_macro2::TokenS
}
}

#[::proc_macro_hack::proc_macro_hack]
#[proc_macro_hack::proc_macro_hack]
pub fn phf_map(input: TokenStream) -> TokenStream {
let map = parse_macro_input!(input as Map);
let state = phf_generator::generate_hash(&map.0);

build_map(&map.0, state).into()
}

#[::proc_macro_hack::proc_macro_hack]
#[proc_macro_hack::proc_macro_hack]
pub fn phf_set(input: TokenStream) -> TokenStream {
let set = parse_macro_input!(input as Set);
let state = phf_generator::generate_hash(&set.0);
Expand All @@ -305,15 +302,15 @@ pub fn phf_set(input: TokenStream) -> TokenStream {
quote!(phf::Set { map: #map }).into()
}

#[::proc_macro_hack::proc_macro_hack]
#[proc_macro_hack::proc_macro_hack]
pub fn phf_ordered_map(input: TokenStream) -> TokenStream {
let map = parse_macro_input!(input as Map);
let state = phf_generator::generate_hash(&map.0);

build_ordered_map(&map.0, state).into()
}

#[::proc_macro_hack::proc_macro_hack]
#[proc_macro_hack::proc_macro_hack]
pub fn phf_ordered_set(input: TokenStream) -> TokenStream {
let set = parse_macro_input!(input as Set);
let state = phf_generator::generate_hash(&set.0);
Expand Down

0 comments on commit 6941e82

Please sign in to comment.