Skip to content

Commit 19fc1f3

Browse files
bors[bot]Veykril
andauthored
Merge #8559
8559: Add some more error messages to fixture failure cases r=Veykril a=Veykril Follow up for #8557 bors r+ Co-authored-by: Lukas Wirth <lukastw97@gmail.com>
2 parents eb38dc7 + 58a6ec5 commit 19fc1f3

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

crates/base_db/src/fixture.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ pub trait WithFixture: Default + SourceDatabaseExt + 'static {
3535
fn with_position(ra_fixture: &str) -> (Self, FilePosition) {
3636
let (db, file_id, range_or_offset) = Self::with_range_or_offset(ra_fixture);
3737
let offset = match range_or_offset {
38-
RangeOrOffset::Range(_) => panic!(),
38+
RangeOrOffset::Range(_) => panic!("Expected a cursor position, got a range instead"),
3939
RangeOrOffset::Offset(it) => it,
4040
};
4141
(db, FilePosition { file_id, offset })
@@ -45,7 +45,7 @@ pub trait WithFixture: Default + SourceDatabaseExt + 'static {
4545
let (db, file_id, range_or_offset) = Self::with_range_or_offset(ra_fixture);
4646
let range = match range_or_offset {
4747
RangeOrOffset::Range(it) => it,
48-
RangeOrOffset::Offset(_) => panic!(),
48+
RangeOrOffset::Offset(_) => panic!("Expected a cursor range, got a position instead"),
4949
};
5050
(db, FileRange { file_id, range })
5151
}

crates/ide_assists/src/tests.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ fn check_doc_test(assist_id: &str, before: &str, after: &str) {
8484
});
8585

8686
let actual = {
87-
let source_change = assist.source_change.unwrap();
87+
let source_change =
88+
assist.source_change.expect("Assist did not contain any source changes");
8889
let mut actual = before;
8990
if let Some(source_file_edit) = source_change.get_source_edit(file_id) {
9091
source_file_edit.apply(&mut actual);
@@ -121,7 +122,8 @@ fn check(handler: Handler, before: &str, expected: ExpectedResult, assist_label:
121122

122123
match (assist, expected) {
123124
(Some(assist), ExpectedResult::After(after)) => {
124-
let source_change = assist.source_change.unwrap();
125+
let source_change =
126+
assist.source_change.expect("Assist did not contain any source changes");
125127
assert!(!source_change.source_file_edits.is_empty());
126128
let skip_header = source_change.source_file_edits.len() == 1
127129
&& source_change.file_system_edits.len() == 0;

0 commit comments

Comments
 (0)