Subtree update of rust-analyzer

[lnicola]

r? ghost

[rustbot]

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

[rust-log-analyzer]

The job mingw-check failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

    Checking time v0.3.34
error[E0423]: expected function, tuple struct or tuple variant, found struct `IdxContainer`
   --> crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs:436:35
    |
436 |                         variants: IdxContainer(variants),
    |
   ::: /checkout/compiler/rustc_index/src/vec.rs:42:1
    |
    |
42  | pub struct IndexVec<I: Idx, T> {
    | ------------------------------ `IdxContainer` defined here
help: you might have meant to use an associated function to build this type
    |
436 |                         variants: IdxContainer::new(),
    |                                               ~~~~~~~
    |                                               ~~~~~~~
436 |                         variants: IdxContainer::from_raw(_),
    |                                               ~~~~~~~~~~~~~
436 |                         variants: IdxContainer::with_capacity(_),
    |                                               ~~~~~~~~~~~~~~~~~~
436 |                         variants: IdxContainer::from_elem(_, _),
      and 2 other candidates
help: consider using the `Default` trait
    |
    |
436 |                         variants: <IdxContainer as std::default::Default>::default(),
help: consider importing this tuple struct instead
    |
    |
3   + use ra_ap_rustc_pattern_analysis::index::IdxContainer;


error[E0277]: the trait bound `hir_def::EnumVariantId: rustc_index::Idx` is not satisfied
    |
    |
280 |     type VariantIdx = EnumVariantId;
    |                       ^^^^^^^^^^^^^ the trait `rustc_index::Idx` is not implemented for `hir_def::EnumVariantId`
    = help: the following other types implement trait `rustc_index::Idx`:
              usize
              u32
              rustc_query_system::dep_graph::graph::DepNodeIndex
              rustc_query_system::dep_graph::graph::DepNodeIndex
              rustc_errors::codes::ErrCode
              rustc_type_ir::ty_kind::TyVid
              rustc_type_ir::ty_kind::IntVid
              rustc_type_ir::ty_kind::FloatVid
              rustc_query_system::dep_graph::serialized::SerializedDepNodeIndex
note: required by a bound in `rustc_pattern_analysis::PatCx::VariantIdx`
   --> /checkout/compiler/rustc_pattern_analysis/src/lib.rs:99:30
    |
    |
99  |     type VariantIdx: Clone + index::Idx + fmt::Debug;
    |                              ^^^^^^^^^^ required by this bound in `PatCx::VariantIdx`
error[E0050]: method `write_variant_name` has 2 parameters but the declaration in trait `write_variant_name` has 3
   --> crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs:453:12
    |
453 |           f: &mut fmt::Formatter<'_>,
453 |           f: &mut fmt::Formatter<'_>,
    |  ____________^
454 | |         pat: &rustc_pattern_analysis::pat::DeconstructedPat<Self>,
    |
    |
    = note: `write_variant_name` from trait: `fn(&mut Formatter<'_>, &Constructor<Self>, &<Self as PatCx>::Ty) -> std::result::Result<(), std::fmt::Error>`
error[E0004]: non-exhaustive patterns: `&Constructor::Never` not covered
   --> crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs:332:43
    |
    |
332 |         let tys: SmallVec<[_; 2]> = match ctor {
    |                                           ^^^^ pattern `&Constructor::Never` not covered
    |
note: `Constructor<MatchCheckCtx<'_>>` defined here
    |
    |
651 | pub enum Constructor<Cx: PatCx> {
...
683 |     Never,
    |     ----- not covered
    |     ----- not covered
    = note: the matched value is of type `&Constructor<MatchCheckCtx<'_>>`
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
388 ~             },
389 +             &Constructor::Never => todo!()
    |

---
    |
222 |         let kind = match pat.ctor() {
    |                          ^^^^^^^^^^ pattern `&Constructor::Never` not covered
    |
note: `Constructor<MatchCheckCtx<'_>>` defined here
    |
    |
651 | pub enum Constructor<Cx: PatCx> {
...
683 |     Never,
    |     ----- not covered
    |     ----- not covered
    = note: the matched value is of type `&Constructor<MatchCheckCtx<'_>>`
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
271 ~             },
272 +             &Constructor::Never => todo!()
    |


error[E0004]: non-exhaustive patterns: `&Constructor::Never` not covered
   --> crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs:297:15
    |
297 |         match ctor {
    |               ^^^^ pattern `&Constructor::Never` not covered
    |
note: `Constructor<MatchCheckCtx<'_>>` defined here
    |
    |
651 | pub enum Constructor<Cx: PatCx> {
...
683 |     Never,
    |     ----- not covered
    |     ----- not covered
    = note: the matched value is of type `&Constructor<MatchCheckCtx<'_>>`
help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern or an explicit pattern as shown
322 ~             },
323 +             &Constructor::Never => todo!()
    |

[lnicola]

@Nadrieril I think I'm gonna let you sort this one out. The two IdxContainers are not compatible and there are some API changes in rustc_pattern_analysis.