Fix paths in SystemData macro

examples/async.rs

@@ -1,6 +1,6 @@
 extern crate shred;
 
-use shred::{DispatcherBuilder, Read, ResourceId, System, SystemData, World, Write};
+use shred::{DispatcherBuilder, Read, System, SystemData, World, Write};
 
 #[derive(Debug, Default)]
 struct ResA;

examples/derive_bundle.rs

@@ -1,4 +1,6 @@
-use shred::{Read, ResourceId, SystemData, World, Write};
+#[cfg(not(feature = "shred-derive"))]
+use shred::ResourceId;
+use shred::{Read, SystemData, World, Write};
 
 #[derive(Debug, Default)]
 struct ResA;

examples/generic_derive.rs

@@ -6,7 +6,7 @@ extern crate shred_derive;
 
 use std::fmt::Debug;
 
-use shred::{Read, Resource, ResourceId, SystemData, World, Write};
+use shred::{Read, Resource, SystemData, Write};
 
 trait Hrtb<'a> {}
 

examples/seq_dispatch.rs

@@ -1,4 +1,6 @@
-use shred::{DispatcherBuilder, Read, ResourceId, System, SystemData, World, Write};
+#[cfg(not(feature = "shred-derive"))]
+use shred::ResourceId;
+use shred::{DispatcherBuilder, Read, System, SystemData, World, Write};
 
 #[derive(Debug, Default)]
 struct ResA;

shred-derive/src/lib.rs

@@ -58,35 +58,35 @@ fn impl_system_data(ast: &DeriveInput) -> proc_macro2::TokenStream {
 
  quote! {
  impl #impl_generics
- SystemData< #impl_fetch_lt >
+ shred::SystemData< #impl_fetch_lt >
  for #name #ty_generics #where_clause
  {
- fn setup(world: &mut World) {
+ fn setup(world: &mut shred::World) {
  #(
- <#tys as SystemData> :: setup(world);
+ <#tys as shred::SystemData> :: setup(world);
  )*
  }
 
- fn fetch(world: & #impl_fetch_lt World) -> Self {
+ fn fetch(world: & #impl_fetch_lt shred::World) -> Self {
  #fetch_return
  }
 
- fn reads() -> Vec<ResourceId> {
+ fn reads() -> Vec<shred::ResourceId> {
  let mut r = Vec::new();
 
  #( {
- let mut reads = <#tys as SystemData> :: reads();
+ let mut reads = <#tys as shred::SystemData> :: reads();
  r.append(&mut reads);
  } )*
 
  r
  }
 
- fn writes() -> Vec<ResourceId> {
+ fn writes() -> Vec<shred::ResourceId> {
  let mut r = Vec::new();
 
  #( {
- let mut writes = <#tys as SystemData> :: writes();
+ let mut writes = <#tys as shred::SystemData> :: writes();
  r.append(&mut writes);
  } )*
 
@@ -107,7 +107,7 @@ fn gen_identifiers(fields: &Punctuated<Field, Comma>) -> Vec<Ident> {
 /// Adds a `SystemData<'lt>` bound on each of the system data types.
 fn constrain_system_data_types(clause: &mut WhereClause, fetch_lt: &Lifetime, tys: &[Type]) {
  for ty in tys.iter() {
- let where_predicate: WherePredicate = parse_quote!(#ty : SystemData< #fetch_lt >);
+ let where_predicate: WherePredicate = parse_quote!(#ty : shred::SystemData< #fetch_lt >);
  clause.predicates.push(where_predicate);
  }
 }
@@ -138,13 +138,13 @@ fn gen_from_body(ast: &Data, name: &Ident) -> (proc_macro2::TokenStream, Vec<Typ
 
  quote! {
  #name {
- #( #identifiers: SystemData::fetch(world) ),*
+ #( #identifiers: shred::SystemData::fetch(world) ),*
  }
  }
  }
  DataType::Tuple => {
  let count = tys.len();
- let fetch = vec![quote! { SystemData::fetch(world) }; count];
+ let fetch = vec![quote! { shred::SystemData::fetch(world) }; count];
 
  quote! {
  #name ( #( #fetch ),* )

tests/dispatch.rs

@@ -1,6 +1,6 @@
-use shred::{
- Dispatcher, DispatcherBuilder, Read, ResourceId, RunningTime, System, SystemData, World, Write,
-};
+#[cfg(not(feature = "shred-derive"))]
+use shred::ResourceId;
+use shred::{Dispatcher, DispatcherBuilder, Read, RunningTime, System, SystemData, World, Write};
 
 fn sleep_short() {
  use std::{thread::sleep, time::Duration};