`rust-analyzer` subtree update #151751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

lnicola wants to merge 192 commits into rust-lang:main from lnicola:sync-from-ra

+6,704 −1,751

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -24,7 +24,7 @@ jobs: @@
           run: rustup update --no-self-update stable
         - name: Build Documentation
-          run: cargo doc --all --no-deps
+          run: cargo doc --all --no-deps --document-private-items
         - name: Deploy Docs
           uses: peaceiris/actions-gh-pages@4f9cc6602d3f66b9c108549d475ec49e8ef4d45e # v4.0.0
@@ Expand Down @@

src/tools/rust-analyzer/Cargo.lock

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -178,9 +178,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
  
    [[package]]

    name = "camino"

    version = "1.2.0"

    version = "1.2.2"

    source = "registry+https://github.com/rust-lang/crates.io-index"

    checksum = "e1de8bc0aa9e9385ceb3bf0c152e3a9b9544f6c4a912c8ae504e80c1f0368603"

    checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48"

    dependencies = [

     "serde_core",

    ]

    @@ -1864,6 +1864,7 @@ dependencies = [
  
     "intern",

     "libc",

     "libloading",

     "line-index 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",

     "memmap2",

     "object",

     "paths",

    @@ -1878,9 +1879,15 @@ name = "proc-macro-srv-cli"
  
    version = "0.0.0"

    dependencies = [

     "clap",

     "expect-test",

     "intern",

     "paths",

     "postcard",

     "proc-macro-api",

     "proc-macro-srv",

     "proc-macro-test",

     "span",

     "tt",

    ]

    [[package]]

    @@ -2628,7 +2635,7 @@ dependencies = [
  
    [[package]]

    name = "smol_str"

    version = "0.3.4"

    version = "0.3.5"

    dependencies = [

     "arbitrary",

     "borsh",

src/tools/rust-analyzer/Cargo.toml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -42,7 +42,7 @@ debug = 2
  
    # lsp-server = { path = "lib/lsp-server" }

    # ungrammar = { path = "lin/ungrammar" }

    # ungrammar = { path = "lib/ungrammar" }

    # salsa = { path = "../salsa" }

    # salsa-macros = { path = "../salsa/components/salsa-macros" }

    @@ -107,7 +107,7 @@ anyhow = "1.0.98"
  
    arrayvec = "0.7.6"

    bitflags = "2.9.1"

    cargo_metadata = "0.23.0"

    camino = "1.1.10"

    camino = "1.2.2"

    crossbeam-channel = "0.5.15"

    dissimilar = "1.0.10"

    dot = "0.1.4"

src/tools/rust-analyzer/crates/base-db/src/input.rs

-Original file line number
+Diff line change
@@ Expand Up / @@ -221,6 +221,7 @@ pub enum LangCrateOrigin { @@
         ProcMacro,
         Std,
         Test,
+        Dependency,
         Other,
     }
@@ Expand All / @@ -245,7 +246,7 @@ impl fmt::Display for LangCrateOrigin { @@
                 LangCrateOrigin::ProcMacro => "proc_macro",
                 LangCrateOrigin::Std => "std",
                 LangCrateOrigin::Test => "test",
-                LangCrateOrigin::Other => "other",
+                LangCrateOrigin::Other | LangCrateOrigin::Dependency => "other",
             };
             f.write_str(text)
         }
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ Expand Up @@
         match attr {
             Meta::NamedKeyValue { name: Some(name), value, .. } => match name.text() {
                 "deprecated" => attr_flags.insert(AttrFlags::IS_DEPRECATED),
+                "ignore" => attr_flags.insert(AttrFlags::IS_IGNORE),
                 "lang" => attr_flags.insert(AttrFlags::LANG_ITEM),
                 "path" => attr_flags.insert(AttrFlags::HAS_PATH),
                 "unstable" => attr_flags.insert(AttrFlags::IS_UNSTABLE),
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -8,7 +8,8 @@ use intern::{Symbol, sym}; @@
     use tt::TextRange;
     use crate::{
-        AdtId, BuiltinDeriveImplId, BuiltinDeriveImplLoc, FunctionId, HasModule, db::DefDatabase,
+        AdtId, BuiltinDeriveImplId, BuiltinDeriveImplLoc, FunctionId, HasModule, MacroId,
+        db::DefDatabase, lang_item::LangItems,
     };
     macro_rules! declare_enum {
@@ Expand Down Expand Up / @@ -86,6 +87,25 @@ declare_enum!( @@
         DispatchFromDyn => [],
     );
+    impl BuiltinDeriveImplTrait {
+        pub fn derive_macro(self, lang_items: &LangItems) -> Option<MacroId> {
+            match self {
+                BuiltinDeriveImplTrait::Copy => lang_items.CopyDerive,
+                BuiltinDeriveImplTrait::Clone => lang_items.CloneDerive,
+                BuiltinDeriveImplTrait::Default => lang_items.DefaultDerive,
+                BuiltinDeriveImplTrait::Debug => lang_items.DebugDerive,
+                BuiltinDeriveImplTrait::Hash => lang_items.HashDerive,
+                BuiltinDeriveImplTrait::Ord => lang_items.OrdDerive,
+                BuiltinDeriveImplTrait::PartialOrd => lang_items.PartialOrdDerive,
+                BuiltinDeriveImplTrait::Eq => lang_items.EqDerive,
+                BuiltinDeriveImplTrait::PartialEq => lang_items.PartialEqDerive,
+                BuiltinDeriveImplTrait::CoerceUnsized | BuiltinDeriveImplTrait::DispatchFromDyn => {
+                    lang_items.CoercePointeeDerive
+                }
+            }
+        }
+    }
     impl BuiltinDeriveImplMethod {
         pub fn trait_method(
             self,
@@ Expand Down @@

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -27,14 +27,15 @@
  
    pub mod keys {

        use std::marker::PhantomData;

        use either::Either;

        use hir_expand::{MacroCallId, attrs::AttrId};

        use rustc_hash::FxHashMap;

        use syntax::{AstNode, AstPtr, ast};

        use crate::{

            BlockId, ConstId, EnumId, EnumVariantId, ExternBlockId, ExternCrateId, FieldId, FunctionId,

            ImplId, LifetimeParamId, Macro2Id, MacroRulesId, ProcMacroId, StaticId, StructId, TraitId,

            TypeAliasId, TypeOrConstParamId, UnionId, UseId,

            BlockId, BuiltinDeriveImplId, ConstId, EnumId, EnumVariantId, ExternBlockId, ExternCrateId,

            FieldId, FunctionId, ImplId, LifetimeParamId, Macro2Id, MacroRulesId, ProcMacroId,

            StaticId, StructId, TraitId, TypeAliasId, TypeOrConstParamId, UnionId, UseId,

            dyn_map::{DynMap, Policy},

        };

    @@ -71,7 +72,8 @@ pub mod keys {
  
            (

                AttrId,

                /* derive() */ MacroCallId,

                /* actual derive macros */ Box<[Option<MacroCallId>]>,

                /* actual derive macros */

                Box<[Option<Either<MacroCallId, BuiltinDeriveImplId>>]>,

            ),

        > = Key::new();

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -32,7 +32,7 @@ use crate::{
  
        expr_store::path::Path,

        hir::{

            Array, AsmOperand, Binding, BindingId, Expr, ExprId, ExprOrPatId, Label, LabelId, Pat,

            PatId, RecordFieldPat, Statement,

            PatId, RecordFieldPat, RecordSpread, Statement,

        },

        nameres::{DefMap, block_def_map},

        type_ref::{LifetimeRef, LifetimeRefId, PathId, TypeRef, TypeRefId},

    @@ -575,8 +575,8 @@ impl ExpressionStore {
  
                    for field in fields.iter() {

                        f(field.expr);

                    }

                    if let &Some(expr) = spread {

                        f(expr);

                    if let RecordSpread::Expr(expr) = spread {

                        f(*expr);

                    }

                }

                Expr::Closure { body, .. } => {

    @@ -706,8 +706,8 @@ impl ExpressionStore {
  
                    for field in fields.iter() {

                        f(field.expr);

                    }

                    if let &Some(expr) = spread {

                        f(expr);

                    if let RecordSpread::Expr(expr) = spread {

                        f(*expr);

                    }

                }

                Expr::Closure { body, .. } => {

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

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -47,7 +47,7 @@ use crate::{
  
        hir::{

            Array, Binding, BindingAnnotation, BindingId, BindingProblems, CaptureBy, ClosureKind,

            Expr, ExprId, Item, Label, LabelId, Literal, MatchArm, Movability, OffsetOf, Pat, PatId,

            RecordFieldPat, RecordLitField, Statement, generics::GenericParams,

            RecordFieldPat, RecordLitField, RecordSpread, Statement, generics::GenericParams,

        },

        item_scope::BuiltinShadowMode,

        item_tree::FieldsShape,

    @@ -150,6 +150,7 @@ pub(super) fn lower_body(
  
        };

        let body_expr = collector.collect(

            &mut params,

            body,

            if is_async_fn {

                Awaitable::Yes

    @@ -903,24 +904,57 @@ impl<'db> ExprCollector<'db> {
  
            })

        }

        fn collect(&mut self, expr: Option<ast::Expr>, awaitable: Awaitable) -> ExprId {

        /// An `async fn` needs to capture all parameters in the generated `async` block, even if they have

        /// non-captured patterns such as wildcards (to ensure consistent drop order).

        fn lower_async_fn(&mut self, params: &mut Vec<PatId>, body: ExprId) -> ExprId {

            let mut statements = Vec::new();

            for param in params {

                let name = match self.store.pats[*param] {

                    Pat::Bind { id, .. }

                        if matches!(

                            self.store.bindings[id].mode,

                            BindingAnnotation::Unannotated | BindingAnnotation::Mutable

                        ) =>

                    {

                        // If this is a direct binding, we can leave it as-is, as it'll always be captured anyway.

                        continue;

                    }

                    Pat::Bind { id, .. } => {

                        // If this is a `ref` binding, we can't leave it as is but we can at least reuse the name, for better display.

                        self.store.bindings[id].name.clone()

                    }

                    _ => self.generate_new_name(),

                };

                let binding_id =

                    self.alloc_binding(name.clone(), BindingAnnotation::Mutable, HygieneId::ROOT);

                let pat_id = self.alloc_pat_desugared(Pat::Bind { id: binding_id, subpat: None });

                let expr = self.alloc_expr_desugared(Expr::Path(name.into()));

                statements.push(Statement::Let {

                    pat: *param,

                    type_ref: None,

                    initializer: Some(expr),

                    else_branch: None,

                });

                *param = pat_id;

            }

            self.alloc_expr_desugared(Expr::Async {

                id: None,

                statements: statements.into_boxed_slice(),

                tail: Some(body),

            })

        }

        fn collect(

            &mut self,

            params: &mut Vec<PatId>,

            expr: Option<ast::Expr>,

            awaitable: Awaitable,

        ) -> ExprId {

            self.awaitable_context.replace(awaitable);

            self.with_label_rib(RibKind::Closure, |this| {

                if awaitable == Awaitable::Yes {

                    match expr {

                        Some(e) => {

                            let syntax_ptr = AstPtr::new(&e);

                            let expr = this.collect_expr(e);

                            this.alloc_expr_desugared_with_ptr(

                                Expr::Async { id: None, statements: Box::new([]), tail: Some(expr) },

                                syntax_ptr,

                            )

                        }

                        None => this.missing_expr(),

                    }

                } else {

                    this.collect_expr_opt(expr)

                }

                let body = this.collect_expr_opt(expr);

                if awaitable == Awaitable::Yes { this.lower_async_fn(params, body) } else { body }

            })

        }

    @@ -1232,10 +1266,16 @@ impl<'db> ExprCollector<'db> {
  
                                Some(RecordLitField { name, expr })

                            })

                            .collect();

                        let spread = nfl.spread().map(|s| self.collect_expr(s));

                        let spread_expr = nfl.spread().map(|s| self.collect_expr(s));

                        let has_spread_syntax = nfl.dotdot_token().is_some();

                        let spread = match (spread_expr, has_spread_syntax) {

                            (None, false) => RecordSpread::None,

                            (None, true) => RecordSpread::FieldDefaults,

                            (Some(expr), _) => RecordSpread::Expr(expr),

                        };

                        Expr::RecordLit { path, fields, spread }

                    } else {

                        Expr::RecordLit { path, fields: Box::default(), spread: None }

                        Expr::RecordLit { path, fields: Box::default(), spread: RecordSpread::None }

                    };

                    self.alloc_expr(record_lit, syntax_ptr)

    @@ -1961,7 +2001,7 @@ impl<'db> ExprCollector<'db> {
  
            }

        }

        fn collect_expr_opt(&mut self, expr: Option<ast::Expr>) -> ExprId {

        pub fn collect_expr_opt(&mut self, expr: Option<ast::Expr>) -> ExprId {

            match expr {

                Some(expr) => self.collect_expr(expr),

                None => self.missing_expr(),

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,8 @@ use crate::{ @@
         builtin_type::BuiltinUint,
         expr_store::{HygieneId, lower::ExprCollector, path::Path},
         hir::{
-            Array, BindingAnnotation, Expr, ExprId, Literal, Pat, RecordLitField, Statement,
+            Array, BindingAnnotation, Expr, ExprId, Literal, Pat, RecordLitField, RecordSpread,
+            Statement,
             format_args::{
                 self, FormatAlignment, FormatArgs, FormatArgsPiece, FormatArgument, FormatArgumentKind,
                 FormatArgumentsCollector, FormatCount, FormatDebugHex, FormatOptions,
@@ Expand Down Expand Up / @@ -869,7 +870,7 @@ impl<'db> ExprCollector<'db> { @@
                 self.alloc_expr_desugared(Expr::RecordLit {
                     path: self.lang_path(lang_items.FormatPlaceholder).map(Box::new),
                     fields: Box::new([position, flags, precision, width]),
-                    spread: None,
+                    spread: RecordSpread::None,
                 })
             } else {
                 let format_placeholder_new =
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,8 @@ use crate::{ @@
         attrs::AttrFlags,
         expr_store::path::{GenericArg, GenericArgs},
         hir::{
-            Array, BindingAnnotation, CaptureBy, ClosureKind, Literal, Movability, Statement,
+            Array, BindingAnnotation, CaptureBy, ClosureKind, Literal, Movability, RecordSpread,
+            Statement,
             generics::{GenericParams, WherePredicate},
         },
         lang_item::LangItemTarget,
@@ Expand Down Expand Up @@
         }
         for (_, data) in fields.fields().iter() {
-            let FieldData { name, type_ref, visibility, is_unsafe } = data;
+            let FieldData { name, type_ref, visibility, is_unsafe, default_value: _ } = data;
             match visibility {
                 crate::item_tree::RawVisibility::Module(interned, _visibility_explicitness) => {
                     w!(p, "pub(in {})", interned.display(db, p.edition))
@@ Expand Down Expand Up / @@ -679,10 +680,17 @@ impl Printer<'_> { @@
                             p.print_expr(field.expr);
                             wln!(p, ",");
                         }
-                        if let Some(spread) = spread {
-                            w!(p, "..");
-                            p.print_expr(*spread);
-                            wln!(p);
+                        match spread {
+                            RecordSpread::None => {}
+                            RecordSpread::FieldDefaults => {
+                                w!(p, "..");
+                                wln!(p);
+                            }
+                            RecordSpread::Expr(spread_expr) => {
+                                w!(p, "..");
+                                p.print_expr(*spread_expr);
+                                wln!(p);
+                            }
                         }
                     });
                     w!(self, "}}");
@@ Expand Down @@

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

-Original file line number
+Diff line change
@@ Expand Up / @@ -659,3 +659,21 @@ fn main() { @@
             }"#]]
         .assert_eq(&body.pretty_print(&db, def, Edition::CURRENT))
     }
+    #[test]
+    fn async_fn_weird_param_patterns() {
+        let (db, body, def) = lower(
+            r#"
+    async fn main(&self, param1: i32, ref mut param2: i32, _: i32, param4 @ _: i32, 123: i32) {}
+    "#,
+        );
+        expect![[r#"
+            fn main(self, param1, mut param2, mut <ra@gennew>0, param4 @ _, mut <ra@gennew>1) async {
+                let ref mut param2 = param2;
+                let _ = <ra@gennew>0;
+                let 123 = <ra@gennew>1;
+                {}
+            }"#]]
+        .assert_eq(&body.pretty_print(&db, def, Edition::CURRENT))
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

`rust-analyzer` subtree update #151751

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

rust-analyzer subtree update #151751

Are you sure you want to change the base?

rust-analyzer subtree update #151751

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

`rust-analyzer` subtree update #151751

`rust-analyzer` subtree update #151751