Skip to content

Commit

Permalink
deps: cargo update and format and fix license check.
Browse files Browse the repository at this point in the history
  • Loading branch information
zicklag committed Aug 17, 2023
1 parent d70fd8a commit 6f416c0
Show file tree
Hide file tree
Showing 8 changed files with 238 additions and 228 deletions.
439 changes: 222 additions & 217 deletions Cargo.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion crates/bones_asset/src/handle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ macro_rules! schema_impl_for_handle {
fields: vec![StructFieldInfo {
name: Some("id".into()),
schema: u128::schema(),
}]
}],
}),
clone_fn: Some(<Self as RawClone>::raw_clone),
drop_fn: None,
Expand Down
2 changes: 1 addition & 1 deletion crates/bones_asset/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
macro_rules! pub_use {
() => {
pub use crate::{asset::*, cid::*, handle::*, io::*, path::*, server::*};
pub use anyhow;
pub use bones_schema::prelude::*;
pub use semver::Version;
pub use anyhow;
};
}
pub_use!();
Expand Down
6 changes: 4 additions & 2 deletions crates/bones_schema/macros/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,11 @@ pub fn derive_has_schema(input: TokenStream) -> TokenStream {
})
}
}
venial::Declaration::Enum(_) => todo!("
venial::Declaration::Enum(_) => todo!(
"
TODO: implement HasSchema for enum types.
"),
"
),
_ => {
throw!(
input,
Expand Down
7 changes: 1 addition & 6 deletions crates/bones_schema/src/registry.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,7 @@ impl SchemaRegistry {
// Leak the field offsets to get static references
let field_offsets: Box<_> = field_offsets
.into_iter()
.map(|(name, offset)| {
(
name.map(|n| n.to_string()),
offset,
)
})
.map(|(name, offset)| (name.map(|n| n.to_string()), offset))
.collect();
let field_offsets = Box::leak(field_offsets);

Expand Down
2 changes: 1 addition & 1 deletion crates/bones_utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ macro_rules! pub_use {
pub use crate::{collections::*, default::*, key_mod::*, labeled_id::*, names::*, ptr::*};
pub use bevy_ptr::*;
pub use bones_utils_macros::*;
pub use fxhash;
pub use hashbrown;
pub use maybe_owned::*;
pub use parking_lot;
pub use fxhash;
};
}
pub_use!();
Expand Down
1 change: 1 addition & 0 deletions demos/simple_game/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "simple_game"
version = "0.1.0"
edition = "2021"
license = "Unlicense"

[dependencies]
bones_framework = { path = "../../crates/bones_framework" }
Expand Down
7 changes: 7 additions & 0 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,10 @@ default = "deny"
github = [
"fishfolk",
]

[[licenses.clarify]]
name = "ring"
expression = "MIT AND ISC AND OpenSSL"
license-files = [
{ path = "LICENSE", hash = 0xbd0eed23 }
]

0 comments on commit 6f416c0

Please sign in to comment.