forestia/bevy
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bevy_reflect incorrectly looks for bevy in dev-deps (#1182)

Browse Source 
* fix: bevy_reflect looking for bevy in dev-deps
* fix: support bevy as dev-dep only in bevy_reflect
This commit is contained in:
Théo Degioanni 2021-01-03 20:28:00 +01:00 committed by GitHub
parent 6c07c80f81
commit 804c068cc9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crates/bevy_reflect/bevy_reflect_derive/src/modules.rs
View File

@ -1,4 +1,4 @@
use find_crate::Manifest; use find_crate::{Dependencies, Manifest};
use proc_macro::TokenStream; use proc_macro::TokenStream;
use syn::Path; use syn::Path;
@ -28,7 +28,10 @@ impl Modules {
} }
pub fn get_modules() -> Modules { pub fn get_modules() -> Modules {
let manifest = Manifest::new().unwrap(); let mut manifest = Manifest::new().unwrap();
// Only look for regular dependencies in the first pass.
manifest.dependencies = Dependencies::Release;
if let Some(package) = manifest.find(|name| name == "bevy") { if let Some(package) = manifest.find(|name| name == "bevy") {
Modules::meta(&package.name) Modules::meta(&package.name)
} else if let Some(package) = manifest.find(|name| name == "bevy_internal") { } else if let Some(package) = manifest.find(|name| name == "bevy_internal") {
@ -36,7 +39,19 @@ pub fn get_modules() -> Modules {
} else if let Some(_package) = manifest.find(|name| name == "bevy_reflect") { } else if let Some(_package) = manifest.find(|name| name == "bevy_reflect") {
Modules::external() Modules::external()
} else { } else {
Modules::internal() // If reflect is not found as a regular dependency,
// try dev-dependencies.
manifest.dependencies = Dependencies::Dev;
if let Some(package) = manifest.find(|name| name == "bevy") {
Modules::meta(&package.name)
} else if let Some(package) = manifest.find(|name| name == "bevy_internal") {
Modules::meta(&package.name)
} else if let Some(_package) = manifest.find(|name| name == "bevy_reflect") {
Modules::external()
} else {
Modules::internal()
}
} }
} }