diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-12-20 07:06:55 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-12-20 07:06:55 +0000 |
| commit | f3125555a8de6fad4529408436800a6b1243a442 (patch) | |
| tree | 6cc2943b901f35ea3c351490f15cad9061a69c15 /crates/hir/src/lib.rs | |
| parent | 87886e89867d36c14812e70505c4db61a6b66bf0 (diff) | |
| parent | f6ed16674c461cb20c39e787fffab2269b9629b0 (diff) | |
Merge #6958
6958: Align code_model name with ungrammar r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/hir/src/lib.rs')
| -rw-r--r-- | crates/hir/src/lib.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 3f4f8d8e4..bdd270c58 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs | |||
| @@ -34,9 +34,9 @@ pub use crate::{ | |||
| 34 | attrs::{HasAttrs, Namespace}, | 34 | attrs::{HasAttrs, Namespace}, |
| 35 | code_model::{ | 35 | code_model::{ |
| 36 | Access, Adt, AsAssocItem, AssocItem, AssocItemContainer, Callable, CallableKind, Const, | 36 | Access, Adt, AsAssocItem, AssocItem, AssocItemContainer, Callable, CallableKind, Const, |
| 37 | Crate, CrateDependency, DefWithBody, Enum, EnumVariant, Field, FieldSource, Function, | 37 | Crate, CrateDependency, DefWithBody, Enum, Field, FieldSource, Function, GenericDef, |
| 38 | GenericDef, HasVisibility, Impl, LifetimeParam, Local, MacroDef, Module, ModuleDef, | 38 | HasVisibility, Impl, LifetimeParam, Local, MacroDef, Module, ModuleDef, ScopeDef, Static, |
| 39 | ScopeDef, Static, Struct, Trait, Type, TypeAlias, TypeParam, Union, VariantDef, | 39 | Struct, Trait, Type, TypeAlias, TypeParam, Union, Variant, VariantDef, |
| 40 | }, | 40 | }, |
| 41 | has_source::HasSource, | 41 | has_source::HasSource, |
| 42 | semantics::{PathResolution, Semantics, SemanticsScope}, | 42 | semantics::{PathResolution, Semantics, SemanticsScope}, |