fix(upstream): FnDef gains binder

Author: nbdd0121

.zed/settings.json

@@ -1,4 +1,5 @@
 {
+  "preferred_line_length": 100,
   "lsp": {
     "rust-analyzer": {
       "initialization_options": {

flake.lock

@@ -3,5 +3,5 @@
 # SPDX-License-Identifier: MIT OR Apache-2.0
 
 [toolchain]
-channel = "nightly-2026-06-29"
+channel = "nightly-2026-07-14"
 components = ["llvm-tools-preview", "rustc-dev", "rust-src"]

rust-toolchain.toml

@@ -117,7 +117,7 @@ pub fn recover_fn_call_span<'tcx>(
                     tcx,
                     ty::TypingEnv::fully_monomorphized(),
                     def_id,
-                    args,
+                    args.no_bound_vars().unwrap(),
                     terminator.source_info.span,
                 );
                 if tcx.symbol_name(instance).name != callee {

src/binary_analysis/reconstruct.rs

@@ -688,7 +688,7 @@ impl<'a, 'tcx> MirVisitor<'tcx> for MirUsedCollector<'a, 'tcx> {
                             self.tcx,
                             ty::TypingEnv::fully_monomorphized(),
                             def_id,
-                            args,
+                            args.no_bound_vars().unwrap(),
                             source,
                         )
                         && instance.def.requires_caller_location(self.tcx)
@@ -791,6 +791,7 @@ fn visit_fn_use<'tcx>(
     output: &mut MonoItems<'tcx>,
 ) {
     if let ty::FnDef(def_id, args) = *ty.kind() {
+        let args = args.no_bound_vars().unwrap();
         let instance = if is_direct_call {
             ty::Instance::expect_resolve(
                 tcx,
@@ -1167,6 +1168,7 @@ fn visit_mentioned_item<'tcx>(
     match *item {
         MentionedItem::Fn(ty) => {
             if let ty::FnDef(def_id, args) = *ty.kind() {
+                let args = args.no_bound_vars().unwrap();
                 let instance = Instance::expect_resolve(
                     tcx,
                     ty::TypingEnv::fully_monomorphized(),

src/monomorphize_collector.rs

@@ -163,7 +163,7 @@ impl<'mir, 'tcx, 'cx> MirNeighborVisitor<'mir, 'tcx, 'cx> {
                 let fn_ty = self.monomorphize(fn_ty);
                 if let ty::FnDef(def_id, args) = *fn_ty.kind() {
                     let instance =
-                        ty::Instance::try_resolve(self.cx.tcx, self.typing_env, def_id, args)
+                        ty::Instance::try_resolve(self.cx.tcx, self.typing_env, def_id, args.no_bound_vars().unwrap())
                             .unwrap()
                             .ok_or(Error::TooGeneric)?;
                     self.check_fn_pointer_cast(instance, span)?;
@@ -252,7 +252,7 @@ impl<'mir, 'tcx, 'cx> MirNeighborVisitor<'mir, 'tcx, 'cx> {
 
                 if let ty::FnDef(def_id, args) = *callee_ty.kind() {
                     let instance =
-                        ty::Instance::try_resolve(self.cx.tcx, self.typing_env, def_id, args)
+                        ty::Instance::try_resolve(self.cx.tcx, self.typing_env, def_id, args.no_bound_vars().unwrap())
                             .unwrap()
                             .ok_or(Error::TooGeneric)?;
                     self.cx.call_stack.borrow_mut().push(UseSite {
@@ -290,7 +290,7 @@ impl<'mir, 'tcx, 'cx> MirNeighborVisitor<'mir, 'tcx, 'cx> {
                                     self.cx.tcx,
                                     self.typing_env,
                                     def_id,
-                                    args,
+                                    args.no_bound_vars().unwrap(),
                                 )
                                 .unwrap()
                                 .ok_or(Error::TooGeneric)?;

src/preempt_count/check.rs

@@ -149,7 +149,7 @@ impl<'tcx> Analysis<'tcx> for AdjustmentComputation<'_, 'tcx, '_> {
                             self.checker.tcx,
                             self.typing_env,
                             def_id,
-                            args,
+                            args.no_bound_vars().unwrap(),
                         )
                         .unwrap()
                         {

src/preempt_count/dataflow.rs

@@ -44,7 +44,7 @@ impl<'tcx> AnalysisCtxt<'tcx> {
                         v
                     } else {
                         let callee_instance =
-                            ty::Instance::try_resolve(self.tcx, typing_env, def_id, args)
+                            ty::Instance::try_resolve(self.tcx, typing_env, def_id, args.no_bound_vars().unwrap())
                                 .unwrap()
                                 .ok_or(Error::TooGeneric)?;
                         self.call_stack.borrow_mut().push(UseSite {
@@ -155,7 +155,7 @@ impl<'tcx> AnalysisCtxt<'tcx> {
                             return Ok(());
                         } else {
                             let callee_instance =
-                                ty::Instance::try_resolve(self.tcx, typing_env, def_id, args)
+                                ty::Instance::try_resolve(self.tcx, typing_env, def_id, args.no_bound_vars().unwrap())
                                     .unwrap()
                                     .ok_or(Error::TooGeneric)?;