diff options
| author | Lukas Wirth <[email protected]> | 2020-09-12 10:55:01 +0100 |
|---|---|---|
| committer | Lukas Wirth <[email protected]> | 2020-09-12 11:11:16 +0100 |
| commit | adc4c6b9d7fd91827c4cf383a1e95dc7e27138e0 (patch) | |
| tree | 52e7715aed7a83da34c0c6c139d3651dd255629e /crates/ide | |
| parent | c8623461a57e7882ac47b5da13a1a03efa58f603 (diff) | |
Make MergeBehaviour configurable
Diffstat (limited to 'crates/ide')
| -rw-r--r-- | crates/ide/src/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs index 570790384..3b97e087f 100644 --- a/crates/ide/src/lib.rs +++ b/crates/ide/src/lib.rs | |||
| @@ -81,7 +81,9 @@ pub use crate::{ | |||
| 81 | }, | 81 | }, |
| 82 | }; | 82 | }; |
| 83 | 83 | ||
| 84 | pub use assists::{Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist}; | 84 | pub use assists::{ |
| 85 | utils::MergeBehaviour, Assist, AssistConfig, AssistId, AssistKind, ResolvedAssist, | ||
| 86 | }; | ||
| 85 | pub use base_db::{ | 87 | pub use base_db::{ |
| 86 | Canceled, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot, | 88 | Canceled, CrateGraph, CrateId, Edition, FileId, FilePosition, FileRange, SourceRoot, |
| 87 | SourceRootId, | 89 | SourceRootId, |