Skip to content

Commit

Permalink
Merge amethyst#193
Browse files Browse the repository at this point in the history
193: Maintenance/192/ongoing code maintenance r=azriel91 a=azriel91

Closes amethyst#192.

Co-authored-by: Azriel Hoh <[email protected]>
  • Loading branch information
bors[bot] and azriel91 authored Feb 12, 2020
2 parents 90a419e + a6bfcf5 commit 2a3e147
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ travis-ci = { repository = "amethyst/shred" }

[dependencies]
arrayvec = "0.5.1"
hashbrown = "0.6.3"
hashbrown = "0.7.0"
mopa = "0.2.2"
rayon = { version = "1.3.0", optional = true }
shred-derive = { path = "shred-derive", version = "0.6.0", optional = true }
smallvec = "1.1.0"
smallvec = "1.2.0"
tynm = "0.1.3"

[workspace]
members = ["shred-derive"]

[dev-dependencies]
cgmath = "0.17"
cgmath = "0.17.0"
shred-derive = { path = "shred-derive", version = "0.6.0" }

[features]
Expand Down
4 changes: 2 additions & 2 deletions examples/async.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ impl<'a> System<'a> for PrintSystem {
println!("{:?}", &*a);
println!("{:?}", &*b);

*b = ResB; // We can mutate ResB here
// because it's `Write`.
// We can mutate ResB here because it's `Write`.
*b = ResB;
}
}

Expand Down
4 changes: 2 additions & 2 deletions shred-derive/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ keywords = ["parallel", "systems", "resources", "ecs", "derive"]
license = "MIT/Apache-2.0"

[dependencies]
syn = "1.0.11"
syn = "1.0.14"
quote = "1.0.2"
proc-macro2 = "1.0.6"
proc-macro2 = "1.0.8"

[lib]
proc-macro = true
2 changes: 1 addition & 1 deletion shred-derive/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ fn impl_system_data(ast: &DeriveInput) -> proc_macro2::TokenStream {
.lifetimes()
.next()
.expect("There has to be at least one lifetime");
let ref impl_fetch_lt = def_fetch_lt.lifetime;
let impl_fetch_lt = &def_fetch_lt.lifetime;

{
let where_clause = generics.make_where_clause();
Expand Down

0 comments on commit 2a3e147

Please sign in to comment.