Auto merge of #1960 - RalfJung:rustup, r=RalfJung

rustup Cc rust-lang/rust#92691
rust-lang · Jan 9, 2022 · c8b3cf0 · c8b3cf0
2 parents 5d21a5d + ee6198f
commit c8b3cf0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-66f64a441a05cee8d5d701477b43ed851f778f3a
+e19ca1d946269f7b7eb13171531caf2e16f42076
diff --git a/src/helpers.rs b/src/helpers.rs
@@ -27,7 +27,7 @@ fn try_resolve_did<'mir, 'tcx>(tcx: TyCtxt<'tcx>, path: &[&str]) -> Option<DefId
     tcx.crates(()).iter().find(|&&krate| tcx.crate_name(krate).as_str() == path[0]).and_then(
         |krate| {
             let krate = DefId { krate: *krate, index: CRATE_DEF_INDEX };
-            let mut items = tcx.item_children(krate);
+            let mut items = tcx.module_children(krate);
             let mut path_it = path.iter().skip(1).peekable();
 
             while let Some(segment) = path_it.next() {
@@ -37,7 +37,7 @@ fn try_resolve_did<'mir, 'tcx>(tcx: TyCtxt<'tcx>, path: &[&str]) -> Option<DefId
                             return Some(item.res.def_id());
                         }
 
-                        items = tcx.item_children(item.res.def_id());
+                        items = tcx.module_children(item.res.def_id());
                         break;
                     }
                 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		66f64a441a05cee8d5d701477b43ed851f778f3a
		e19ca1d946269f7b7eb13171531caf2e16f42076