Slightly adjust prefix output.

AlphaModder · AlphaModder · commit cb8571824cb3 · 2019-03-29T03:07:38.000-07:00
diff --git a/include-lua-macro/Cargo.toml b/include-lua-macro/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "include-lua-macro"
 description = "Contains the implementation of the include_lua! procedural macro for the crate include-lua."
-version = "0.1.1"
+version = "0.1.2"
 repository = "https://github.com/AlphaModder/include-lua"
 license = "MIT"
 authors = ["AlphaModder"]
diff --git a/include-lua-macro/src/lib.rs b/include-lua-macro/src/lib.rs
@@ -48,7 +48,7 @@ impl IncludeLua {
         let add_files = modules.map(|(module, path)| {
             let module = LitStr::new(&module, Span::call_site());
             let real_path = LitStr::new(&PathBuf::from(self.0.value()).join(&path).to_string_lossy(), Span::call_site());
-            let virtual_path = LitStr::new(&PathBuf::from(self.1.value()).join(&path).to_string_lossy(), Span::call_site());
+            let virtual_path = LitStr::new(&path.to_string_lossy(), Span::call_site());
             quote! {
                 files.insert(#module.to_string(), (include_str!(#real_path).to_string(), #virtual_path.to_string()))
             }
diff --git a/include-lua/src/lib.rs b/include-lua/src/lib.rs
@@ -26,7 +26,7 @@ impl UserData for Searcher {
             Ok(match this.0.files.get(&value) {
                 Some((source, path)) => {
                     Value::Function(ctx.load(source)
-                        .set_name(&format!("{}/{} (virtual)", &this.0.prefix, path))?
+                        .set_name(&format!("{}\\{} (virtual)", &this.0.prefix, path))?
                         .set_environment(ctx.registry_value::<Table>(&this.1)?)?
                         .into_function()?
                     )

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ impl IncludeLua {`
`48`	`48`	`let add_files = modules.map(\|(module, path)\| {`
`49`	`49`	`let module = LitStr::new(&module, Span::call_site());`
`50`	`50`	`let real_path = LitStr::new(&PathBuf::from(self.0.value()).join(&path).to_string_lossy(), Span::call_site());`
`51`		`- let virtual_path = LitStr::new(&PathBuf::from(self.1.value()).join(&path).to_string_lossy(), Span::call_site());`
	`51`	`+ let virtual_path = LitStr::new(&path.to_string_lossy(), Span::call_site());`
`52`	`52`	`quote! {`
`53`	`53`	`files.insert(#module.to_string(), (include_str!(#real_path).to_string(), #virtual_path.to_string()))`
`54`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ impl UserData for Searcher {`
`26`	`26`	`Ok(match this.0.files.get(&value) {`
`27`	`27`	`Some((source, path)) => {`
`28`	`28`	`Value::Function(ctx.load(source)`
`29`		`- .set_name(&format!("{}/{} (virtual)", &this.0.prefix, path))?`
	`29`	`+ .set_name(&format!("{}\\{} (virtual)", &this.0.prefix, path))?`
`30`	`30`	`.set_environment(ctx.registry_value::<Table>(&this.1)?)?`
`31`	`31`	`.into_function()?`
`32`	`32`	`)`