Merge with upstream

Author: lilyyy411

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name    = "bon-macros"
-version = "3.6.0"
+version = "3.6.1"
 
 description = """
 This is a proc-macro crate that is supposed to be a private implementation

bon-macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name    = "bon-sandbox"
-version = "3.6.0"
+version = "3.6.1"
 
 description = """
   Not a real crate! It's just a showcase of examples used by `bon`'s documentation
@@ -36,4 +36,4 @@ typed-builder  = "0.20"
 [dependencies.bon]
 features = ["experimental-overwritable"]
 path     = "../bon"
-version  = "=3.6.0"
+version  = "=3.6.1"

bon-sandbox/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name    = "bon"
-version = "3.6.0"
+version = "3.6.1"
 
 description = "Next-gen compile-time-checked builder generator, named function's arguments, and more!"
 
@@ -45,7 +45,7 @@ workspace = true
 # The version of the macro crate is pinned to a specific one because the code
 # generated by the macros uses private APIs from the runtime crate that are not
 # guarded by semver.
-bon-macros  = { path = "../bon-macros", version = "=3.6.0" }
+bon-macros  = { path = "../bon-macros", version = "=3.6.1" }
 rustversion = "1"
 
 [dev-dependencies]

bon/Cargo.toml

@@ -36,7 +36,6 @@ mod msrv_1_86 {
         #[target_feature(enable = "avx2")]
         #[allow(unsafe_code, reason = "we don't do anything with it")]
         unsafe fn briiick() {
-            let x: &str = 1
             Senti::builder().brick(Brick([0; 32])).yatta_but_wide();
         }
     }

bon/tests/integration/builder/target_feature.rs

@@ -72,7 +72,6 @@ fn destructuring2((_, _): (u32, u32)) {}
 #[track_caller]
 #[track_caller]
 fn double_track_caller() {}
-
 #[builder]
 #[target_feature(enable = "sse2")]
 #[target_feature(enable = "avx")]

bon/tests/integration/ui/compile_fail/attr_builder.rs

@@ -91,7 +91,7 @@ error: found multiple #[track_caller], but bon only works with exactly one or ze
    | ^
 
 error: found multiple #[target_feature], but bon only works with exactly one or zero.
-  --> tests/integration/ui/compile_fail/attr_builder.rs:78:1
+  --> tests/integration/ui/compile_fail/attr_builder.rs:77:1
    |
-78 | #[target_feature(enable = "avx")]
+77 | #[target_feature(enable = "avx")]
    | ^

bon/tests/integration/ui/compile_fail/attr_builder.stderr

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [3.6.1](https://github.com/elastio/bon/compare/v3.6.0...v3.6.1) - 2025-04-15
+
+### Fixed
+
+- Propagate `#[track_caller]` to the generated finishing function from the underlying function/method ([#282](https://github.com/elastio/bon/pull/282)). Thanks [@Lilyyy411](https://github.com/lilyyy411) for the contribution!
+
 ## [3.6.0](https://github.com/elastio/bon/compare/v3.5.2...v3.6.0) - 2025-04-13
 
 ### Added