diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-09 01:41:03 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-09 01:41:03 +0100 |
commit | 35f28c538a9b9f461bb4db1a78d02e9f02a3d296 (patch) | |
tree | a610ad33b7bc3a1e14770cb34036fa1430ebc900 /crates/ra_hir/src/name.rs | |
parent | ecdc6cdce997c6ae251dbda2066de929f9d49c49 (diff) | |
parent | 9a0d4b16b7d14530b77c96e2e18b80b3f5b526c8 (diff) |
Merge #1512
1512: Infer ? operator r=unrealhoang a=unrealhoang
Logical continuation of https://github.com/rust-analyzer/rust-analyzer/pull/1501
cc https://github.com/rust-analyzer/rust-analyzer/issues/1426
Co-authored-by: Unreal Hoang <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/name.rs')
-rw-r--r-- | crates/ra_hir/src/name.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/crates/ra_hir/src/name.rs b/crates/ra_hir/src/name.rs index 5f64b7759..40c9d6002 100644 --- a/crates/ra_hir/src/name.rs +++ b/crates/ra_hir/src/name.rs | |||
@@ -115,6 +115,9 @@ pub(crate) const ITER: Name = Name::new(SmolStr::new_inline_from_ascii(4, b"iter | |||
115 | pub(crate) const INTO_ITERATOR: Name = | 115 | pub(crate) const INTO_ITERATOR: Name = |
116 | Name::new(SmolStr::new_inline_from_ascii(12, b"IntoIterator")); | 116 | Name::new(SmolStr::new_inline_from_ascii(12, b"IntoIterator")); |
117 | pub(crate) const ITEM: Name = Name::new(SmolStr::new_inline_from_ascii(4, b"Item")); | 117 | pub(crate) const ITEM: Name = Name::new(SmolStr::new_inline_from_ascii(4, b"Item")); |
118 | pub(crate) const OPS: Name = Name::new(SmolStr::new_inline_from_ascii(3, b"ops")); | ||
119 | pub(crate) const TRY: Name = Name::new(SmolStr::new_inline_from_ascii(3, b"Try")); | ||
120 | pub(crate) const OK: Name = Name::new(SmolStr::new_inline_from_ascii(2, b"Ok")); | ||
118 | 121 | ||
119 | fn resolve_name(text: &SmolStr) -> SmolStr { | 122 | fn resolve_name(text: &SmolStr) -> SmolStr { |
120 | let raw_start = "r#"; | 123 | let raw_start = "r#"; |