Merge pull request #20 from Cakefish/asset-ref-fix

Fix asset ref
Cakefish · Feb 23, 2024 · 21c32bf · 21c32bf
2 parents 697ee23 + 9acbcaf
commit 21c32bf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/bauble/src/value/mod.rs b/bauble/src/value/mod.rs
@@ -403,7 +403,6 @@ impl<C: AssetContext> Symbols<C> {
 
         item.into_owned()
             .to_asset()
-            .map(|_| path.to_string())
             .ok_or(ConversionError::ExpectedAsset.spanned(path.span))
     }
 

diff --git a/bauble_macro_util/src/lib.rs b/bauble_macro_util/src/lib.rs
@@ -936,7 +936,7 @@ pub fn derive_bauble_derive_input(
                 true => (
                     quote! {
                         ::bauble::TypeInfo::Flatten(&[
-                            #(&<#flattened_tys as ::bauble::FromBauble>::INFO,)*
+                            #(&<#flattened_tys as ::bauble::FromBauble<#lifetime, #allocator>>::INFO,)*
                         ])
                     },
                     quote! {

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly"
+channel = "nightly-2023-08-20"