Skip to content

(feat) switch back to std hashmap [#279] #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 29, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ serde_json = "1.0.39"
regex = "1.0.3"
lazy_static = "1.0.0"
walkdir = { version = "2.2.3", optional = true }
hashbrown = { version = "0.5.0", features = ["serde"] }

[dev-dependencies]
env_logger = "0.6.0"
Expand Down
1 change: 0 additions & 1 deletion release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,3 @@ pre-release-replacements = [
{file="CHANGELOG.md", search="ReleaseDate", replace="{{date}}"},
{file="src/lib.rs", search="https://docs.rs/handlebars/[a-z0-9\\.-]+", replace="https://docs.rs/handlebars/{{version}}"},
]

6 changes: 2 additions & 4 deletions src/context.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
use std::collections::VecDeque;
use std::collections::{HashMap, VecDeque};

use hashbrown::HashMap;
use pest::iterators::Pair;
use pest::Parser;
use serde::Serialize;
Expand Down Expand Up @@ -300,9 +299,8 @@ fn join(segs: &VecDeque<&str>, sep: &str) -> String {
mod test {
use crate::context::{self, BlockParams, Context};
use crate::value::{self};
use hashbrown::HashMap;
use serde_json::value::Map;
use std::collections::VecDeque;
use std::collections::{HashMap, VecDeque};

#[derive(Serialize)]
struct Address {
Expand Down
2 changes: 0 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,6 @@ extern crate serde_json;
#[cfg(not(feature = "no_dir_source"))]
extern crate walkdir;

extern crate hashbrown;

pub use self::context::{BlockParams, Context};
pub use self::directives::DirectiveDef as DecoratorDef;
pub use self::error::{RenderError, TemplateError, TemplateFileError, TemplateRenderError};
Expand Down
2 changes: 1 addition & 1 deletion src/partial.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use hashbrown::HashMap;
use std::collections::HashMap;

use serde_json::value::Value as Json;

Expand Down
2 changes: 1 addition & 1 deletion src/registry.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
use std::collections::HashMap;
use std::fmt::{self, Debug, Formatter};
use std::fs::File;
use std::io::prelude::*;
use std::path::Path;

use hashbrown::HashMap;
use serde::Serialize;

use regex::{Captures, Regex};
Expand Down
3 changes: 1 addition & 2 deletions src/render.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
use std::borrow::Borrow;
use std::collections::VecDeque;
use std::collections::{HashMap, VecDeque};
use std::fmt;
use std::ops::Deref;
use std::rc::Rc;

use hashbrown::HashMap;
use serde_json::value::Value as Json;

use crate::context::{self, BlockParamHolder, BlockParams, Context};
Expand Down
3 changes: 1 addition & 2 deletions src/template.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use std::collections::VecDeque;
use std::collections::{HashMap, VecDeque};
use std::convert::From;
use std::iter::Peekable;

Expand All @@ -7,7 +7,6 @@ use pest::error::LineColLocation;
use pest::iterators::Pair;
use pest::{Parser, Position};

use hashbrown::HashMap;
use serde_json::value::Value as Json;
use std::str::FromStr;

Expand Down