prefer into()
This commit is contained in:
parent
a5ecf19f70
commit
79acb4e3e2
4 changed files with 21 additions and 21 deletions
|
|
@ -221,8 +221,8 @@ mod tests {
|
|||
#[test]
|
||||
fn start_upload_works() {
|
||||
let client = MockClient::default();
|
||||
let uri = sharry::Uri::from(true);
|
||||
let alias_id = sharry::AliasID::from(true);
|
||||
let uri = true.into();
|
||||
let alias_id = true.into();
|
||||
|
||||
let share_id = client
|
||||
.share_create(&uri, &alias_id, NewShareRequest::new("share", 0))
|
||||
|
|
|
|||
|
|
@ -153,8 +153,8 @@ mod tests {
|
|||
|
||||
fn create_uploading(content: &[u8]) -> (Uploading, sharry::ShareID, NamedTempFile) {
|
||||
let client = MockClient::default();
|
||||
let uri = sharry::Uri::from(true);
|
||||
let alias_id = sharry::AliasID::from(true);
|
||||
let uri = true.into();
|
||||
let alias_id = true.into();
|
||||
|
||||
let share_id = client
|
||||
.share_create(&uri, &alias_id, NewShareRequest::new("share", 0))
|
||||
|
|
@ -273,8 +273,8 @@ mod tests {
|
|||
#[test]
|
||||
fn upload_works() {
|
||||
let client = MockClient::default();
|
||||
let uri = sharry::Uri::from(true);
|
||||
let alias_id = sharry::AliasID::from(true);
|
||||
let uri = true.into();
|
||||
let alias_id = true.into();
|
||||
|
||||
let share_id = client
|
||||
.share_create(&uri, &alias_id, NewShareRequest::new("share", 0))
|
||||
|
|
@ -310,8 +310,8 @@ mod tests {
|
|||
.map(|(content, _)| content);
|
||||
|
||||
let client = MockClient::default();
|
||||
let uri = sharry::Uri::from(true);
|
||||
let alias_id = sharry::AliasID::from(true);
|
||||
let uri = true.into();
|
||||
let alias_id = true.into();
|
||||
|
||||
let share_id = client
|
||||
.share_create(&uri, &alias_id, NewShareRequest::new("share", 0))
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ mod tests {
|
|||
}
|
||||
|
||||
fn add_share(client: &MockClient) -> ShareID {
|
||||
let share_id = ShareID::from(true);
|
||||
let share_id = true.into();
|
||||
client
|
||||
.insert_share(&share_id, MockShare::default())
|
||||
.unwrap();
|
||||
|
|
@ -196,7 +196,7 @@ mod tests {
|
|||
}
|
||||
|
||||
fn add_file(client: &MockClient, share_id: &ShareID) -> FileID {
|
||||
let file_id = FileID::from(true);
|
||||
let file_id = true.into();
|
||||
client
|
||||
.insert_file(share_id, &file_id, MockFile::default())
|
||||
.unwrap();
|
||||
|
|
@ -207,7 +207,7 @@ mod tests {
|
|||
#[test]
|
||||
fn insert_share_works() {
|
||||
let client = MockClient::default();
|
||||
let share_ids: [_; 10] = std::array::from_fn(|_| ShareID::from(true));
|
||||
let share_ids: [_; 10] = std::array::from_fn(|_| true.into());
|
||||
|
||||
for share_id in share_ids.as_ref() {
|
||||
assert!(client.insert_share(share_id, MockShare::default()).is_ok());
|
||||
|
|
@ -242,7 +242,7 @@ mod tests {
|
|||
fn get_share_nex_errors() {
|
||||
let client = MockClient::default();
|
||||
add_share(&client);
|
||||
let share_ids_nex: [_; 10] = std::array::from_fn(|_| ShareID::from(true));
|
||||
let share_ids_nex: [_; 10] = std::array::from_fn(|_| true.into());
|
||||
|
||||
for share_id_nex in share_ids_nex.as_ref() {
|
||||
let res = client.get_share(share_id_nex);
|
||||
|
|
@ -256,7 +256,7 @@ mod tests {
|
|||
fn insert_file_works() {
|
||||
let client = MockClient::default();
|
||||
let share_id = add_share(&client);
|
||||
let file_ids: [_; 10] = std::array::from_fn(|_| FileID::from(true));
|
||||
let file_ids: [_; 10] = std::array::from_fn(|_| true.into());
|
||||
|
||||
for file_id in file_ids.as_ref() {
|
||||
assert!(
|
||||
|
|
@ -278,7 +278,7 @@ mod tests {
|
|||
add_share(&client);
|
||||
|
||||
let share_id_nex = ShareID::default();
|
||||
let res = client.insert_file(&share_id_nex, &FileID::from(true), MockFile::default());
|
||||
let res = client.insert_file(&share_id_nex, &true.into(), MockFile::default());
|
||||
assert!(res.is_err());
|
||||
assert!(res.unwrap_err().response_contains("can't find share"));
|
||||
}
|
||||
|
|
@ -312,10 +312,10 @@ mod tests {
|
|||
let client = MockClient::default();
|
||||
let share_id = add_share(&client);
|
||||
add_file(&client, &share_id);
|
||||
let file_ids_nex: [_; 10] = std::array::from_fn(|_| FileID::from(true));
|
||||
let file_ids_nex: [_; 10] = std::array::from_fn(|_| true.into());
|
||||
|
||||
for file_id_nex in file_ids_nex.as_ref() {
|
||||
let share_id_nex = ShareID::from(true);
|
||||
let share_id_nex = true.into();
|
||||
let res = client.get_file(&share_id_nex, file_id_nex);
|
||||
|
||||
assert!(res.is_err());
|
||||
|
|
|
|||
|
|
@ -129,7 +129,7 @@ mod tests {
|
|||
#[test]
|
||||
fn default_is_valid() {
|
||||
let uri = Uri::default();
|
||||
let alias_id = AliasID::from(true); // no `impl Default`
|
||||
let alias_id = true.into(); // no `impl Default`
|
||||
let share_id = ShareID::default();
|
||||
let file_id = FileID::default();
|
||||
|
||||
|
|
@ -149,10 +149,10 @@ mod tests {
|
|||
}
|
||||
|
||||
// valid ids
|
||||
let uri = Uri::from(true);
|
||||
let alias_id = AliasID::from(true);
|
||||
let share_id = ShareID::from(true);
|
||||
let file_id = FileID::from(true);
|
||||
let uri = true.into();
|
||||
let alias_id = true.into();
|
||||
let share_id = true.into();
|
||||
let file_id = true.into();
|
||||
|
||||
// invalid ids
|
||||
let uri_i = Uri::from(false);
|
||||
|
|
|
|||
Loading…
Reference in a new issue