Auto merge of #148885 - Zalathar:rollup-wrvewer, r=Zalathar

Rollup of 7 pull requests
Successful merges:
- #147701 (rustdoc: don't ignore path distance for doc aliases)
- #148735 (Fix ICE caused by invalid spans for shrink_file)
- #148839 (fix rtsan_nonblocking_async lint closure ICE)
- #148846 (add a test for combining RPIT with explicit tail calls)
- #148872 (fix: Do not ICE when missing match arm with ill-formed subty is met)
- #148880 (Remove explicit install of `eslint` inside of `tidy`'s Dockerfile)
- #148883 (bootstrap: dont require cmake if local-rebuild is enabled)
r? `@ghost`
`@rustbot` modify labels: rollup

Author: bors

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -469,16 +469,18 @@ fn check_result(
 })
 }
 
-// warn for nonblocking async fn.
+// warn for nonblocking async functions, blocks and closures.
 // This doesn't behave as expected, because the executor can run blocking code without the sanitizer noticing.
 if codegen_fn_attrs.sanitizers.rtsan_setting == RtsanSetting::Nonblocking
  && letSome(sanitize_span) = interesting_spans.sanitize
-// async function
- && (tcx.asyncness(did).is_async() || (tcx.is_closure_like(did.into())
+// async fn
+ && (tcx.asyncness(did).is_async()
 // async block
- && (tcx.coroutine_is_async(did.into())
-// async closure
- || tcx.coroutine_is_async(tcx.coroutine_for_closure(did)))))
+ || tcx.is_coroutine(did.into())
+// async closure
+ || (tcx.is_closure_like(did.into())
+ && tcx.hir_node_by_def_id(did).expect_closure().kind
+ != rustc_hir::ClosureKind::Closure))
 {
 let hir_id = tcx.local_def_id_to_hir_id(did);
  tcx.node_span_lint(

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

@@ -350,22 +350,27 @@ impl AnnotateSnippetEmitter {
 "all spans must be disjoint",
 );
 
+let lo = subst.parts.iter().map(|part| part.span.lo()).min()?;
+let lo_file = sm.lookup_source_file(lo);
+let hi = subst.parts.iter().map(|part| part.span.hi()).max()?;
+let hi_file = sm.lookup_source_file(hi);
+
+// The different spans might belong to different contexts, if so ignore suggestion.
+if lo_file.stable_id != hi_file.stable_id{
+returnNone;
+}
+
+// We can't splice anything if the source is unavailable.
+if !sm.ensure_source_file_source_present(&lo_file){
+returnNone;
+}
+
 // Account for cases where we are suggesting the same code that's already
 // there. This shouldn't happen often, but in some cases for multipart
 // suggestions it's much easier to handle it here than in the origin.
  subst.parts.retain(|p| is_different(sm,&p.snippet, p.span));
 
-let item_span = subst.parts.first()?;
-let file = sm.lookup_source_file(item_span.span.lo());
-ifshould_show_source_code(
-&self.ignored_directories_in_source_blocks,
- sm,
-&file,
-){
-Some(subst)
-}else{
-None
-}
+if subst.parts.is_empty(){None}else{Some(subst)}
 })
 .collect::<Vec<_>>();
 
