diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-11-24 18:01:49 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-11-24 18:01:49 +0000 |
| commit | e2d8e1120fbf99d40e8b69039b5e25e788365779 (patch) | |
| tree | 12fc2464ad36452481fd29b9a174840be3765dd2 /crates/hir/src | |
| parent | d2f398cd76659425c9d48185a1be92ee9a9332c2 (diff) | |
| parent | d5e9bf80f9e68cabf694226e2bad896c1ee00742 (diff) | |
Merge #6625
6625: hir_expand: propagate expansion errors r=jonas-schievink a=jonas-schievink
This is needed to collect and report expansion errors later.
bors r+ :robot:
Co-authored-by: Jonas Schievink <[email protected]>
Diffstat (limited to 'crates/hir/src')
| -rw-r--r-- | crates/hir/src/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 5fea25ef1..ed110329d 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs | |||
| @@ -57,8 +57,8 @@ pub use hir_def::{ | |||
| 57 | visibility::Visibility, | 57 | visibility::Visibility, |
| 58 | }; | 58 | }; |
| 59 | pub use hir_expand::{ | 59 | pub use hir_expand::{ |
| 60 | name::known, name::AsName, name::Name, HirFileId, InFile, MacroCallId, MacroCallLoc, | 60 | db::MacroResult, name::known, name::AsName, name::Name, HirFileId, InFile, MacroCallId, |
| 61 | /* FIXME */ MacroDefId, MacroFile, Origin, | 61 | MacroCallLoc, /* FIXME */ MacroDefId, MacroFile, Origin, |
| 62 | }; | 62 | }; |
| 63 | pub use hir_ty::display::HirDisplay; | 63 | pub use hir_ty::display::HirDisplay; |
| 64 | 64 | ||