Skip to content

Commit

Permalink
typemap rebase (#282)
Browse files Browse the repository at this point in the history
* bump to 1.56 for edition 2021

* bump to 1.56 for edition 2021 support

* fix:Update typemap to use orphanage-rs impl (#275)

Signed-off-by: Anton Whalley <[email protected]>

Signed-off-by: Anton Whalley <[email protected]>

Signed-off-by: Anton Whalley <[email protected]>
Co-authored-by: Anton Whalley <[email protected]>
  • Loading branch information
estk and No9 authored Oct 11, 2022
1 parent 883352a commit e535764
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition = '2018'
[features]
default = ["all_components", "config_parsing", "yaml_format"]

config_parsing = ["humantime", "serde", "serde-value", "typemap", "log/serde"]
config_parsing = ["humantime", "serde", "serde-value", "typemap-ors", "log/serde"]
yaml_format = ["serde_yaml"]
json_format = ["serde_json"]
toml_format = ["toml"]
Expand Down Expand Up @@ -62,7 +62,7 @@ log-mdc = { version = "0.1", optional = true }
serde = { version = "1.0", optional = true, features = ["derive"] }
serde-value = { version = "0.7", optional = true }
thread-id = { version = "4", optional = true }
typemap = { version = "0.3", optional = true }
typemap-ors = { version = "1.0.0", optional = true }
serde_json = { version = "1.0", optional = true }
serde_yaml = { version = "0.8.4", optional = true }
toml = { version = "0.5", optional = true }
Expand Down
2 changes: 1 addition & 1 deletion src/config/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ use log::LevelFilter;
use serde::de::{self, Deserialize as SerdeDeserialize, DeserializeOwned};
use serde_value::Value;
use thiserror::Error;
use typemap::{Key, ShareCloneMap};
use typemap_ors::{Key, ShareCloneMap};

use crate::{append::AppenderConfig, config};

Expand Down

0 comments on commit e535764

Please sign in to comment.