Auto merge of #121581 - lnicola:sync-from-ra, r=lnicola

Subtree update of `rust-analyzer`
r? `@ghost`

Author: bors

src/tools/rust-analyzer/.github/workflows/ci.yaml

@@ -226,6 +226,11 @@ jobs:
  - name: download typos
 run: curl -LsSf https://github.com/crate-ci/typos/releases/download/$TYPOS_VERSION/typos-$TYPOS_VERSION-x86_64-unknown-linux-musl.tar.gz | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
 
+ - name: Checkout repository
+uses: actions/checkout@v4
+with:
+ref: ${{ github.event.pull_request.head.sha }}
+
  - name: check for typos
 run: typos
 

src/tools/rust-analyzer/.github/workflows/metrics.yaml

@@ -67,7 +67,7 @@ jobs:
 other_metrics:
 strategy:
 matrix:
-names: [self, rustc_tests, ripgrep-13.0.0, webrender-2022, diesel-1.4.8, hyper-0.14.18]
+names: [self, ripgrep-13.0.0, webrender-2022, diesel-1.4.8, hyper-0.14.18]
 runs-on: ubuntu-latest
 needs: [setup_cargo, build_metrics]
 
@@ -118,11 +118,6 @@ jobs:
 with:
 name: self-${{ github.sha }}
 
- - name: Download rustc_tests metrics
-uses: actions/download-artifact@v3
-with:
-name: rustc_tests-${{ github.sha }}
-
  - name: Download ripgrep-13.0.0 metrics
 uses: actions/download-artifact@v3
 with:
@@ -151,7 +146,7 @@ jobs:
  chmod 700 ~/.ssh
 
  git clone --depth 1 git@github.com:rust-analyzer/metrics.git
- jq -s ".[0] * .[1] * .[2] * .[3] * .[4] * .[5] * .[6]" build.json self.json rustc_tests.json ripgrep-13.0.0.json webrender-2022.json diesel-1.4.8.json hyper-0.14.18.json -c >> metrics/metrics.json
+ jq -s ".[0] * .[1] * .[2] * .[3] * .[4] * .[5]" build.json self.json ripgrep-13.0.0.json webrender-2022.json diesel-1.4.8.json hyper-0.14.18.json -c >> metrics/metrics.json
  cd metrics
  git add .
  git -c user.name=Bot -c user.email=dummy@example.com commit --message 📈

src/tools/rust-analyzer/.github/workflows/release.yaml

@@ -59,7 +59,7 @@ jobs:
 
 steps:
  - name: Checkout repository
-uses: actions/checkout@v4
+uses: actions/checkout@v3
 with:
 fetch-depth: ${{ env.FETCH_DEPTH }}
 
@@ -78,9 +78,9 @@ jobs:
  rustup component add rust-src
 
  - name: Install Node.js
-uses: actions/setup-node@v4
+uses: actions/setup-node@v3
 with:
-node-version: 18
+node-version: 16
 
  - name: Update apt repositories
 if: matrix.target == 'aarch64-unknown-linux-gnu' || matrix.target == 'arm-unknown-linux-gnueabihf'

src/tools/rust-analyzer/Cargo.lock

