Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 05:23:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17609 - lnicola:sync-from-rust, r=lnicola

Browse source 
minor: Sync from downstream
This commit is contained in:
bors 2024-07-16 13:38:39 +00:00
commit cf156a7a43
3 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
crates/hir-ty/src/diagnostics/match_check/pat_analysis.rs
View file

@ -5,11 +5,10 @@ use std::fmt;
use hir_def::{DefWithBodyId, EnumId, EnumVariantId, HasModule, LocalFieldId, ModuleId, VariantId}; use hir_def::{DefWithBodyId, EnumId, EnumVariantId, HasModule, LocalFieldId, ModuleId, VariantId};
use intern::sym; use intern::sym;
use once_cell::unsync::Lazy; use once_cell::unsync::Lazy;
use rustc_index::IndexVec;
use rustc_pattern_analysis::{ use rustc_pattern_analysis::{
constructor::{Constructor, ConstructorSet, VariantVisibility}, constructor::{Constructor, ConstructorSet, VariantVisibility},
usefulness::{compute_match_usefulness, PlaceValidity, UsefulnessReport}, usefulness::{compute_match_usefulness, PlaceValidity, UsefulnessReport},
Captures, PatCx, PrivateUninhabitedField, Captures, IndexVec, PatCx, PrivateUninhabitedField,
}; };
use smallvec::{smallvec, SmallVec}; use smallvec::{smallvec, SmallVec};
use stdx::never; 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 { fn new(idx: usize) -> Self {
EnumVariantContiguousIndex(idx) EnumVariantContiguousIndex(idx)
} }

2
crates/rust-analyzer/src/version.rs
View file

@ -15,7 +15,7 @@ pub struct VersionInfo {
pub version: &'static str, pub version: &'static str,
/// The release channel we were built for (stable/beta/nightly/dev). /// 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>, pub release_channel: Option<&'static str>,
/// Information about the Git repository we may have been built from. /// Information about the Git repository we may have been built from.
/// ///

2
rust-version
View file

@ -1 +1 @@
bcf1f6db4594ae6132378b179a30cdb3599a863d a91f7d72f12efcc00ecf71591f066c534d45ddf7