diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-18 16:13:57 +0100 |
|---|---|---|
| committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-18 16:13:57 +0100 |
| commit | a15a278308047b160e5805dbb554a1949fcb0228 (patch) | |
| tree | e92b92abe2b38988c2ae4d185d987205a6f34384 | |
| parent | 517692de437a250d3a8758594cae69f4fe4216a9 (diff) | |
| parent | 0fb4b896e2b4a1da3069e30b4d4fba0821dc1e13 (diff) | |
Merge #1543
1543: use more correct phantom types for ptrs r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
| -rw-r--r-- | crates/ra_hir/src/source_id.rs | 2 | ||||
| -rw-r--r-- | crates/ra_syntax/src/ptr.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/source_id.rs b/crates/ra_hir/src/source_id.rs index 324b79824..6cdb90141 100644 --- a/crates/ra_hir/src/source_id.rs +++ b/crates/ra_hir/src/source_id.rs | |||
| @@ -52,7 +52,7 @@ impl<N: AstNode> AstId<N> { | |||
| 52 | #[derive(Debug)] | 52 | #[derive(Debug)] |
| 53 | pub(crate) struct FileAstId<N: AstNode> { | 53 | pub(crate) struct FileAstId<N: AstNode> { |
| 54 | raw: ErasedFileAstId, | 54 | raw: ErasedFileAstId, |
| 55 | _ty: PhantomData<N>, | 55 | _ty: PhantomData<fn() -> N>, |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | impl<N: AstNode> Clone for FileAstId<N> { | 58 | impl<N: AstNode> Clone for FileAstId<N> { |
diff --git a/crates/ra_syntax/src/ptr.rs b/crates/ra_syntax/src/ptr.rs index 0550dca1a..4823eb82e 100644 --- a/crates/ra_syntax/src/ptr.rs +++ b/crates/ra_syntax/src/ptr.rs | |||
| @@ -36,7 +36,7 @@ impl SyntaxNodePtr { | |||
| 36 | #[derive(Debug, PartialEq, Eq, Hash)] | 36 | #[derive(Debug, PartialEq, Eq, Hash)] |
| 37 | pub struct AstPtr<N: AstNode> { | 37 | pub struct AstPtr<N: AstNode> { |
| 38 | raw: SyntaxNodePtr, | 38 | raw: SyntaxNodePtr, |
| 39 | _ty: PhantomData<N>, | 39 | _ty: PhantomData<fn() -> N>, |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | impl<N: AstNode> Copy for AstPtr<N> {} | 42 | impl<N: AstNode> Copy for AstPtr<N> {} |