use std::sync::Arc;
-use hir_def::{name::AsName, type_ref::TypeRef};
+use hir_def::type_ref::TypeRef;
+use hir_expand::name::AsName;
use ra_arena::{impl_arena_id, Arena, RawId};
use ra_syntax::ast::{self, NameOwner, StructKind, TypeAscriptionOwner};
use std::sync::Arc;
use hir_def::{
- name::{
- self, AsName, BOOL, CHAR, F32, F64, I128, I16, I32, I64, I8, ISIZE, SELF_TYPE, STR, U128,
- U16, U32, U64, U8, USIZE,
- },
type_ref::{Mutability, TypeRef},
CrateModuleId, ModuleId,
};
+use hir_expand::name::{
+ self, AsName, BOOL, CHAR, F32, F64, I128, I16, I32, I64, I8, ISIZE, SELF_TYPE, STR, U128, U16,
+ U32, U64, U8, USIZE,
+};
use ra_db::{CrateId, Edition};
use ra_syntax::ast::{self, NameOwner, TypeAscriptionOwner};
//! FIXME: write short doc here
-use hir_def::{
- hygiene::Hygiene,
- name::{self, AsName, Name},
- path::GenericArgs,
- type_ref::TypeRef,
-};
+use hir_def::{hygiene::Hygiene, path::GenericArgs, type_ref::TypeRef};
+use hir_expand::name::{self, AsName, Name};
use ra_arena::Arena;
use ra_syntax::{
ast::{
//! FIXME: write short doc here
-use hir_def::name::AsName;
+use hir_expand::name::AsName;
use ra_syntax::ast::{self, AstNode, NameOwner};
use crate::{
use std::sync::Arc;
use hir_def::{
- name::{self, AsName},
path::Path,
type_ref::{TypeBound, TypeRef},
};
+use hir_expand::name::{self, AsName};
use ra_syntax::ast::{self, DefaultTypeParamOwner, NameOwner, TypeBoundsOwner, TypeParamsOwner};
use crate::{
};
pub use hir_def::{
- name::Name,
path::{Path, PathKind},
type_ref::Mutability,
};
-pub use hir_expand::either::Either;
+pub use hir_expand::{either::Either, name::Name};
//! FIXME: write short doc here
-use hir_def::{attr::Attr, name, nameres::raw};
+use hir_def::{attr::Attr, nameres::raw};
+use hir_expand::name;
use ra_cfg::CfgOptions;
use ra_db::FileId;
use ra_syntax::{ast, SmolStr};
use std::sync::Arc;
use hir_def::{
- name::{self, Name},
path::{Path, PathKind},
CrateModuleId,
};
+use hir_expand::name::{self, Name};
use rustc_hash::FxHashSet;
use crate::{
//! purely for "IDE needs".
use std::sync::Arc;
-use hir_def::{name::AsName, path::known};
+use hir_def::path::known;
+use hir_expand::name::AsName;
use ra_db::FileId;
use ra_syntax::{
ast::{self, AstNode},
use std::sync::Arc;
-use hir_def::name::AsName;
+use hir_expand::name::AsName;
+
use ra_syntax::ast::{self, NameOwner};
use rustc_hash::FxHashMap;
use std::iter::successors;
-use hir_def::name;
+use hir_expand::name;
use log::{info, warn};
use super::{traits::Solution, Canonical, Substs, Ty, TypeWalk};
use rustc_hash::FxHashMap;
use hir_def::{
- name,
path::known,
type_ref::{Mutability, TypeRef},
};
+use hir_expand::name;
use ra_arena::map::ArenaMap;
use ra_prof::profile;
use test_utils::tested_by;
use std::iter::{repeat, repeat_with};
use std::sync::Arc;
-use hir_def::{
- name,
- path::{GenericArg, GenericArgs},
-};
+use hir_def::path::{GenericArg, GenericArgs};
+use hir_expand::name;
use super::{BindingMode, Expectation, InferenceContext, InferenceDiagnostic, TypeMismatch};
use crate::{
};
use chalk_rust_ir::{AssociatedTyDatum, ImplDatum, StructDatum, TraitDatum};
-use hir_def::name;
+use hir_expand::name;
+
use ra_db::salsa::{InternId, InternKey};
use super::{Canonical, ChalkContext, Impl, Obligation};
use std::sync::Arc;
-use hir_def::{
- name::{AsName, Name},
- type_ref::TypeRef,
-};
+use hir_def::type_ref::TypeRef;
+use hir_expand::name::{AsName, Name};
+
use ra_syntax::ast::NameOwner;
use crate::{
//! this moment, this is horribly incomplete and handles only `$crate`.
// Should this be moved to `hir_expand`? Seems like it.
-use hir_expand::either::Either;
-use hir_expand::{db::AstDatabase, HirFileId};
+use hir_expand::{
+ db::AstDatabase,
+ either::Either,
+ name::{AsName, Name},
+ HirFileId,
+};
use ra_db::CrateId;
use ra_syntax::ast;
-use crate::name::{AsName, Name};
-
#[derive(Debug)]
pub struct Hygiene {
// This is what `$crate` expands to
pub mod db;
pub mod attr;
-pub mod name;
pub mod path;
pub mod type_ref;
pub mod hygiene;
+++ /dev/null
-//! FIXME: write short doc here
-
-use std::fmt;
-
-use ra_syntax::{ast, SmolStr};
-
-/// `Name` is a wrapper around string, which is used in hir for both references
-/// and declarations. In theory, names should also carry hygiene info, but we are
-/// not there yet!
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
-pub struct Name(Repr);
-
-#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
-enum Repr {
- Text(SmolStr),
- TupleField(usize),
-}
-
-impl fmt::Display for Name {
- fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
- match &self.0 {
- Repr::Text(text) => fmt::Display::fmt(&text, f),
- Repr::TupleField(idx) => fmt::Display::fmt(&idx, f),
- }
- }
-}
-
-impl Name {
- /// Note: this is private to make creating name from random string hard.
- /// Hopefully, this should allow us to integrate hygiene cleaner in the
- /// future, and to switch to interned representation of names.
- const fn new_text(text: SmolStr) -> Name {
- Name(Repr::Text(text))
- }
-
- pub fn new_tuple_field(idx: usize) -> Name {
- Name(Repr::TupleField(idx))
- }
-
- /// Shortcut to create inline plain text name
- const fn new_inline_ascii(len: usize, text: &[u8]) -> Name {
- Name::new_text(SmolStr::new_inline_from_ascii(len, text))
- }
-
- /// Resolve a name from the text of token.
- fn resolve(raw_text: &SmolStr) -> Name {
- let raw_start = "r#";
- if raw_text.as_str().starts_with(raw_start) {
- Name::new_text(SmolStr::new(&raw_text[raw_start.len()..]))
- } else {
- Name::new_text(raw_text.clone())
- }
- }
-
- pub fn missing() -> Name {
- Name::new_text("[missing name]".into())
- }
-
- pub fn as_tuple_index(&self) -> Option<usize> {
- match self.0 {
- Repr::TupleField(idx) => Some(idx),
- _ => None,
- }
- }
-}
-
-pub trait AsName {
- fn as_name(&self) -> Name;
-}
-
-impl AsName for ast::NameRef {
- fn as_name(&self) -> Name {
- match self.as_tuple_field() {
- Some(idx) => Name::new_tuple_field(idx),
- None => Name::resolve(self.text()),
- }
- }
-}
-
-impl AsName for ast::Name {
- fn as_name(&self) -> Name {
- Name::resolve(self.text())
- }
-}
-
-impl AsName for ast::FieldKind {
- fn as_name(&self) -> Name {
- match self {
- ast::FieldKind::Name(nr) => nr.as_name(),
- ast::FieldKind::Index(idx) => Name::new_tuple_field(idx.text().parse().unwrap()),
- }
- }
-}
-
-impl AsName for ra_db::Dependency {
- fn as_name(&self) -> Name {
- Name::new_text(self.name.clone())
- }
-}
-
-// Primitives
-pub const ISIZE: Name = Name::new_inline_ascii(5, b"isize");
-pub const I8: Name = Name::new_inline_ascii(2, b"i8");
-pub const I16: Name = Name::new_inline_ascii(3, b"i16");
-pub const I32: Name = Name::new_inline_ascii(3, b"i32");
-pub const I64: Name = Name::new_inline_ascii(3, b"i64");
-pub const I128: Name = Name::new_inline_ascii(4, b"i128");
-pub const USIZE: Name = Name::new_inline_ascii(5, b"usize");
-pub const U8: Name = Name::new_inline_ascii(2, b"u8");
-pub const U16: Name = Name::new_inline_ascii(3, b"u16");
-pub const U32: Name = Name::new_inline_ascii(3, b"u32");
-pub const U64: Name = Name::new_inline_ascii(3, b"u64");
-pub const U128: Name = Name::new_inline_ascii(4, b"u128");
-pub const F32: Name = Name::new_inline_ascii(3, b"f32");
-pub const F64: Name = Name::new_inline_ascii(3, b"f64");
-pub const BOOL: Name = Name::new_inline_ascii(4, b"bool");
-pub const CHAR: Name = Name::new_inline_ascii(4, b"char");
-pub const STR: Name = Name::new_inline_ascii(3, b"str");
-
-// Special names
-pub const SELF_PARAM: Name = Name::new_inline_ascii(4, b"self");
-pub const SELF_TYPE: Name = Name::new_inline_ascii(4, b"Self");
-pub const MACRO_RULES: Name = Name::new_inline_ascii(11, b"macro_rules");
-
-// Components of known path (value or mod name)
-pub const STD: Name = Name::new_inline_ascii(3, b"std");
-pub const ITER: Name = Name::new_inline_ascii(4, b"iter");
-pub const OPS: Name = Name::new_inline_ascii(3, b"ops");
-pub const FUTURE: Name = Name::new_inline_ascii(6, b"future");
-pub const RESULT: Name = Name::new_inline_ascii(6, b"result");
-pub const BOXED: Name = Name::new_inline_ascii(5, b"boxed");
-
-// Components of known path (type name)
-pub const INTO_ITERATOR_TYPE: Name = Name::new_inline_ascii(12, b"IntoIterator");
-pub const ITEM_TYPE: Name = Name::new_inline_ascii(4, b"Item");
-pub const TRY_TYPE: Name = Name::new_inline_ascii(3, b"Try");
-pub const OK_TYPE: Name = Name::new_inline_ascii(2, b"Ok");
-pub const FUTURE_TYPE: Name = Name::new_inline_ascii(6, b"Future");
-pub const RESULT_TYPE: Name = Name::new_inline_ascii(6, b"Result");
-pub const OUTPUT_TYPE: Name = Name::new_inline_ascii(6, b"Output");
-pub const TARGET_TYPE: Name = Name::new_inline_ascii(6, b"Target");
-pub const BOX_TYPE: Name = Name::new_inline_ascii(3, b"Box");
use std::{ops::Index, sync::Arc};
-use hir_expand::{ast_id_map::AstIdMap, db::AstDatabase, either::Either};
+use hir_expand::{
+ ast_id_map::AstIdMap,
+ db::AstDatabase,
+ either::Either,
+ name::{AsName, Name},
+};
use ra_arena::{impl_arena_id, map::ArenaMap, Arena, RawId};
use ra_syntax::{
ast::{self, AttrsOwner, NameOwner},
};
use crate::{
- attr::Attr,
- db::DefDatabase2,
- hygiene::Hygiene,
- name::{AsName, Name},
- path::Path,
- FileAstId, HirFileId, ModuleSource, Source,
+ attr::Attr, db::DefDatabase2, hygiene::Hygiene, path::Path, FileAstId, HirFileId, ModuleSource,
+ Source,
};
/// `RawItems` is a set of top-level items in a file (except for impls).
use std::{iter, sync::Arc};
-use hir_expand::either::Either;
+use hir_expand::{
+ either::Either,
+ name::{self, AsName, Name},
+};
use ra_db::CrateId;
use ra_syntax::{
ast::{self, NameOwner, TypeAscriptionOwner},
AstNode,
};
-use crate::{
- hygiene::Hygiene,
- name::{self, AsName, Name},
- type_ref::TypeRef,
- Source,
-};
+use crate::{hygiene::Hygiene, type_ref::TypeRef, Source};
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub struct Path {
}
pub mod known {
+ use hir_expand::name;
+
use super::{Path, PathKind};
- use crate::name;
pub fn std_iter_into_iterator() -> Path {
Path::from_simple_segments(
pub mod db;
pub mod ast_id_map;
pub mod either;
+pub mod name;
use std::hash::{Hash, Hasher};
--- /dev/null
+//! FIXME: write short doc here
+
+use std::fmt;
+
+use ra_syntax::{ast, SmolStr};
+
+/// `Name` is a wrapper around string, which is used in hir for both references
+/// and declarations. In theory, names should also carry hygiene info, but we are
+/// not there yet!
+#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+pub struct Name(Repr);
+
+#[derive(Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord)]
+enum Repr {
+ Text(SmolStr),
+ TupleField(usize),
+}
+
+impl fmt::Display for Name {
+ fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+ match &self.0 {
+ Repr::Text(text) => fmt::Display::fmt(&text, f),
+ Repr::TupleField(idx) => fmt::Display::fmt(&idx, f),
+ }
+ }
+}
+
+impl Name {
+ /// Note: this is private to make creating name from random string hard.
+ /// Hopefully, this should allow us to integrate hygiene cleaner in the
+ /// future, and to switch to interned representation of names.
+ const fn new_text(text: SmolStr) -> Name {
+ Name(Repr::Text(text))
+ }
+
+ pub fn new_tuple_field(idx: usize) -> Name {
+ Name(Repr::TupleField(idx))
+ }
+
+ /// Shortcut to create inline plain text name
+ const fn new_inline_ascii(len: usize, text: &[u8]) -> Name {
+ Name::new_text(SmolStr::new_inline_from_ascii(len, text))
+ }
+
+ /// Resolve a name from the text of token.
+ fn resolve(raw_text: &SmolStr) -> Name {
+ let raw_start = "r#";
+ if raw_text.as_str().starts_with(raw_start) {
+ Name::new_text(SmolStr::new(&raw_text[raw_start.len()..]))
+ } else {
+ Name::new_text(raw_text.clone())
+ }
+ }
+
+ pub fn missing() -> Name {
+ Name::new_text("[missing name]".into())
+ }
+
+ pub fn as_tuple_index(&self) -> Option<usize> {
+ match self.0 {
+ Repr::TupleField(idx) => Some(idx),
+ _ => None,
+ }
+ }
+}
+
+pub trait AsName {
+ fn as_name(&self) -> Name;
+}
+
+impl AsName for ast::NameRef {
+ fn as_name(&self) -> Name {
+ match self.as_tuple_field() {
+ Some(idx) => Name::new_tuple_field(idx),
+ None => Name::resolve(self.text()),
+ }
+ }
+}
+
+impl AsName for ast::Name {
+ fn as_name(&self) -> Name {
+ Name::resolve(self.text())
+ }
+}
+
+impl AsName for ast::FieldKind {
+ fn as_name(&self) -> Name {
+ match self {
+ ast::FieldKind::Name(nr) => nr.as_name(),
+ ast::FieldKind::Index(idx) => Name::new_tuple_field(idx.text().parse().unwrap()),
+ }
+ }
+}
+
+impl AsName for ra_db::Dependency {
+ fn as_name(&self) -> Name {
+ Name::new_text(self.name.clone())
+ }
+}
+
+// Primitives
+pub const ISIZE: Name = Name::new_inline_ascii(5, b"isize");
+pub const I8: Name = Name::new_inline_ascii(2, b"i8");
+pub const I16: Name = Name::new_inline_ascii(3, b"i16");
+pub const I32: Name = Name::new_inline_ascii(3, b"i32");
+pub const I64: Name = Name::new_inline_ascii(3, b"i64");
+pub const I128: Name = Name::new_inline_ascii(4, b"i128");
+pub const USIZE: Name = Name::new_inline_ascii(5, b"usize");
+pub const U8: Name = Name::new_inline_ascii(2, b"u8");
+pub const U16: Name = Name::new_inline_ascii(3, b"u16");
+pub const U32: Name = Name::new_inline_ascii(3, b"u32");
+pub const U64: Name = Name::new_inline_ascii(3, b"u64");
+pub const U128: Name = Name::new_inline_ascii(4, b"u128");
+pub const F32: Name = Name::new_inline_ascii(3, b"f32");
+pub const F64: Name = Name::new_inline_ascii(3, b"f64");
+pub const BOOL: Name = Name::new_inline_ascii(4, b"bool");
+pub const CHAR: Name = Name::new_inline_ascii(4, b"char");
+pub const STR: Name = Name::new_inline_ascii(3, b"str");
+
+// Special names
+pub const SELF_PARAM: Name = Name::new_inline_ascii(4, b"self");
+pub const SELF_TYPE: Name = Name::new_inline_ascii(4, b"Self");
+pub const MACRO_RULES: Name = Name::new_inline_ascii(11, b"macro_rules");
+
+// Components of known path (value or mod name)
+pub const STD: Name = Name::new_inline_ascii(3, b"std");
+pub const ITER: Name = Name::new_inline_ascii(4, b"iter");
+pub const OPS: Name = Name::new_inline_ascii(3, b"ops");
+pub const FUTURE: Name = Name::new_inline_ascii(6, b"future");
+pub const RESULT: Name = Name::new_inline_ascii(6, b"result");
+pub const BOXED: Name = Name::new_inline_ascii(5, b"boxed");
+
+// Components of known path (type name)
+pub const INTO_ITERATOR_TYPE: Name = Name::new_inline_ascii(12, b"IntoIterator");
+pub const ITEM_TYPE: Name = Name::new_inline_ascii(4, b"Item");
+pub const TRY_TYPE: Name = Name::new_inline_ascii(3, b"Try");
+pub const OK_TYPE: Name = Name::new_inline_ascii(2, b"Ok");
+pub const FUTURE_TYPE: Name = Name::new_inline_ascii(6, b"Future");
+pub const RESULT_TYPE: Name = Name::new_inline_ascii(6, b"Result");
+pub const OUTPUT_TYPE: Name = Name::new_inline_ascii(6, b"Output");
+pub const TARGET_TYPE: Name = Name::new_inline_ascii(6, b"Target");
+pub const BOX_TYPE: Name = Name::new_inline_ascii(3, b"Box");
projects / rust.git / commitdiff