chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Replace .err().unwrap() with .unwrap_err()

Browse Source
This commit is contained in:
Jonas Platte 2019-12-14 16:00:11 +01:00
parent 874b32a53b
commit f21f4b4733
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
5 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/event_id.rs
View File

@ -324,7 +324,7 @@ mod tests {
#[test]
fn missing_original_event_id_sigil() {
assert_eq!(
EventId::try_from("39hvsi03hlne:example.com").err().unwrap(),
EventId::try_from("39hvsi03hlne:example.com").unwrap_err(),
Error::MissingSigil
);
}
@ -332,9 +332,7 @@ mod tests {
#[test]
fn missing_base64_event_id_sigil() {
assert_eq!(
EventId::try_from("acR1l0raoZnm60CBwAVgqbZqoO/mYU81xysh1u7XcJk")
.err()
.unwrap(),
EventId::try_from("acR1l0raoZnm60CBwAVgqbZqoO/mYU81xysh1u7XcJk").unwrap_err(),
Error::MissingSigil
);
}
@ -342,9 +340,7 @@ mod tests {
#[test]
fn missing_url_safe_base64_event_id_sigil() {
assert_eq!(
EventId::try_from("Rqnc-F-dvnEYJTyHq_iKxU2bZ1CI92-kuZq3a5lr5Zg")
.err()
.unwrap(),
EventId::try_from("Rqnc-F-dvnEYJTyHq_iKxU2bZ1CI92-kuZq3a5lr5Zg").unwrap_err(),
Error::MissingSigil
);
}
@ -352,7 +348,7 @@ mod tests {
#[test]
fn invalid_event_id_host() {
assert_eq!(
EventId::try_from("$39hvsi03hlne:/").err().unwrap(),
EventId::try_from("$39hvsi03hlne:/").unwrap_err(),
Error::InvalidHost
);
}
@ -360,9 +356,7 @@ mod tests {
#[test]
fn invalid_event_id_port() {
assert_eq!(
EventId::try_from("$39hvsi03hlne:example.com:notaport")
.err()
.unwrap(),
EventId::try_from("$39hvsi03hlne:example.com:notaport").unwrap_err(),
Error::InvalidHost
);
}

12
src/room_alias_id.rs
View File

@ -171,9 +171,7 @@ mod tests {
#[test]
fn missing_room_alias_id_sigil() {
assert_eq!(
RoomAliasId::try_from("39hvsi03hlne:example.com")
.err()
.unwrap(),
RoomAliasId::try_from("39hvsi03hlne:example.com").unwrap_err(),
Error::MissingSigil
);
}
@ -181,7 +179,7 @@ mod tests {
#[test]
fn missing_room_alias_id_delimiter() {
assert_eq!(
RoomAliasId::try_from("#ruma").err().unwrap(),
RoomAliasId::try_from("#ruma").unwrap_err(),
Error::MissingDelimiter
);
}
@ -189,7 +187,7 @@ mod tests {
#[test]
fn invalid_room_alias_id_host() {
assert_eq!(
RoomAliasId::try_from("#ruma:/").err().unwrap(),
RoomAliasId::try_from("#ruma:/").unwrap_err(),
Error::InvalidHost
);
}
@ -197,9 +195,7 @@ mod tests {
#[test]
fn invalid_room_alias_id_port() {
assert_eq!(
RoomAliasId::try_from("#ruma:example.com:notaport")
.err()
.unwrap(),
RoomAliasId::try_from("#ruma:example.com:notaport").unwrap_err(),
Error::InvalidHost
);
}

10
src/room_id.rs
View File

@ -191,7 +191,7 @@ mod tests {
#[test]
fn missing_room_id_sigil() {
assert_eq!(
RoomId::try_from("carl:example.com").err().unwrap(),
RoomId::try_from("carl:example.com").unwrap_err(),
Error::MissingSigil
);
}
@ -199,7 +199,7 @@ mod tests {
#[test]
fn missing_room_id_delimiter() {
assert_eq!(
RoomId::try_from("!29fhd83h92h0").err().unwrap(),
RoomId::try_from("!29fhd83h92h0").unwrap_err(),
Error::MissingDelimiter
);
}
@ -207,7 +207,7 @@ mod tests {
#[test]
fn invalid_room_id_host() {
assert_eq!(
RoomId::try_from("!29fhd83h92h0:/").err().unwrap(),
RoomId::try_from("!29fhd83h92h0:/").unwrap_err(),
Error::InvalidHost
);
}
@ -215,9 +215,7 @@ mod tests {
#[test]
fn invalid_room_id_port() {
assert_eq!(
RoomId::try_from("!29fhd83h92h0:example.com:notaport")
.err()
.unwrap(),
RoomId::try_from("!29fhd83h92h0:example.com:notaport").unwrap_err(),
Error::InvalidHost
);
}

2
src/room_id_or_room_alias_id.rs
View File

@ -150,7 +150,7 @@ mod tests {
#[test]
fn missing_sigil_for_room_id_or_alias_id() {
assert_eq!(
RoomIdOrAliasId::try_from("ruma:example.com").err().unwrap(),
RoomIdOrAliasId::try_from("ruma:example.com").unwrap_err(),
Error::MissingSigil
);
}

15
src/user_id.rs
View File

@ -236,7 +236,7 @@ mod tests {
#[test]
fn invalid_characters_in_user_id_localpart() {
assert_eq!(
UserId::try_from("@te\nst:example.com").err().unwrap(),
UserId::try_from("@te\nst:example.com").unwrap_err(),
Error::InvalidCharacters
);
}
@ -244,7 +244,7 @@ mod tests {
#[test]
fn missing_user_id_sigil() {
assert_eq!(
UserId::try_from("carl:example.com").err().unwrap(),
UserId::try_from("carl:example.com").unwrap_err(),
Error::MissingSigil
);
}
@ -252,25 +252,20 @@ mod tests {
#[test]
fn missing_user_id_delimiter() {
assert_eq!(
UserId::try_from("@carl").err().unwrap(),
UserId::try_from("@carl").unwrap_err(),
Error::MissingDelimiter
);
}
#[test]
fn invalid_user_id_host() {
assert_eq!(
UserId::try_from("@carl:/").err().unwrap(),
Error::InvalidHost
);
assert_eq!(UserId::try_from("@carl:/").unwrap_err(), Error::InvalidHost);
}
#[test]
fn invalid_user_id_port() {
assert_eq!(
UserId::try_from("@carl:example.com:notaport")
.err()
.unwrap(),
UserId::try_from("@carl:example.com:notaport").unwrap_err(),
Error::InvalidHost
);
}