Skip to content

Commit 12f1121

Browse files
add missing extension name
dont add crate
1 parent d4ea946 commit 12f1121

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

crates/hir-def/src/attrs.rs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ fn collect_attrs<BreakValue>(
398398
fn collect_field_attrs<T>(
399399
db: &dyn DefDatabase,
400400
variant: VariantId,
401-
mut field_attrs: impl FnMut(&CfgOptions, InFile<ast::AnyHasAttrs>, Crate) -> T,
401+
mut field_attrs: impl FnMut(&CfgOptions, InFile<ast::AnyHasAttrs>) -> T,
402402
) -> ArenaMap<LocalFieldId, T> {
403403
let (variant_syntax, krate) = match variant {
404404
VariantId::EnumVariantId(it) => attrs_from_ast_id_loc(db, it),
@@ -425,7 +425,7 @@ fn collect_field_attrs<T>(
425425
if AttrFlags::is_cfg_enabled_for(&field, cfg_options).is_ok() {
426426
result.insert(
427427
la_arena::Idx::from_raw(la_arena::RawIdx::from_u32(idx)),
428-
field_attrs(cfg_options, variant_syntax.with_value(field.into()), krate),
428+
field_attrs(cfg_options, variant_syntax.with_value(field.into())),
429429
);
430430
idx += 1;
431431
}
@@ -436,7 +436,7 @@ fn collect_field_attrs<T>(
436436
if AttrFlags::is_cfg_enabled_for(&field, cfg_options).is_ok() {
437437
result.insert(
438438
la_arena::Idx::from_raw(la_arena::RawIdx::from_u32(idx)),
439-
field_attrs(cfg_options, variant_syntax.with_value(field.into()), krate),
439+
field_attrs(cfg_options, variant_syntax.with_value(field.into())),
440440
);
441441
idx += 1;
442442
}
@@ -940,7 +940,7 @@ impl AttrFlags {
940940
db: &dyn DefDatabase,
941941
variant: VariantId,
942942
) -> ArenaMap<LocalFieldId, AttrFlags> {
943-
collect_field_attrs(db, variant, |cfg_options, field, _| {
943+
collect_field_attrs(db, variant, |cfg_options, field| {
944944
let mut attr_flags = AttrFlags::empty();
945945
expand_cfg_attr(
946946
field.value.attrs(),
@@ -1267,7 +1267,7 @@ impl AttrFlags {
12671267
db: &dyn DefDatabase,
12681268
variant: VariantId,
12691269
) -> ArenaMap<LocalFieldId, Box<[Symbol]>> {
1270-
collect_field_attrs(db, variant, |cfg_options, field, _| {
1270+
collect_field_attrs(db, variant, |cfg_options, field| {
12711271
let mut result = Vec::new();
12721272
expand_cfg_attr(
12731273
field.value.attrs(),
@@ -1309,7 +1309,7 @@ impl AttrFlags {
13091309
db: &dyn DefDatabase,
13101310
variant: VariantId,
13111311
) -> ArenaMap<LocalFieldId, Option<CfgExpr>> {
1312-
collect_field_attrs(db, variant, |cfg_options, field, _| {
1312+
collect_field_attrs(db, variant, |cfg_options, field| {
13131313
let mut result = Vec::new();
13141314
expand_cfg_attr(
13151315
field.value.attrs(),
@@ -1372,7 +1372,8 @@ impl AttrFlags {
13721372
db: &dyn DefDatabase,
13731373
variant: VariantId,
13741374
) -> ArenaMap<LocalFieldId, Option<Box<Docs>>> {
1375-
collect_field_attrs(db, variant, |cfg_options, field, krate| {
1375+
let krate = variant.krate(db);
1376+
collect_field_attrs(db, variant, |cfg_options, field| {
13761377
extract_docs(db, krate, &|| cfg_options, field, None, None)
13771378
})
13781379
}

crates/load-cargo/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -272,6 +272,7 @@ impl ProjectFolders {
272272
let mut dirs = vfs::loader::Directories::default();
273273
dirs.extensions.push("rs".into());
274274
dirs.extensions.push("toml".into());
275+
dirs.extensions.push("md".into());
275276
dirs.include.extend(root.include);
276277
dirs.exclude.extend(root.exclude);
277278
for excl in global_excludes {

0 commit comments

Comments
 (0)