@@ -1709,6 +1709,7 @@ dependencies = [
 "dissimilar",
 "expect-test",
 "indexmap",
+"itertools",
 "linked-hash-map",
 "lock_api",
 "oorandom",

src/tools/rust-analyzer/crates/hir-def/src/body/pretty.rs

@@ -6,8 +6,8 @@ use itertools::Itertools;
 
 usecrate::{
  hir::{
-Array,BindingAnnotation,CaptureBy,ClosureKind,Literal,LiteralOrConst,
-Movability,Statement,
+Array,BindingAnnotation,CaptureBy,ClosureKind,Literal,LiteralOrConst,Movability,
+Statement,
 },
  pretty::{print_generic_args, print_path, print_type_ref},
  type_ref::TypeRef,

src/tools/rust-analyzer/crates/hir-def/src/data/adt.rs

@@ -40,7 +40,7 @@ pub struct StructData {
 }
 
 bitflags!{
- #[derive(Debug,Clone,PartialEq,Eq)]
+ #[derive(Debug,Copy,Clone,PartialEq,Eq)]
 pubstructStructFlags:u8{
 constNO_FLAGS = 0;
 /// Indicates whether the struct is `PhantomData`.

src/tools/rust-analyzer/crates/hir-def/src/import_map.rs

@@ -477,7 +477,7 @@ mod tests {
 use expect_test::{expect,Expect};
 use test_fixture::WithFixture;
 
-usecrate::{db::DefDatabase,test_db::TestDB,ItemContainerId,Lookup};
+usecrate::{test_db::TestDB,ItemContainerId,Lookup};
 
 usesuper::*;
 

src/tools/rust-analyzer/crates/hir-def/src/item_tree.rs

@@ -44,13 +44,13 @@ use std::{
  ops::{Index,Range},
 };
 
-use ast::{AstNode,HasName,StructKind};
+use ast::{AstNode,StructKind};
 use base_db::CrateId;
 use either::Either;
 use hir_expand::{
  ast_id_map::{AstIdNode,FileAstId},
  attrs::RawAttrs,
- name::{name,AsName,Name},
+ name::Name,
 ExpandTo,HirFileId,InFile,
 };
 use intern::Interned;
@@ -67,7 +67,7 @@ use crate::{
  attr::Attrs,
  db::DefDatabase,
  generics::{GenericParams,LifetimeParamData,TypeOrConstParamData},
- path::{path,AssociatedTypeBinding,GenericArgs,ImportAlias,ModPath,Path,PathKind},
+ path::{GenericArgs,ImportAlias,ModPath,Path,PathKind},
  type_ref::{Mutability,TraitRef,TypeBound,TypeRef},
  visibility::{RawVisibility,VisibilityExplicitness},
 BlockId,Lookup,

src/tools/rust-analyzer/crates/hir-def/src/item_tree/lower.rs

@@ -2,17 +2,33 @@
 
 use std::collections::hash_map::Entry;
 
-use hir_expand::{ast_id_map::AstIdMap, span_map::SpanMapRef};
-use syntax::ast::{HasModuleItem,HasTypeBounds,IsString};
+use hir_expand::{
+ ast_id_map::AstIdMap, mod_path::path, name, name::AsName, span_map::SpanMapRef,HirFileId,
+};
+use la_arena::Arena;
+use syntax::{
+ ast::{self,HasModuleItem,HasName,HasTypeBounds,IsString},
+AstNode,
+};
+use triomphe::Arc;
 
 usecrate::{
- generics::{GenericParamsCollector,TypeParamData,TypeParamProvenance},
- type_ref::{LifetimeRef,TraitBoundModifier},
+ db::DefDatabase,
+ generics::{GenericParams,GenericParamsCollector,TypeParamData,TypeParamProvenance},
+ item_tree::{
+AssocItem,AttrOwner,Const,Either,Enum,ExternBlock,ExternCrate,Field,FieldAstId,
+Fields,FileItemTreeId,FnFlags,Function,GenericArgs,Idx,IdxRange,Impl,ImportAlias,
+Interned,ItemTree,ItemTreeData,ItemTreeNode,Macro2,MacroCall,MacroRules,Mod,
+ModItem,ModKind,ModPath,Mutability,Name,Param,ParamAstId,Path,Range,RawAttrs,
+RawIdx,RawVisibilityId,Static,Struct,StructKind,Trait,TraitAlias,TypeAlias,Union,
+Use,UseTree,UseTreeKind,Variant,
+},
+ path::AssociatedTypeBinding,
+ type_ref::{LifetimeRef,TraitBoundModifier,TraitRef,TypeBound,TypeRef},
+ visibility::RawVisibility,
 LocalLifetimeParamId,LocalTypeOrConstParamId,
 };
 
-usesuper::*;
-
 fnid<N:ItemTreeNode>(index:Idx<N>) -> FileItemTreeId<N>{
 FileItemTreeId(index)
 }

src/tools/rust-analyzer/crates/hir-def/src/item_tree/pretty.rs

@@ -1,16 +1,22 @@
 //! `ItemTree` debug printer.
 
-use std::fmt::Write;
+use std::fmt::{self,Write};
 
 use span::ErasedFileAstId;
 
 usecrate::{
- generics::{WherePredicate,WherePredicateTypeTarget},
+ generics::{TypeOrConstParamData,WherePredicate,WherePredicateTypeTarget},
+ item_tree::{
+AttrOwner,Const,DefDatabase,Enum,ExternBlock,ExternCrate,Field,FieldAstId,Fields,
+FileItemTreeId,FnFlags,Function,GenericParams,Impl,Interned,ItemTree,Macro2,
+MacroCall,MacroRules,Mod,ModItem,ModKind,Param,ParamAstId,Path,RawAttrs,
+RawVisibilityId,Static,Struct,Trait,TraitAlias,TypeAlias,TypeBound,TypeRef,Union,
+Use,UseTree,UseTreeKind,Variant,
+},
  pretty::{print_path, print_type_bounds, print_type_ref},
+ visibility::RawVisibility,
 };
 
-usesuper::*;
-
 pub(super)fnprint_item_tree(db:&dynDefDatabase,tree:&ItemTree) -> String{
 letmut p = Printer{ db, tree,buf:String::new(),indent_level:0,needs_indent:true};