Skip to content

Commit c8e2d67

Browse files
bors[bot]lnicolamatklad
authored
5594: Update sysroot crates r=jonas-schievink a=lnicola 5604: Rename EnumVariant -> Variant r=matklad a=matklad bors r+ 🤖 5605: fmt r=matklad a=matklad bors r+ 🤖 Co-authored-by: Laurențiu Nicola <[email protected]> Co-authored-by: Aleksey Kladov <[email protected]>
4 parents 8de0eb9 + afd0246 + 6b25f64 + ba71f05 commit c8e2d67

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+242
-256
lines changed

‎crates/ra_assists/src/handlers/add_missing_impl_members.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ fn add_missing_impl_members_inner(
120120
match item {
121121
ast::AssocItem::Fn(def) => def.name(),
122122
ast::AssocItem::TypeAlias(def) => def.name(),
123-
ast::AssocItem::ConstDef(def) => def.name(),
123+
ast::AssocItem::Const(def) => def.name(),
124124
ast::AssocItem::MacroCall(_) => None,
125125
}
126126
.map(|it| it.text().clone())
@@ -131,7 +131,7 @@ fn add_missing_impl_members_inner(
131131
.map(|i| match i {
132132
hir::AssocItem::Function(i) => ast::AssocItem::Fn(i.source(ctx.db()).value),
133133
hir::AssocItem::TypeAlias(i) => ast::AssocItem::TypeAlias(i.source(ctx.db()).value),
134-
hir::AssocItem::Const(i) => ast::AssocItem::ConstDef(i.source(ctx.db()).value),
134+
hir::AssocItem::Const(i) => ast::AssocItem::Const(i.source(ctx.db()).value),
135135
})
136136
.filter(|t| def_name(&t).is_some())
137137
.filter(|t| match t {

‎crates/ra_assists/src/handlers/change_visibility.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use ra_syntax::{
22
ast::{self, NameOwner, VisibilityOwner},
33
AstNode,
4-
SyntaxKind::{CONST_DEF, ENUM, FN, MODULE, STATIC_DEF, STRUCT, TRAIT_DEF, VISIBILITY},
4+
SyntaxKind::{CONST, ENUM, FN, MODULE, STATIC, STRUCT, TRAIT_DEF, VISIBILITY},
55
T,
66
};
77
use test_utils::mark;
@@ -36,7 +36,7 @@ fn add_vis(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
3636

3737
let (offset, target) = if let Some(keyword) = item_keyword {
3838
let parent = keyword.parent();
39-
let def_kws = vec![CONST_DEF, STATIC_DEF, FN, MODULE, STRUCT, ENUM, TRAIT_DEF];
39+
let def_kws = vec![CONST, STATIC, FN, MODULE, STRUCT, ENUM, TRAIT_DEF];
4040
// Parent is not a definition, can't add visibility
4141
if !def_kws.iter().any(|&def_kw| def_kw == parent.kind()) {
4242
return None;

‎crates/ra_assists/src/handlers/extract_struct_from_enum_variant.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ pub(crate) fn extract_struct_from_enum_variant(
3131
acc: &mut Assists,
3232
ctx: &AssistContext,
3333
) -> Option<()> {
34-
let variant = ctx.find_node_at_offset::<ast::EnumVariant>()?;
34+
let variant = ctx.find_node_at_offset::<ast::Variant>()?;
3535
let field_list = match variant.kind() {
3636
ast::StructKind::Tuple(field_list) => field_list,
3737
_ => return None,

‎crates/ra_assists/src/handlers/generate_from_impl_for_enum.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ use crate::{utils::FamousDefs, AssistContext, AssistId, AssistKind, Assists};
2222
// }
2323
// ```
2424
pub(crate) fn generate_from_impl_for_enum(acc: &mut Assists, ctx: &AssistContext) -> Option<()> {
25-
let variant = ctx.find_node_at_offset::<ast::EnumVariant>()?;
25+
let variant = ctx.find_node_at_offset::<ast::Variant>()?;
2626
let variant_name = variant.name()?;
2727
let enum_name = variant.parent_enum().name()?;
2828
let field_list = match variant.kind() {
@@ -69,7 +69,7 @@ impl From<{0}> for {1} {{
6969

7070
fn existing_from_impl(
7171
sema: &'_ hir::Semantics<'_, RootDatabase>,
72-
variant: &ast::EnumVariant,
72+
variant: &ast::Variant,
7373
) -> Option<()> {
7474
let variant = sema.to_def(variant)?;
7575
let enum_ = variant.parent_enum(sema.db);

‎crates/ra_assists/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ pub fn get_missing_assoc_items(
7878
}
7979
}
8080

81-
ast::AssocItem::ConstDef(c) => {
81+
ast::AssocItem::Const(c) => {
8282
if let Some(n) = c.name() {
8383
impl_fns_consts.insert(n.syntax().to_string());
8484
}

‎crates/ra_hir/src/has_source.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ impl HasSource for Enum {
7575
}
7676
}
7777
impl HasSource for EnumVariant {
78-
type Ast = ast::EnumVariant;
79-
fn source(self, db: &dyn HirDatabase) -> InFile<ast::EnumVariant> {
78+
type Ast = ast::Variant;
79+
fn source(self, db: &dyn HirDatabase) -> InFile<ast::Variant> {
8080
self.parent.id.child_source(db.upcast()).map(|map| map[self.id].clone())
8181
}
8282
}
@@ -87,14 +87,14 @@ impl HasSource for Function {
8787
}
8888
}
8989
impl HasSource for Const {
90-
type Ast = ast::ConstDef;
91-
fn source(self, db: &dyn HirDatabase) -> InFile<ast::ConstDef> {
90+
type Ast = ast::Const;
91+
fn source(self, db: &dyn HirDatabase) -> InFile<ast::Const> {
9292
self.id.lookup(db.upcast()).source(db.upcast())
9393
}
9494
}
9595
impl HasSource for Static {
96-
type Ast = ast::StaticDef;
97-
fn source(self, db: &dyn HirDatabase) -> InFile<ast::StaticDef> {
96+
type Ast = ast::Static;
97+
fn source(self, db: &dyn HirDatabase) -> InFile<ast::Static> {
9898
self.id.lookup(db.upcast()).source(db.upcast())
9999
}
100100
}

‎crates/ra_hir/src/semantics.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -586,12 +586,12 @@ to_def_impls![
586586
(crate::Trait, ast::TraitDef, trait_to_def),
587587
(crate::ImplDef, ast::ImplDef, impl_to_def),
588588
(crate::TypeAlias, ast::TypeAlias, type_alias_to_def),
589-
(crate::Const, ast::ConstDef, const_to_def),
590-
(crate::Static, ast::StaticDef, static_to_def),
589+
(crate::Const, ast::Const, const_to_def),
590+
(crate::Static, ast::Static, static_to_def),
591591
(crate::Function, ast::Fn, fn_to_def),
592592
(crate::Field, ast::RecordField, record_field_to_def),
593593
(crate::Field, ast::TupleField, tuple_field_to_def),
594-
(crate::EnumVariant, ast::EnumVariant, enum_variant_to_def),
594+
(crate::EnumVariant, ast::Variant, enum_variant_to_def),
595595
(crate::TypeParam, ast::TypeParam, type_param_to_def),
596596
(crate::MacroDef, ast::MacroCall, macro_call_to_def), // this one is dubious, not all calls are macros
597597
(crate::Local, ast::BindPat, bind_pat_to_def),

‎crates/ra_hir/src/semantics/source_to_def.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ impl SourceToDefCtx<'_, '_> {
8383
pub(super) fn union_to_def(&mut self, src: InFile<ast::Union>) -> Option<UnionId> {
8484
self.to_def(src, keys::UNION)
8585
}
86-
pub(super) fn static_to_def(&mut self, src: InFile<ast::StaticDef>) -> Option<StaticId> {
86+
pub(super) fn static_to_def(&mut self, src: InFile<ast::Static>) -> Option<StaticId> {
8787
self.to_def(src, keys::STATIC)
8888
}
89-
pub(super) fn const_to_def(&mut self, src: InFile<ast::ConstDef>) -> Option<ConstId> {
89+
pub(super) fn const_to_def(&mut self, src: InFile<ast::Const>) -> Option<ConstId> {
9090
self.to_def(src, keys::CONST)
9191
}
9292
pub(super) fn type_alias_to_def(&mut self, src: InFile<ast::TypeAlias>) -> Option<TypeAliasId> {
@@ -100,9 +100,9 @@ impl SourceToDefCtx<'_, '_> {
100100
}
101101
pub(super) fn enum_variant_to_def(
102102
&mut self,
103-
src: InFile<ast::EnumVariant>,
103+
src: InFile<ast::Variant>,
104104
) -> Option<EnumVariantId> {
105-
self.to_def(src, keys::ENUM_VARIANT)
105+
self.to_def(src, keys::VARIANT)
106106
}
107107
pub(super) fn bind_pat_to_def(
108108
&mut self,
@@ -178,11 +178,11 @@ impl SourceToDefCtx<'_, '_> {
178178
let def = self.union_to_def(container.with_value(it))?;
179179
VariantId::from(def).into()
180180
},
181-
ast::StaticDef(it) => {
181+
ast::Static(it) => {
182182
let def = self.static_to_def(container.with_value(it))?;
183183
DefWithBodyId::from(def).into()
184184
},
185-
ast::ConstDef(it) => {
185+
ast::Const(it) => {
186186
let def = self.const_to_def(container.with_value(it))?;
187187
DefWithBodyId::from(def).into()
188188
},
@@ -222,8 +222,8 @@ impl SourceToDefCtx<'_, '_> {
222222
for container in src.cloned().ancestors_with_macros(self.db.upcast()).skip(1) {
223223
let res: DefWithBodyId = match_ast! {
224224
match (container.value) {
225-
ast::ConstDef(it) => self.const_to_def(container.with_value(it))?.into(),
226-
ast::StaticDef(it) => self.static_to_def(container.with_value(it))?.into(),
225+
ast::Const(it) => self.const_to_def(container.with_value(it))?.into(),
226+
ast::Static(it) => self.static_to_def(container.with_value(it))?.into(),
227227
ast::Fn(it) => self.fn_to_def(container.with_value(it))?.into(),
228228
_ => continue,
229229
}

‎crates/ra_hir_def/src/adt.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ impl EnumData {
112112

113113
impl HasChildSource for EnumId {
114114
type ChildId = LocalEnumVariantId;
115-
type Value = ast::EnumVariant;
115+
type Value = ast::Variant;
116116
fn child_source(&self, db: &dyn DefDatabase) -> InFile<ArenaMap<Self::ChildId, Self::Value>> {
117117
let src = self.lookup(db).source(db);
118118
let mut trace = Trace::new_for_map();
@@ -123,7 +123,7 @@ impl HasChildSource for EnumId {
123123

124124
fn lower_enum(
125125
db: &dyn DefDatabase,
126-
trace: &mut Trace<EnumVariantData, ast::EnumVariant>,
126+
trace: &mut Trace<EnumVariantData, ast::Variant>,
127127
ast: &InFile<ast::Enum>,
128128
module_id: ModuleId,
129129
) {

‎crates/ra_hir_def/src/body/lower.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,14 +641,14 @@ impl ExprCollector<'_> {
641641
def.name(),
642642
)
643643
}
644-
ast::Item::ConstDef(def) => {
644+
ast::Item::Const(def) => {
645645
let id = self.find_inner_item(&def)?;
646646
(
647647
ConstLoc { container: container.into(), id }.intern(self.db).into(),
648648
def.name(),
649649
)
650650
}
651-
ast::Item::StaticDef(def) => {
651+
ast::Item::Static(def) => {
652652
let id = self.find_inner_item(&def)?;
653653
(StaticLoc { container, id }.intern(self.db).into(), def.name())
654654
}

0 commit comments

Comments
 (0)