Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into roll-bindgen-dec-2024
Browse files Browse the repository at this point in the history
  • Loading branch information
adetaylor committed Jan 8, 2025
2 parents 5f44c00 + bea6877 commit 248bbde
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 93 deletions.
113 changes: 21 additions & 92 deletions Cargo.lock

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

5 changes: 4 additions & 1 deletion integration-tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ categories = ["development-tools::ffi", "api-bindings"]

[dependencies]
proc-macro2 = "1.0.11"
trybuild = "1.0.53"
# More recent versions of trybuild don't work due to
# https://github.com/dtolnay/trybuild/issues/283
# There are some workarounds suggested there if needs be.
trybuild = "=1.0.81"
test-log = "0.2.2"
env_logger = "0.9.0"
rust_info = "0.3.1"
Expand Down

0 comments on commit 248bbde

Please sign in to comment.