Use bevy_reflect as path in case of no direct references

Fixes #1844

crates/bevy_reflect/bevy_reflect_derive/src/modules.rs

@@ -19,40 +19,28 @@ impl Modules {
             bevy_reflect: "bevy_reflect".to_string(),
         }
     }
-
-    pub fn internal() -> Modules {
-        Modules {
-            bevy_reflect: "crate".to_string(),
-        }
-    }
 }
 
 pub fn get_modules() -> Modules {
-    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") {
-        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 {
-        // If reflect is not found as a regular dependency,
-        // try dev-dependencies.
-        manifest.dependencies = Dependencies::Dev;
-
+    fn find_in_manifest(manifest: &mut Manifest, dependencies: Dependencies) -> Option<Modules> {
+        manifest.dependencies = dependencies;
         if let Some(package) = manifest.find(|name| name == "bevy") {
-            Modules::meta(&package.name)
+            Some(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()
+            Some(Modules::meta(&package.name))
+        } else if let Some(_) = manifest.find(|name| name == "bevy_reflect") {
+            Some(Modules::external())
         } else {
-            Modules::internal()
+            None
         }
     }
+
+    let mut manifest = Manifest::new().unwrap();
+    let modules = find_in_manifest(&mut manifest, Dependencies::Release)
+        .or_else(|| find_in_manifest(&mut manifest, Dependencies::Dev))
+        .unwrap_or_else(|| Modules::external());
+
+    modules
 }
 
 pub fn get_path(path_str: &str) -> Path {