Unnamed repository; edit this file 'description' to name the repository.
| -rw-r--r-- | crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs | 5 | ||||
| -rw-r--r-- | crates/rust-analyzer/src/version.rs | 2 | ||||
| -rw-r--r-- | rust-version | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs b/crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs index ff62344012..7bf8af4cab 100644 --- a/crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs +++ b/crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs @@ -5,11 +5,10 @@ use std::fmt; use hir_def::{DefWithBodyId, EnumId, EnumVariantId, HasModule, LocalFieldId, ModuleId, VariantId}; use intern::sym; use once_cell::unsync::Lazy; -use rustc_index::IndexVec; use rustc_pattern_analysis::{ constructor::{Constructor, ConstructorSet, VariantVisibility}, usefulness::{compute_match_usefulness, PlaceValidity, UsefulnessReport}, - Captures, PatCx, PrivateUninhabitedField, + Captures, IndexVec, PatCx, PrivateUninhabitedField, }; use smallvec::{smallvec, SmallVec}; use stdx::never; @@ -54,7 +53,7 @@ impl EnumVariantContiguousIndex { } } -impl rustc_index::Idx for EnumVariantContiguousIndex { +impl rustc_pattern_analysis::Idx for EnumVariantContiguousIndex { fn new(idx: usize) -> Self { EnumVariantContiguousIndex(idx) } diff --git a/crates/rust-analyzer/src/version.rs b/crates/rust-analyzer/src/version.rs index 1e829299e6..2ff967416c 100644 --- a/crates/rust-analyzer/src/version.rs +++ b/crates/rust-analyzer/src/version.rs @@ -15,7 +15,7 @@ pub struct VersionInfo { pub version: &'static str, /// The release channel we were built for (stable/beta/nightly/dev). /// - /// `None` if not built via rustbuild. + /// `None` if not built via bootstrap. pub release_channel: Option<&'static str>, /// Information about the Git repository we may have been built from. /// diff --git a/rust-version b/rust-version index 424c93a752..18e32e5c65 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -bcf1f6db4594ae6132378b179a30cdb3599a863d +a91f7d72f12efcc00ecf71591f066c534d45ddf7 |