@@ -745,14 +750,20 @@ fn shrink_file(
 ) -> Option<(Span,String,usize)>{
 let lo_byte = spans.iter().map(|s| s.lo()).min()?;
 let lo_loc = sm.lookup_char_pos(lo_byte);
-let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
 
 let hi_byte = spans.iter().map(|s| s.hi()).max()?;
 let hi_loc = sm.lookup_char_pos(hi_byte);
-let hi = lo_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
+
+if lo_loc.file.stable_id != hi_loc.file.stable_id{
+// this may happen when spans cross file boundaries due to macro expansion.
+returnNone;
+}
+
+let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
+let hi = hi_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
 
 let bounding_span = Span::with_root_ctxt(lo, hi);
-let source = sm.span_to_snippet(bounding_span).unwrap_or_default();
+let source = sm.span_to_snippet(bounding_span).ok()?;
 let offset_line = sm.doctest_offset_line(file_name, lo_loc.line);
 
 Some((bounding_span, source, offset_line))

compiler/rustc_pattern_analysis/src/rustc.rs

@@ -191,7 +191,18 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
  variant.fields.iter().map(move |field| {
 let ty = field.ty(self.tcx, args);
 // `field.ty()` doesn't normalize after instantiating.
-let ty = self.tcx.normalize_erasing_regions(self.typing_env, ty);
+let ty =
+self.tcx.try_normalize_erasing_regions(self.typing_env, ty).unwrap_or_else(|e| {
+self.tcx.dcx().span_delayed_bug(
+self.scrut_span,
+format!(
+"Failed to normalize {:?} in typing_env={:?} while getting variant sub tys for {ty:?}",
+ e.get_type_for_failure(),
+self.typing_env,
+),
+);
+ ty
+});
 let ty = self.reveal_opaque_ty(ty);
 (field, ty)
 })

src/bootstrap/src/core/sanity.rs

@@ -142,6 +142,7 @@ pub fn check(build: &mut Build) {
 
 // We need cmake, but only if we're actually building LLVM or sanitizers.
 let building_llvm = !build.config.llvm_from_ci
+ && !build.config.local_rebuild
  && build.hosts.iter().any(|host| {
  build.config.llvm_enabled(*host)
  && build

src/ci/docker/host-x86_64/tidy/Dockerfile

@@ -28,9 +28,6 @@ COPY scripts/nodejs.sh /scripts/
 RUN sh /scripts/nodejs.sh /node
 ENV PATH="/node/bin:${PATH}"
 
-# Install eslint
-COPY host-x86_64/tidy/eslint.version /tmp/
-
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
@@ -40,8 +37,6 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
 
 COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
 
-RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
-
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
 ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \

src/ci/docker/host-x86_64/tidy/eslint.version

@@ -3926,16 +3926,25 @@ class DocSearch {
  * @returns {Promise<rustdoc.PlainResultObject?>}
  */
 consthandleAlias=async(name,alias,dist,index)=>{
+constitem=nonnull(awaitthis.getRow(alias,false));
+// space both is an alias for ::,
+// and is also allowed to appear in doc alias names
+constpath_dist=name.includes(" ")||parsedQuery.elems.length===0 ?
+0 : checkRowPath(parsedQuery.elems[0].pathWithoutLast,item);
+// path distance exceeds max, omit alias from results
+if(path_dist===null){
+returnnull;
+}
 return{
 id: alias,
  dist,
-path_dist: 0,
+ path_dist,
  index,
 alias: name,
 is_alias: true,
 elems: [],// only used in type-based queries
 returned: [],// only used in type-based queries
-item: nonnull(awaitthis.getRow(alias,false)),
+ item,
 };
 };
 /**

src/librustdoc/html/static/js/search.js

@@ -0,0 +1,32 @@
+// exact-check
+
+// consider path distance for doc aliases
+// regression test for <https://github.com/rust-lang/rust/issues/146214>
+
+constEXPECTED=[
+{
+'query': 'Foo::zzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': '"Foo::zzz"',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'Foo::zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+{'path': 'alias_path_distance::Bar','name': 'baz'},
+],
+},
+];

tests/rustdoc-js/alias-path-distance-146214.js

@@ -0,0 +1,14 @@
+#![crate_name = "alias_path_distance"]
+
+pubstructFoo;
+pubstructBar;
+
+implFoo{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}
+
+implBar{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}

tests/rustdoc-js/alias-path-distance-146214.rs

@@ -0,0 +1,10 @@
+// rank doc aliases lower than exact matches
+// regression test for <https://github.com/rust-lang/rust/issues/140968>
+
+constEXPECTED={
+'query': 'Foo',
+'others': [
+{'path': 'alias_rank_lower','name': 'Foo'},
+{'path': 'alias_rank_lower','name': 'Bar'},
+],
+};

tests/rustdoc-js/alias-rank-lower-140968.js

@@ -469,16 +469,18 @@ fn check_result(
 })
 }
 
-// warn for nonblocking async fn.
+// warn for nonblocking async functions, blocks and closures.
 // This doesn't behave as expected, because the executor can run blocking code without the sanitizer noticing.
 if codegen_fn_attrs.sanitizers.rtsan_setting == RtsanSetting::Nonblocking
  && letSome(sanitize_span) = interesting_spans.sanitize
-// async function
- && (tcx.asyncness(did).is_async() || (tcx.is_closure_like(did.into())
+// async fn
+ && (tcx.asyncness(did).is_async()
 // async block
- && (tcx.coroutine_is_async(did.into())
-// async closure
- || tcx.coroutine_is_async(tcx.coroutine_for_closure(did)))))
+ || tcx.is_coroutine(did.into())
+// async closure
+ || (tcx.is_closure_like(did.into())
+ && tcx.hir_node_by_def_id(did).expect_closure().kind
+ != rustc_hir::ClosureKind::Closure))
 {
 let hir_id = tcx.local_def_id_to_hir_id(did);
  tcx.node_span_lint(

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -350,22 +350,27 @@ impl AnnotateSnippetEmitter {
 "all spans must be disjoint",
 );
 
+let lo = subst.parts.iter().map(|part| part.span.lo()).min()?;
+let lo_file = sm.lookup_source_file(lo);
+let hi = subst.parts.iter().map(|part| part.span.hi()).max()?;
+let hi_file = sm.lookup_source_file(hi);
+
+// The different spans might belong to different contexts, if so ignore suggestion.
+if lo_file.stable_id != hi_file.stable_id{
+returnNone;
+}
+
+// We can't splice anything if the source is unavailable.
+if !sm.ensure_source_file_source_present(&lo_file){
+returnNone;
+}
+
 // Account for cases where we are suggesting the same code that's already
 // there. This shouldn't happen often, but in some cases for multipart
 // suggestions it's much easier to handle it here than in the origin.
  subst.parts.retain(|p| is_different(sm,&p.snippet, p.span));
 
-let item_span = subst.parts.first()?;
-let file = sm.lookup_source_file(item_span.span.lo());
-ifshould_show_source_code(
-&self.ignored_directories_in_source_blocks,
- sm,
-&file,
-){
-Some(subst)
-}else{
-None
-}
+if subst.parts.is_empty(){None}else{Some(subst)}
 })
 .collect::<Vec<_>>();
 
@@ -745,14 +750,20 @@ fn shrink_file(
 ) -> Option<(Span,String,usize)>{
 let lo_byte = spans.iter().map(|s| s.lo()).min()?;
 let lo_loc = sm.lookup_char_pos(lo_byte);
-let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
 
 let hi_byte = spans.iter().map(|s| s.hi()).max()?;
 let hi_loc = sm.lookup_char_pos(hi_byte);
-let hi = lo_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
+
+if lo_loc.file.stable_id != hi_loc.file.stable_id{
+// this may happen when spans cross file boundaries due to macro expansion.
+returnNone;
+}
+
+let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
+let hi = hi_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
 
 let bounding_span = Span::with_root_ctxt(lo, hi);
-let source = sm.span_to_snippet(bounding_span).unwrap_or_default();
+let source = sm.span_to_snippet(bounding_span).ok()?;
 let offset_line = sm.doctest_offset_line(file_name, lo_loc.line);
 
 Some((bounding_span, source, offset_line))

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

@@ -191,7 +191,18 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
  variant.fields.iter().map(move |field| {
 let ty = field.ty(self.tcx, args);
 // `field.ty()` doesn't normalize after instantiating.
-let ty = self.tcx.normalize_erasing_regions(self.typing_env, ty);
+let ty =
+self.tcx.try_normalize_erasing_regions(self.typing_env, ty).unwrap_or_else(|e| {
+self.tcx.dcx().span_delayed_bug(
+self.scrut_span,
+format!(
+"Failed to normalize {:?} in typing_env={:?} while getting variant sub tys for {ty:?}",
+ e.get_type_for_failure(),
+self.typing_env,
+),
+);
+ ty
+});
 let ty = self.reveal_opaque_ty(ty);
 (field, ty)
 })

compiler/rustc_pattern_analysis/src/rustc.rs

@@ -142,6 +142,7 @@ pub fn check(build: &mut Build) {
 
 // We need cmake, but only if we're actually building LLVM or sanitizers.
 let building_llvm = !build.config.llvm_from_ci
+ && !build.config.local_rebuild
  && build.hosts.iter().any(|host| {
  build.config.llvm_enabled(*host)
  && build

src/bootstrap/src/core/sanity.rs

@@ -28,9 +28,6 @@ COPY scripts/nodejs.sh /scripts/
 RUN sh /scripts/nodejs.sh /node
 ENV PATH="/node/bin:${PATH}"
 
-# Install eslint
-COPY host-x86_64/tidy/eslint.version /tmp/
-
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
@@ -40,8 +37,6 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
 
 COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
 
-RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
-
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
 ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \

src/ci/docker/host-x86_64/tidy/Dockerfile

@@ -3926,16 +3926,25 @@ class DocSearch {
  * @returns {Promise<rustdoc.PlainResultObject?>}
  */
 consthandleAlias=async(name,alias,dist,index)=>{
+constitem=nonnull(awaitthis.getRow(alias,false));
+// space both is an alias for ::,
+// and is also allowed to appear in doc alias names
+constpath_dist=name.includes(" ")||parsedQuery.elems.length===0 ?
+0 : checkRowPath(parsedQuery.elems[0].pathWithoutLast,item);
+// path distance exceeds max, omit alias from results
+if(path_dist===null){
+returnnull;
+}
 return{
 id: alias,
  dist,
-path_dist: 0,
+ path_dist,
  index,
 alias: name,
 is_alias: true,
 elems: [],// only used in type-based queries
 returned: [],// only used in type-based queries
-item: nonnull(awaitthis.getRow(alias,false)),
+ item,
 };
 };
 /**

src/ci/docker/host-x86_64/tidy/eslint.version

@@ -0,0 +1,32 @@
+// exact-check
+
+// consider path distance for doc aliases
+// regression test for <https://github.com/rust-lang/rust/issues/146214>
+
+constEXPECTED=[
+{
+'query': 'Foo::zzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': '"Foo::zzz"',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'Foo::zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+{'path': 'alias_path_distance::Bar','name': 'baz'},
+],
+},
+];

src/librustdoc/html/static/js/search.js

@@ -0,0 +1,14 @@
+#![crate_name = "alias_path_distance"]
+
+pubstructFoo;
+pubstructBar;
+
+implFoo{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}
+
+implBar{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}

tests/rustdoc-js/alias-path-distance-146214.js

@@ -0,0 +1,10 @@
+// rank doc aliases lower than exact matches
+// regression test for <https://github.com/rust-lang/rust/issues/140968>
+
+constEXPECTED={
+'query': 'Foo',
+'others': [
+{'path': 'alias_rank_lower','name': 'Foo'},
+{'path': 'alias_rank_lower','name': 'Bar'},
+],
+};

tests/rustdoc-js/alias-path-distance-146214.rs

@@ -469,16 +469,18 @@ fn check_result(
 })
 }
 
-// warn for nonblocking async fn.
+// warn for nonblocking async functions, blocks and closures.
 // This doesn't behave as expected, because the executor can run blocking code without the sanitizer noticing.
 if codegen_fn_attrs.sanitizers.rtsan_setting == RtsanSetting::Nonblocking
  && letSome(sanitize_span) = interesting_spans.sanitize
-// async function
- && (tcx.asyncness(did).is_async() || (tcx.is_closure_like(did.into())
+// async fn
+ && (tcx.asyncness(did).is_async()
 // async block
- && (tcx.coroutine_is_async(did.into())
-// async closure
- || tcx.coroutine_is_async(tcx.coroutine_for_closure(did)))))
+ || tcx.is_coroutine(did.into())
+// async closure
+ || (tcx.is_closure_like(did.into())
+ && tcx.hir_node_by_def_id(did).expect_closure().kind
+ != rustc_hir::ClosureKind::Closure))
 {
 let hir_id = tcx.local_def_id_to_hir_id(did);
  tcx.node_span_lint(

tests/rustdoc-js/alias-rank-lower-140968.js

@@ -350,22 +350,27 @@ impl AnnotateSnippetEmitter {
 "all spans must be disjoint",
 );
 
+let lo = subst.parts.iter().map(|part| part.span.lo()).min()?;
+let lo_file = sm.lookup_source_file(lo);
+let hi = subst.parts.iter().map(|part| part.span.hi()).max()?;
+let hi_file = sm.lookup_source_file(hi);
+
+// The different spans might belong to different contexts, if so ignore suggestion.
+if lo_file.stable_id != hi_file.stable_id{
+returnNone;
+}
+
+// We can't splice anything if the source is unavailable.
+if !sm.ensure_source_file_source_present(&lo_file){
+returnNone;
+}
+
 // Account for cases where we are suggesting the same code that's already
 // there. This shouldn't happen often, but in some cases for multipart
 // suggestions it's much easier to handle it here than in the origin.
  subst.parts.retain(|p| is_different(sm,&p.snippet, p.span));
 
-let item_span = subst.parts.first()?;
-let file = sm.lookup_source_file(item_span.span.lo());
-ifshould_show_source_code(
-&self.ignored_directories_in_source_blocks,
- sm,
-&file,
-){
-Some(subst)
-}else{
-None
-}
+if subst.parts.is_empty(){None}else{Some(subst)}
 })
 .collect::<Vec<_>>();
 
@@ -745,14 +750,20 @@ fn shrink_file(
 ) -> Option<(Span,String,usize)>{
 let lo_byte = spans.iter().map(|s| s.lo()).min()?;
 let lo_loc = sm.lookup_char_pos(lo_byte);
-let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
 
 let hi_byte = spans.iter().map(|s| s.hi()).max()?;
 let hi_loc = sm.lookup_char_pos(hi_byte);
-let hi = lo_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
+
+if lo_loc.file.stable_id != hi_loc.file.stable_id{
+// this may happen when spans cross file boundaries due to macro expansion.
+returnNone;
+}
+
+let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
+let hi = hi_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
 
 let bounding_span = Span::with_root_ctxt(lo, hi);
-let source = sm.span_to_snippet(bounding_span).unwrap_or_default();
+let source = sm.span_to_snippet(bounding_span).ok()?;
 let offset_line = sm.doctest_offset_line(file_name, lo_loc.line);
 
 Some((bounding_span, source, offset_line))

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -191,7 +191,18 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
  variant.fields.iter().map(move |field| {
 let ty = field.ty(self.tcx, args);
 // `field.ty()` doesn't normalize after instantiating.
-let ty = self.tcx.normalize_erasing_regions(self.typing_env, ty);
+let ty =
+self.tcx.try_normalize_erasing_regions(self.typing_env, ty).unwrap_or_else(|e| {
+self.tcx.dcx().span_delayed_bug(
+self.scrut_span,
+format!(
+"Failed to normalize {:?} in typing_env={:?} while getting variant sub tys for {ty:?}",
+ e.get_type_for_failure(),
+self.typing_env,
+),
+);
+ ty
+});
 let ty = self.reveal_opaque_ty(ty);
 (field, ty)
 })

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

@@ -142,6 +142,7 @@ pub fn check(build: &mut Build) {
 
 // We need cmake, but only if we're actually building LLVM or sanitizers.
 let building_llvm = !build.config.llvm_from_ci
+ && !build.config.local_rebuild
  && build.hosts.iter().any(|host| {
  build.config.llvm_enabled(*host)
  && build

compiler/rustc_pattern_analysis/src/rustc.rs

@@ -28,9 +28,6 @@ COPY scripts/nodejs.sh /scripts/
 RUN sh /scripts/nodejs.sh /node
 ENV PATH="/node/bin:${PATH}"
 
-# Install eslint
-COPY host-x86_64/tidy/eslint.version /tmp/
-
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
@@ -40,8 +37,6 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
 
 COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
 
-RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
-
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
 ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \

src/bootstrap/src/core/sanity.rs

@@ -3926,16 +3926,25 @@ class DocSearch {
  * @returns {Promise<rustdoc.PlainResultObject?>}
  */
 consthandleAlias=async(name,alias,dist,index)=>{
+constitem=nonnull(awaitthis.getRow(alias,false));
+// space both is an alias for ::,
+// and is also allowed to appear in doc alias names
+constpath_dist=name.includes(" ")||parsedQuery.elems.length===0 ?
+0 : checkRowPath(parsedQuery.elems[0].pathWithoutLast,item);
+// path distance exceeds max, omit alias from results
+if(path_dist===null){
+returnnull;
+}
 return{
 id: alias,
  dist,
-path_dist: 0,
+ path_dist,
  index,
 alias: name,
 is_alias: true,
 elems: [],// only used in type-based queries
 returned: [],// only used in type-based queries
-item: nonnull(awaitthis.getRow(alias,false)),
+ item,
 };
 };
 /**

src/ci/docker/host-x86_64/tidy/Dockerfile

@@ -0,0 +1,32 @@
+// exact-check
+
+// consider path distance for doc aliases
+// regression test for <https://github.com/rust-lang/rust/issues/146214>
+
+constEXPECTED=[
+{
+'query': 'Foo::zzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': '"Foo::zzz"',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'Foo::zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+{'path': 'alias_path_distance::Bar','name': 'baz'},
+],
+},
+];

src/ci/docker/host-x86_64/tidy/eslint.version

@@ -0,0 +1,14 @@
+#![crate_name = "alias_path_distance"]
+
+pubstructFoo;
+pubstructBar;
+
+implFoo{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}
+
+implBar{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}

src/librustdoc/html/static/js/search.js

@@ -0,0 +1,10 @@
+// rank doc aliases lower than exact matches
+// regression test for <https://github.com/rust-lang/rust/issues/140968>
+
+constEXPECTED={
+'query': 'Foo',
+'others': [
+{'path': 'alias_rank_lower','name': 'Foo'},
+{'path': 'alias_rank_lower','name': 'Bar'},
+],
+};

tests/rustdoc-js/alias-path-distance-146214.js

@@ -469,16 +469,18 @@ fn check_result(
 })
 }
 
-// warn for nonblocking async fn.
+// warn for nonblocking async functions, blocks and closures.
 // This doesn't behave as expected, because the executor can run blocking code without the sanitizer noticing.
 if codegen_fn_attrs.sanitizers.rtsan_setting == RtsanSetting::Nonblocking
  && letSome(sanitize_span) = interesting_spans.sanitize
-// async function
- && (tcx.asyncness(did).is_async() || (tcx.is_closure_like(did.into())
+// async fn
+ && (tcx.asyncness(did).is_async()
 // async block
- && (tcx.coroutine_is_async(did.into())
-// async closure
- || tcx.coroutine_is_async(tcx.coroutine_for_closure(did)))))
+ || tcx.is_coroutine(did.into())
+// async closure
+ || (tcx.is_closure_like(did.into())
+ && tcx.hir_node_by_def_id(did).expect_closure().kind
+ != rustc_hir::ClosureKind::Closure))
 {
 let hir_id = tcx.local_def_id_to_hir_id(did);
  tcx.node_span_lint(

tests/rustdoc-js/alias-path-distance-146214.rs

@@ -350,22 +350,27 @@ impl AnnotateSnippetEmitter {
 "all spans must be disjoint",
 );
 
+let lo = subst.parts.iter().map(|part| part.span.lo()).min()?;
+let lo_file = sm.lookup_source_file(lo);
+let hi = subst.parts.iter().map(|part| part.span.hi()).max()?;
+let hi_file = sm.lookup_source_file(hi);
+
+// The different spans might belong to different contexts, if so ignore suggestion.
+if lo_file.stable_id != hi_file.stable_id{
+returnNone;
+}
+
+// We can't splice anything if the source is unavailable.
+if !sm.ensure_source_file_source_present(&lo_file){
+returnNone;
+}
+
 // Account for cases where we are suggesting the same code that's already
 // there. This shouldn't happen often, but in some cases for multipart
 // suggestions it's much easier to handle it here than in the origin.
  subst.parts.retain(|p| is_different(sm,&p.snippet, p.span));
 
-let item_span = subst.parts.first()?;
-let file = sm.lookup_source_file(item_span.span.lo());
-ifshould_show_source_code(
-&self.ignored_directories_in_source_blocks,
- sm,
-&file,
-){
-Some(subst)
-}else{
-None
-}
+if subst.parts.is_empty(){None}else{Some(subst)}
 })
 .collect::<Vec<_>>();
 
@@ -745,14 +750,20 @@ fn shrink_file(
 ) -> Option<(Span,String,usize)>{
 let lo_byte = spans.iter().map(|s| s.lo()).min()?;
 let lo_loc = sm.lookup_char_pos(lo_byte);
-let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
 
 let hi_byte = spans.iter().map(|s| s.hi()).max()?;
 let hi_loc = sm.lookup_char_pos(hi_byte);
-let hi = lo_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
+
+if lo_loc.file.stable_id != hi_loc.file.stable_id{
+// this may happen when spans cross file boundaries due to macro expansion.
+returnNone;
+}
+
+let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
+let hi = hi_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
 
 let bounding_span = Span::with_root_ctxt(lo, hi);
-let source = sm.span_to_snippet(bounding_span).unwrap_or_default();
+let source = sm.span_to_snippet(bounding_span).ok()?;
 let offset_line = sm.doctest_offset_line(file_name, lo_loc.line);
 
 Some((bounding_span, source, offset_line))

tests/rustdoc-js/alias-rank-lower-140968.js

@@ -191,7 +191,18 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
  variant.fields.iter().map(move |field| {
 let ty = field.ty(self.tcx, args);
 // `field.ty()` doesn't normalize after instantiating.
-let ty = self.tcx.normalize_erasing_regions(self.typing_env, ty);
+let ty =
+self.tcx.try_normalize_erasing_regions(self.typing_env, ty).unwrap_or_else(|e| {
+self.tcx.dcx().span_delayed_bug(
+self.scrut_span,
+format!(
+"Failed to normalize {:?} in typing_env={:?} while getting variant sub tys for {ty:?}",
+ e.get_type_for_failure(),
+self.typing_env,
+),
+);
+ ty
+});
 let ty = self.reveal_opaque_ty(ty);
 (field, ty)
 })

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -142,6 +142,7 @@ pub fn check(build: &mut Build) {
 
 // We need cmake, but only if we're actually building LLVM or sanitizers.
 let building_llvm = !build.config.llvm_from_ci
+ && !build.config.local_rebuild
  && build.hosts.iter().any(|host| {
  build.config.llvm_enabled(*host)
  && build

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

@@ -28,9 +28,6 @@ COPY scripts/nodejs.sh /scripts/
 RUN sh /scripts/nodejs.sh /node
 ENV PATH="/node/bin:${PATH}"
 
-# Install eslint
-COPY host-x86_64/tidy/eslint.version /tmp/
-
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
@@ -40,8 +37,6 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
 
 COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
 
-RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
-
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
 ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \

compiler/rustc_pattern_analysis/src/rustc.rs

@@ -3926,16 +3926,25 @@ class DocSearch {
  * @returns {Promise<rustdoc.PlainResultObject?>}
  */
 consthandleAlias=async(name,alias,dist,index)=>{
+constitem=nonnull(awaitthis.getRow(alias,false));
+// space both is an alias for ::,
+// and is also allowed to appear in doc alias names
+constpath_dist=name.includes(" ")||parsedQuery.elems.length===0 ?
+0 : checkRowPath(parsedQuery.elems[0].pathWithoutLast,item);
+// path distance exceeds max, omit alias from results
+if(path_dist===null){
+returnnull;
+}
 return{
 id: alias,
  dist,
-path_dist: 0,
+ path_dist,
  index,
 alias: name,
 is_alias: true,
 elems: [],// only used in type-based queries
 returned: [],// only used in type-based queries
-item: nonnull(awaitthis.getRow(alias,false)),
+ item,
 };
 };
 /**

src/bootstrap/src/core/sanity.rs

@@ -0,0 +1,32 @@
+// exact-check
+
+// consider path distance for doc aliases
+// regression test for <https://github.com/rust-lang/rust/issues/146214>
+
+constEXPECTED=[
+{
+'query': 'Foo::zzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': '"Foo::zzz"',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'Foo::zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+{'path': 'alias_path_distance::Bar','name': 'baz'},
+],
+},
+];

src/ci/docker/host-x86_64/tidy/Dockerfile

@@ -0,0 +1,14 @@
+#![crate_name = "alias_path_distance"]
+
+pubstructFoo;
+pubstructBar;
+
+implFoo{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}
+
+implBar{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}

src/ci/docker/host-x86_64/tidy/eslint.version

@@ -0,0 +1,10 @@
+// rank doc aliases lower than exact matches
+// regression test for <https://github.com/rust-lang/rust/issues/140968>
+
+constEXPECTED={
+'query': 'Foo',
+'others': [
+{'path': 'alias_rank_lower','name': 'Foo'},
+{'path': 'alias_rank_lower','name': 'Bar'},
+],
+};

src/librustdoc/html/static/js/search.js

@@ -469,16 +469,18 @@ fn check_result(
 })
 }
 
-// warn for nonblocking async fn.
+// warn for nonblocking async functions, blocks and closures.
 // This doesn't behave as expected, because the executor can run blocking code without the sanitizer noticing.
 if codegen_fn_attrs.sanitizers.rtsan_setting == RtsanSetting::Nonblocking
  && letSome(sanitize_span) = interesting_spans.sanitize
-// async function
- && (tcx.asyncness(did).is_async() || (tcx.is_closure_like(did.into())
+// async fn
+ && (tcx.asyncness(did).is_async()
 // async block
- && (tcx.coroutine_is_async(did.into())
-// async closure
- || tcx.coroutine_is_async(tcx.coroutine_for_closure(did)))))
+ || tcx.is_coroutine(did.into())
+// async closure
+ || (tcx.is_closure_like(did.into())
+ && tcx.hir_node_by_def_id(did).expect_closure().kind
+ != rustc_hir::ClosureKind::Closure))
 {
 let hir_id = tcx.local_def_id_to_hir_id(did);
  tcx.node_span_lint(

tests/rustdoc-js/alias-path-distance-146214.js

@@ -350,22 +350,27 @@ impl AnnotateSnippetEmitter {
 "all spans must be disjoint",
 );
 
+let lo = subst.parts.iter().map(|part| part.span.lo()).min()?;
+let lo_file = sm.lookup_source_file(lo);
+let hi = subst.parts.iter().map(|part| part.span.hi()).max()?;
+let hi_file = sm.lookup_source_file(hi);
+
+// The different spans might belong to different contexts, if so ignore suggestion.
+if lo_file.stable_id != hi_file.stable_id{
+returnNone;
+}
+
+// We can't splice anything if the source is unavailable.
+if !sm.ensure_source_file_source_present(&lo_file){
+returnNone;
+}
+
 // Account for cases where we are suggesting the same code that's already
 // there. This shouldn't happen often, but in some cases for multipart
 // suggestions it's much easier to handle it here than in the origin.
  subst.parts.retain(|p| is_different(sm,&p.snippet, p.span));
 
-let item_span = subst.parts.first()?;
-let file = sm.lookup_source_file(item_span.span.lo());
-ifshould_show_source_code(
-&self.ignored_directories_in_source_blocks,
- sm,
-&file,
-){
-Some(subst)
-}else{
-None
-}
+if subst.parts.is_empty(){None}else{Some(subst)}
 })
 .collect::<Vec<_>>();
 
@@ -745,14 +750,20 @@ fn shrink_file(
 ) -> Option<(Span,String,usize)>{
 let lo_byte = spans.iter().map(|s| s.lo()).min()?;
 let lo_loc = sm.lookup_char_pos(lo_byte);
-let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
 
 let hi_byte = spans.iter().map(|s| s.hi()).max()?;
 let hi_loc = sm.lookup_char_pos(hi_byte);
-let hi = lo_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
+
+if lo_loc.file.stable_id != hi_loc.file.stable_id{
+// this may happen when spans cross file boundaries due to macro expansion.
+returnNone;
+}
+
+let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
+let hi = hi_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
 
 let bounding_span = Span::with_root_ctxt(lo, hi);
-let source = sm.span_to_snippet(bounding_span).unwrap_or_default();
+let source = sm.span_to_snippet(bounding_span).ok()?;
 let offset_line = sm.doctest_offset_line(file_name, lo_loc.line);
 
 Some((bounding_span, source, offset_line))

tests/rustdoc-js/alias-path-distance-146214.rs

@@ -191,7 +191,18 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
  variant.fields.iter().map(move |field| {
 let ty = field.ty(self.tcx, args);
 // `field.ty()` doesn't normalize after instantiating.
-let ty = self.tcx.normalize_erasing_regions(self.typing_env, ty);
+let ty =
+self.tcx.try_normalize_erasing_regions(self.typing_env, ty).unwrap_or_else(|e| {
+self.tcx.dcx().span_delayed_bug(
+self.scrut_span,
+format!(
+"Failed to normalize {:?} in typing_env={:?} while getting variant sub tys for {ty:?}",
+ e.get_type_for_failure(),
+self.typing_env,
+),
+);
+ ty
+});
 let ty = self.reveal_opaque_ty(ty);
 (field, ty)
 })

tests/rustdoc-js/alias-rank-lower-140968.js

@@ -142,6 +142,7 @@ pub fn check(build: &mut Build) {
 
 // We need cmake, but only if we're actually building LLVM or sanitizers.
 let building_llvm = !build.config.llvm_from_ci
+ && !build.config.local_rebuild
  && build.hosts.iter().any(|host| {
  build.config.llvm_enabled(*host)
  && build

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -28,9 +28,6 @@ COPY scripts/nodejs.sh /scripts/
 RUN sh /scripts/nodejs.sh /node
 ENV PATH="/node/bin:${PATH}"
 
-# Install eslint
-COPY host-x86_64/tidy/eslint.version /tmp/
-
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
@@ -40,8 +37,6 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
 
 COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
 
-RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
-
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
 ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

@@ -3926,16 +3926,25 @@ class DocSearch {
  * @returns {Promise<rustdoc.PlainResultObject?>}
  */
 consthandleAlias=async(name,alias,dist,index)=>{
+constitem=nonnull(awaitthis.getRow(alias,false));
+// space both is an alias for ::,
+// and is also allowed to appear in doc alias names
+constpath_dist=name.includes(" ")||parsedQuery.elems.length===0 ?
+0 : checkRowPath(parsedQuery.elems[0].pathWithoutLast,item);
+// path distance exceeds max, omit alias from results
+if(path_dist===null){
+returnnull;
+}
 return{
 id: alias,
  dist,
-path_dist: 0,
+ path_dist,
  index,
 alias: name,
 is_alias: true,
 elems: [],// only used in type-based queries
 returned: [],// only used in type-based queries
-item: nonnull(awaitthis.getRow(alias,false)),
+ item,
 };
 };
 /**

compiler/rustc_pattern_analysis/src/rustc.rs

@@ -0,0 +1,32 @@
+// exact-check
+
+// consider path distance for doc aliases
+// regression test for <https://github.com/rust-lang/rust/issues/146214>
+
+constEXPECTED=[
+{
+'query': 'Foo::zzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': '"Foo::zzz"',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'Foo::zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+{'path': 'alias_path_distance::Bar','name': 'baz'},
+],
+},
+];

src/bootstrap/src/core/sanity.rs

@@ -0,0 +1,14 @@
+#![crate_name = "alias_path_distance"]
+
+pubstructFoo;
+pubstructBar;
+
+implFoo{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}
+
+implBar{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}

src/ci/docker/host-x86_64/tidy/Dockerfile

@@ -0,0 +1,10 @@
+// rank doc aliases lower than exact matches
+// regression test for <https://github.com/rust-lang/rust/issues/140968>
+
+constEXPECTED={
+'query': 'Foo',
+'others': [
+{'path': 'alias_rank_lower','name': 'Foo'},
+{'path': 'alias_rank_lower','name': 'Bar'},
+],
+};

src/ci/docker/host-x86_64/tidy/eslint.version

@@ -469,16 +469,18 @@ fn check_result(
 })
 }
 
-// warn for nonblocking async fn.
+// warn for nonblocking async functions, blocks and closures.
 // This doesn't behave as expected, because the executor can run blocking code without the sanitizer noticing.
 if codegen_fn_attrs.sanitizers.rtsan_setting == RtsanSetting::Nonblocking
  && letSome(sanitize_span) = interesting_spans.sanitize
-// async function
- && (tcx.asyncness(did).is_async() || (tcx.is_closure_like(did.into())
+// async fn
+ && (tcx.asyncness(did).is_async()
 // async block
- && (tcx.coroutine_is_async(did.into())
-// async closure
- || tcx.coroutine_is_async(tcx.coroutine_for_closure(did)))))
+ || tcx.is_coroutine(did.into())
+// async closure
+ || (tcx.is_closure_like(did.into())
+ && tcx.hir_node_by_def_id(did).expect_closure().kind
+ != rustc_hir::ClosureKind::Closure))
 {
 let hir_id = tcx.local_def_id_to_hir_id(did);
  tcx.node_span_lint(

src/librustdoc/html/static/js/search.js

@@ -350,22 +350,27 @@ impl AnnotateSnippetEmitter {
 "all spans must be disjoint",
 );
 
+let lo = subst.parts.iter().map(|part| part.span.lo()).min()?;
+let lo_file = sm.lookup_source_file(lo);
+let hi = subst.parts.iter().map(|part| part.span.hi()).max()?;
+let hi_file = sm.lookup_source_file(hi);
+
+// The different spans might belong to different contexts, if so ignore suggestion.
+if lo_file.stable_id != hi_file.stable_id{
+returnNone;
+}
+
+// We can't splice anything if the source is unavailable.
+if !sm.ensure_source_file_source_present(&lo_file){
+returnNone;
+}
+
 // Account for cases where we are suggesting the same code that's already
 // there. This shouldn't happen often, but in some cases for multipart
 // suggestions it's much easier to handle it here than in the origin.
  subst.parts.retain(|p| is_different(sm,&p.snippet, p.span));
 
-let item_span = subst.parts.first()?;
-let file = sm.lookup_source_file(item_span.span.lo());
-ifshould_show_source_code(
-&self.ignored_directories_in_source_blocks,
- sm,
-&file,
-){
-Some(subst)
-}else{
-None
-}
+if subst.parts.is_empty(){None}else{Some(subst)}
 })
 .collect::<Vec<_>>();
 
@@ -745,14 +750,20 @@ fn shrink_file(
 ) -> Option<(Span,String,usize)>{
 let lo_byte = spans.iter().map(|s| s.lo()).min()?;
 let lo_loc = sm.lookup_char_pos(lo_byte);
-let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
 
 let hi_byte = spans.iter().map(|s| s.hi()).max()?;
 let hi_loc = sm.lookup_char_pos(hi_byte);
-let hi = lo_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
+
+if lo_loc.file.stable_id != hi_loc.file.stable_id{
+// this may happen when spans cross file boundaries due to macro expansion.
+returnNone;
+}
+
+let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
+let hi = hi_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
 
 let bounding_span = Span::with_root_ctxt(lo, hi);
-let source = sm.span_to_snippet(bounding_span).unwrap_or_default();
+let source = sm.span_to_snippet(bounding_span).ok()?;
 let offset_line = sm.doctest_offset_line(file_name, lo_loc.line);
 
 Some((bounding_span, source, offset_line))

tests/rustdoc-js/alias-path-distance-146214.js

@@ -191,7 +191,18 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
  variant.fields.iter().map(move |field| {
 let ty = field.ty(self.tcx, args);
 // `field.ty()` doesn't normalize after instantiating.
-let ty = self.tcx.normalize_erasing_regions(self.typing_env, ty);
+let ty =
+self.tcx.try_normalize_erasing_regions(self.typing_env, ty).unwrap_or_else(|e| {
+self.tcx.dcx().span_delayed_bug(
+self.scrut_span,
+format!(
+"Failed to normalize {:?} in typing_env={:?} while getting variant sub tys for {ty:?}",
+ e.get_type_for_failure(),
+self.typing_env,
+),
+);
+ ty
+});
 let ty = self.reveal_opaque_ty(ty);
 (field, ty)
 })

tests/rustdoc-js/alias-path-distance-146214.rs

@@ -142,6 +142,7 @@ pub fn check(build: &mut Build) {
 
 // We need cmake, but only if we're actually building LLVM or sanitizers.
 let building_llvm = !build.config.llvm_from_ci
+ && !build.config.local_rebuild
  && build.hosts.iter().any(|host| {
  build.config.llvm_enabled(*host)
  && build

tests/rustdoc-js/alias-rank-lower-140968.js

@@ -28,9 +28,6 @@ COPY scripts/nodejs.sh /scripts/
 RUN sh /scripts/nodejs.sh /node
 ENV PATH="/node/bin:${PATH}"
 
-# Install eslint
-COPY host-x86_64/tidy/eslint.version /tmp/
-
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
@@ -40,8 +37,6 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
 
 COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
 
-RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
-
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
 ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -3926,16 +3926,25 @@ class DocSearch {
  * @returns {Promise<rustdoc.PlainResultObject?>}
  */
 consthandleAlias=async(name,alias,dist,index)=>{
+constitem=nonnull(awaitthis.getRow(alias,false));
+// space both is an alias for ::,
+// and is also allowed to appear in doc alias names
+constpath_dist=name.includes(" ")||parsedQuery.elems.length===0 ?
+0 : checkRowPath(parsedQuery.elems[0].pathWithoutLast,item);
+// path distance exceeds max, omit alias from results
+if(path_dist===null){
+returnnull;
+}
 return{
 id: alias,
  dist,
-path_dist: 0,
+ path_dist,
  index,
 alias: name,
 is_alias: true,
 elems: [],// only used in type-based queries
 returned: [],// only used in type-based queries
-item: nonnull(awaitthis.getRow(alias,false)),
+ item,
 };
 };
 /**

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

@@ -0,0 +1,32 @@
+// exact-check
+
+// consider path distance for doc aliases
+// regression test for <https://github.com/rust-lang/rust/issues/146214>
+
+constEXPECTED=[
+{
+'query': 'Foo::zzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': '"Foo::zzz"',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'Foo::zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+{'path': 'alias_path_distance::Bar','name': 'baz'},
+],
+},
+];

compiler/rustc_pattern_analysis/src/rustc.rs

@@ -0,0 +1,14 @@
+#![crate_name = "alias_path_distance"]
+
+pubstructFoo;
+pubstructBar;
+
+implFoo{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}
+
+implBar{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}

src/bootstrap/src/core/sanity.rs

@@ -0,0 +1,10 @@
+// rank doc aliases lower than exact matches
+// regression test for <https://github.com/rust-lang/rust/issues/140968>
+
+constEXPECTED={
+'query': 'Foo',
+'others': [
+{'path': 'alias_rank_lower','name': 'Foo'},
+{'path': 'alias_rank_lower','name': 'Bar'},
+],
+};

src/ci/docker/host-x86_64/tidy/Dockerfile

@@ -469,16 +469,18 @@ fn check_result(
 })
 }
 
-// warn for nonblocking async fn.
+// warn for nonblocking async functions, blocks and closures.
 // This doesn't behave as expected, because the executor can run blocking code without the sanitizer noticing.
 if codegen_fn_attrs.sanitizers.rtsan_setting == RtsanSetting::Nonblocking
  && letSome(sanitize_span) = interesting_spans.sanitize
-// async function
- && (tcx.asyncness(did).is_async() || (tcx.is_closure_like(did.into())
+// async fn
+ && (tcx.asyncness(did).is_async()
 // async block
- && (tcx.coroutine_is_async(did.into())
-// async closure
- || tcx.coroutine_is_async(tcx.coroutine_for_closure(did)))))
+ || tcx.is_coroutine(did.into())
+// async closure
+ || (tcx.is_closure_like(did.into())
+ && tcx.hir_node_by_def_id(did).expect_closure().kind
+ != rustc_hir::ClosureKind::Closure))
 {
 let hir_id = tcx.local_def_id_to_hir_id(did);
  tcx.node_span_lint(

src/ci/docker/host-x86_64/tidy/eslint.version

@@ -350,22 +350,27 @@ impl AnnotateSnippetEmitter {
 "all spans must be disjoint",
 );
 
+let lo = subst.parts.iter().map(|part| part.span.lo()).min()?;
+let lo_file = sm.lookup_source_file(lo);
+let hi = subst.parts.iter().map(|part| part.span.hi()).max()?;
+let hi_file = sm.lookup_source_file(hi);
+
+// The different spans might belong to different contexts, if so ignore suggestion.
+if lo_file.stable_id != hi_file.stable_id{
+returnNone;
+}
+
+// We can't splice anything if the source is unavailable.
+if !sm.ensure_source_file_source_present(&lo_file){
+returnNone;
+}
+
 // Account for cases where we are suggesting the same code that's already
 // there. This shouldn't happen often, but in some cases for multipart
 // suggestions it's much easier to handle it here than in the origin.
  subst.parts.retain(|p| is_different(sm,&p.snippet, p.span));
 
-let item_span = subst.parts.first()?;
-let file = sm.lookup_source_file(item_span.span.lo());
-ifshould_show_source_code(
-&self.ignored_directories_in_source_blocks,
- sm,
-&file,
-){
-Some(subst)
-}else{
-None
-}
+if subst.parts.is_empty(){None}else{Some(subst)}
 })
 .collect::<Vec<_>>();
 
@@ -745,14 +750,20 @@ fn shrink_file(
 ) -> Option<(Span,String,usize)>{
 let lo_byte = spans.iter().map(|s| s.lo()).min()?;
 let lo_loc = sm.lookup_char_pos(lo_byte);
-let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
 
 let hi_byte = spans.iter().map(|s| s.hi()).max()?;
 let hi_loc = sm.lookup_char_pos(hi_byte);
-let hi = lo_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
+
+if lo_loc.file.stable_id != hi_loc.file.stable_id{
+// this may happen when spans cross file boundaries due to macro expansion.
+returnNone;
+}
+
+let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
+let hi = hi_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
 
 let bounding_span = Span::with_root_ctxt(lo, hi);
-let source = sm.span_to_snippet(bounding_span).unwrap_or_default();
+let source = sm.span_to_snippet(bounding_span).ok()?;
 let offset_line = sm.doctest_offset_line(file_name, lo_loc.line);
 
 Some((bounding_span, source, offset_line))

src/librustdoc/html/static/js/search.js

@@ -191,7 +191,18 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
  variant.fields.iter().map(move |field| {
 let ty = field.ty(self.tcx, args);
 // `field.ty()` doesn't normalize after instantiating.
-let ty = self.tcx.normalize_erasing_regions(self.typing_env, ty);
+let ty =
+self.tcx.try_normalize_erasing_regions(self.typing_env, ty).unwrap_or_else(|e| {
+self.tcx.dcx().span_delayed_bug(
+self.scrut_span,
+format!(
+"Failed to normalize {:?} in typing_env={:?} while getting variant sub tys for {ty:?}",
+ e.get_type_for_failure(),
+self.typing_env,
+),
+);
+ ty
+});
 let ty = self.reveal_opaque_ty(ty);
 (field, ty)
 })

tests/rustdoc-js/alias-path-distance-146214.js

@@ -142,6 +142,7 @@ pub fn check(build: &mut Build) {
 
 // We need cmake, but only if we're actually building LLVM or sanitizers.
 let building_llvm = !build.config.llvm_from_ci
+ && !build.config.local_rebuild
  && build.hosts.iter().any(|host| {
  build.config.llvm_enabled(*host)
  && build

tests/rustdoc-js/alias-path-distance-146214.rs

@@ -28,9 +28,6 @@ COPY scripts/nodejs.sh /scripts/
 RUN sh /scripts/nodejs.sh /node
 ENV PATH="/node/bin:${PATH}"
 
-# Install eslint
-COPY host-x86_64/tidy/eslint.version /tmp/
-
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
@@ -40,8 +37,6 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
 
 COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
 
-RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
-
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
 ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \

tests/rustdoc-js/alias-rank-lower-140968.js

@@ -3926,16 +3926,25 @@ class DocSearch {
  * @returns {Promise<rustdoc.PlainResultObject?>}
  */
 consthandleAlias=async(name,alias,dist,index)=>{
+constitem=nonnull(awaitthis.getRow(alias,false));
+// space both is an alias for ::,
+// and is also allowed to appear in doc alias names
+constpath_dist=name.includes(" ")||parsedQuery.elems.length===0 ?
+0 : checkRowPath(parsedQuery.elems[0].pathWithoutLast,item);
+// path distance exceeds max, omit alias from results
+if(path_dist===null){
+returnnull;
+}
 return{
 id: alias,
  dist,
-path_dist: 0,
+ path_dist,
  index,
 alias: name,
 is_alias: true,
 elems: [],// only used in type-based queries
 returned: [],// only used in type-based queries
-item: nonnull(awaitthis.getRow(alias,false)),
+ item,
 };
 };
 /**

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -0,0 +1,32 @@
+// exact-check
+
+// consider path distance for doc aliases
+// regression test for <https://github.com/rust-lang/rust/issues/146214>
+
+constEXPECTED=[
+{
+'query': 'Foo::zzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': '"Foo::zzz"',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'Foo::zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+{'path': 'alias_path_distance::Bar','name': 'baz'},
+],
+},
+];

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

@@ -0,0 +1,14 @@
+#![crate_name = "alias_path_distance"]
+
+pubstructFoo;
+pubstructBar;
+
+implFoo{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}
+
+implBar{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}

compiler/rustc_pattern_analysis/src/rustc.rs

@@ -0,0 +1,10 @@
+// rank doc aliases lower than exact matches
+// regression test for <https://github.com/rust-lang/rust/issues/140968>
+
+constEXPECTED={
+'query': 'Foo',
+'others': [
+{'path': 'alias_rank_lower','name': 'Foo'},
+{'path': 'alias_rank_lower','name': 'Bar'},
+],
+};

src/bootstrap/src/core/sanity.rs

@@ -469,16 +469,18 @@ fn check_result(
 })
 }
 
-// warn for nonblocking async fn.
+// warn for nonblocking async functions, blocks and closures.
 // This doesn't behave as expected, because the executor can run blocking code without the sanitizer noticing.
 if codegen_fn_attrs.sanitizers.rtsan_setting == RtsanSetting::Nonblocking
  && letSome(sanitize_span) = interesting_spans.sanitize
-// async function
- && (tcx.asyncness(did).is_async() || (tcx.is_closure_like(did.into())
+// async fn
+ && (tcx.asyncness(did).is_async()
 // async block
- && (tcx.coroutine_is_async(did.into())
-// async closure
- || tcx.coroutine_is_async(tcx.coroutine_for_closure(did)))))
+ || tcx.is_coroutine(did.into())
+// async closure
+ || (tcx.is_closure_like(did.into())
+ && tcx.hir_node_by_def_id(did).expect_closure().kind
+ != rustc_hir::ClosureKind::Closure))
 {
 let hir_id = tcx.local_def_id_to_hir_id(did);
  tcx.node_span_lint(

src/ci/docker/host-x86_64/tidy/Dockerfile

@@ -350,22 +350,27 @@ impl AnnotateSnippetEmitter {
 "all spans must be disjoint",
 );
 
+let lo = subst.parts.iter().map(|part| part.span.lo()).min()?;
+let lo_file = sm.lookup_source_file(lo);
+let hi = subst.parts.iter().map(|part| part.span.hi()).max()?;
+let hi_file = sm.lookup_source_file(hi);
+
+// The different spans might belong to different contexts, if so ignore suggestion.
+if lo_file.stable_id != hi_file.stable_id{
+returnNone;
+}
+
+// We can't splice anything if the source is unavailable.
+if !sm.ensure_source_file_source_present(&lo_file){
+returnNone;
+}
+
 // Account for cases where we are suggesting the same code that's already
 // there. This shouldn't happen often, but in some cases for multipart
 // suggestions it's much easier to handle it here than in the origin.
  subst.parts.retain(|p| is_different(sm,&p.snippet, p.span));
 
-let item_span = subst.parts.first()?;
-let file = sm.lookup_source_file(item_span.span.lo());
-ifshould_show_source_code(
-&self.ignored_directories_in_source_blocks,
- sm,
-&file,
-){
-Some(subst)
-}else{
-None
-}
+if subst.parts.is_empty(){None}else{Some(subst)}
 })
 .collect::<Vec<_>>();
 
@@ -745,14 +750,20 @@ fn shrink_file(
 ) -> Option<(Span,String,usize)>{
 let lo_byte = spans.iter().map(|s| s.lo()).min()?;
 let lo_loc = sm.lookup_char_pos(lo_byte);
-let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
 
 let hi_byte = spans.iter().map(|s| s.hi()).max()?;
 let hi_loc = sm.lookup_char_pos(hi_byte);
-let hi = lo_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
+
+if lo_loc.file.stable_id != hi_loc.file.stable_id{
+// this may happen when spans cross file boundaries due to macro expansion.
+returnNone;
+}
+
+let lo = lo_loc.file.line_bounds(lo_loc.line.saturating_sub(1)).start;
+let hi = hi_loc.file.line_bounds(hi_loc.line.saturating_sub(1)).end;
 
 let bounding_span = Span::with_root_ctxt(lo, hi);
-let source = sm.span_to_snippet(bounding_span).unwrap_or_default();
+let source = sm.span_to_snippet(bounding_span).ok()?;
 let offset_line = sm.doctest_offset_line(file_name, lo_loc.line);
 
 Some((bounding_span, source, offset_line))

src/ci/docker/host-x86_64/tidy/eslint.version

@@ -191,7 +191,18 @@ impl<'p, 'tcx: 'p> RustcPatCtxt<'p, 'tcx> {
  variant.fields.iter().map(move |field| {
 let ty = field.ty(self.tcx, args);
 // `field.ty()` doesn't normalize after instantiating.
-let ty = self.tcx.normalize_erasing_regions(self.typing_env, ty);
+let ty =
+self.tcx.try_normalize_erasing_regions(self.typing_env, ty).unwrap_or_else(|e| {
+self.tcx.dcx().span_delayed_bug(
+self.scrut_span,
+format!(
+"Failed to normalize {:?} in typing_env={:?} while getting variant sub tys for {ty:?}",
+ e.get_type_for_failure(),
+self.typing_env,
+),
+);
+ ty
+});
 let ty = self.reveal_opaque_ty(ty);
 (field, ty)
 })

src/librustdoc/html/static/js/search.js

@@ -142,6 +142,7 @@ pub fn check(build: &mut Build) {
 
 // We need cmake, but only if we're actually building LLVM or sanitizers.
 let building_llvm = !build.config.llvm_from_ci
+ && !build.config.local_rebuild
  && build.hosts.iter().any(|host| {
  build.config.llvm_enabled(*host)
  && build

tests/rustdoc-js/alias-path-distance-146214.js

@@ -28,9 +28,6 @@ COPY scripts/nodejs.sh /scripts/
 RUN sh /scripts/nodejs.sh /node
 ENV PATH="/node/bin:${PATH}"
 
-# Install eslint
-COPY host-x86_64/tidy/eslint.version /tmp/
-
 COPY scripts/sccache.sh /scripts/
 RUN sh /scripts/sccache.sh
 
@@ -40,8 +37,6 @@ RUN pip3 install --no-deps --no-cache-dir --require-hashes -r /tmp/reuse-require
 
 COPY host-x86_64/pr-check-1/validate-toolstate.sh /scripts/
 
-RUN bash -c 'npm install -g eslint@$(cat /tmp/eslint.version)'
-
 # NOTE: intentionally uses python2 for x.py so we can test it still works.
 # validate-toolstate only runs in our CI, so it's ok for it to only support python3.
 ENV SCRIPT TIDY_PRINT_DIFF=1 python2.7 ../x.py test \

tests/rustdoc-js/alias-path-distance-146214.rs

@@ -3926,16 +3926,25 @@ class DocSearch {
  * @returns {Promise<rustdoc.PlainResultObject?>}
  */
 consthandleAlias=async(name,alias,dist,index)=>{
+constitem=nonnull(awaitthis.getRow(alias,false));
+// space both is an alias for ::,
+// and is also allowed to appear in doc alias names
+constpath_dist=name.includes(" ")||parsedQuery.elems.length===0 ?
+0 : checkRowPath(parsedQuery.elems[0].pathWithoutLast,item);
+// path distance exceeds max, omit alias from results
+if(path_dist===null){
+returnnull;
+}
 return{
 id: alias,
  dist,
-path_dist: 0,
+ path_dist,
  index,
 alias: name,
 is_alias: true,
 elems: [],// only used in type-based queries
 returned: [],// only used in type-based queries
-item: nonnull(awaitthis.getRow(alias,false)),
+ item,
 };
 };
 /**

tests/rustdoc-js/alias-rank-lower-140968.js

@@ -0,0 +1,32 @@
+// exact-check
+
+// consider path distance for doc aliases
+// regression test for <https://github.com/rust-lang/rust/issues/146214>
+
+constEXPECTED=[
+{
+'query': 'Foo::zzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': '"Foo::zzz"',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'Foo::zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+],
+},
+{
+'query': 'zzzz',
+'others': [
+{'path': 'alias_path_distance::Foo','name': 'baz'},
+{'path': 'alias_path_distance::Bar','name': 'baz'},
+],
+},
+];

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -0,0 +1,14 @@
+#![crate_name = "alias_path_distance"]
+
+pubstructFoo;
+pubstructBar;
+
+implFoo{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}
+
+implBar{
+#[doc(alias = "zzz")]
+pubfnbaz(){}
+}

compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs

@@ -0,0 +1,10 @@
+// rank doc aliases lower than exact matches
+// regression test for <https://github.com/rust-lang/rust/issues/140968>
+
+constEXPECTED={
+'query': 'Foo',
+'others': [
+{'path': 'alias_rank_lower','name': 'Foo'},
+{'path': 'alias_rank_lower','name': 'Bar'},
+],
+};