Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,6 @@

# ISLE should use lisp syntax highlighting.
*.isle linguist-language=lisp

# Generated files don't need diffs rendered by default
crates/component-macro/tests/expanded/** linguist-generated=true
4 changes: 2 additions & 2 deletions crates/component-macro/src/bindgen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ pub struct Config {
include_generated_code_from_file: bool,
}

pub fn expand(input: &Config) -> Result<TokenStream> {
let mut src = match input.opts.generate(&input.resolve, input.world) {
pub fn expand(input: &mut Config) -> Result<TokenStream> {
let mut src = match input.opts.generate(&mut input.resolve, input.world) {
Ok(s) => s,
Err(e) => return Err(Error::new(Span::call_site(), e.to_string())),
};
Expand Down
2 changes: 1 addition & 1 deletion crates/component-macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ pub fn flags(input: proc_macro::TokenStream) -> proc_macro::TokenStream {

#[proc_macro]
pub fn bindgen(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
bindgen::expand(&parse_macro_input!(input as bindgen::Config))
bindgen::expand(&mut parse_macro_input!(input as bindgen::Config))
.unwrap_or_else(Error::into_compile_error)
.into()
}
11 changes: 11 additions & 0 deletions crates/component-macro/tests/codegen/implements.wit
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package foo:foo;

interface store {
get: func(key: string) -> option<string>;
set: func(key: string, value: string);
}

world cache {
import hot-cache: store;
import durable: store;
}
5 changes: 5 additions & 0 deletions crates/component-macro/tests/expanded.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@ fn process_expanded(path: &str, suffix: &str, src: &str) -> Result<()> {
Path::new("tests/expanded").join(stem).with_extension("rs")
};
if std::env::var("BINDGEN_TEST_BLESS").is_ok_and(|val| !val.is_empty()) {
if let Ok(prev) = std::fs::read(&expanded_path)
&& prev == formatted_src.as_bytes()
{
return Ok(());
}
std::fs::write(expanded_path, formatted_src)?;
} else {
match std::fs::read_to_string(&expanded_path) {
Expand Down
17 changes: 14 additions & 3 deletions crates/component-macro/tests/expanded/char.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 14 additions & 3 deletions crates/component-macro/tests/expanded/char_async.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 14 additions & 3 deletions crates/component-macro/tests/expanded/char_concurrent.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 14 additions & 3 deletions crates/component-macro/tests/expanded/char_tracing_async.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 14 additions & 3 deletions crates/component-macro/tests/expanded/conventions.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 14 additions & 3 deletions crates/component-macro/tests/expanded/conventions_async.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 14 additions & 3 deletions crates/component-macro/tests/expanded/conventions_concurrent.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading