[ul] Fix API breakages from past contributions for 0.9.1

echoscu/src/main.rs

@@ -3,7 +3,7 @@ use dicom_core::{dicom_value, DataElement, VR};
 use dicom_dictionary_std::{tags, uids};
 use dicom_object::{mem::InMemDicomObject, StandardDataDictionary};
 use dicom_ul::{
-    association::{Association, SyncAssociation, client::ClientAssociationOptions},
+    association::{client::ClientAssociationOptions},
     pdu::{self, PDataValueType, Pdu},
 };
 use pdu::PDataValue;

findscu/src/main.rs

@@ -6,7 +6,6 @@ use dicom_dump::DumpOptions;
 use dicom_encoding::transfer_syntax;
 use dicom_object::{mem::InMemDicomObject, open_file, StandardDataDictionary};
 use dicom_transfer_syntax_registry::{entries, TransferSyntaxRegistry};
-use dicom_ul::association::{Association, SyncAssociation};
 use dicom_ul::pdu::Pdu;
 use dicom_ul::{
     association::ClientAssociationOptions,

storescp/src/store_async.rs

@@ -4,7 +4,8 @@ use dicom_dictionary_std::tags;
 use dicom_encoding::transfer_syntax::TransferSyntaxIndex;
 use dicom_object::{FileMetaTableBuilder, InMemDicomObject};
 use dicom_transfer_syntax_registry::TransferSyntaxRegistry;
-use dicom_ul::{Pdu, association::{Association, AsyncAssociation, AsyncServerAssociation}, pdu::{PDataValueType, PresentationContextResultReason}};
+use dicom_ul::prelude::*;
+use dicom_ul::{Pdu, association::AsyncServerAssociation, pdu::{PDataValueType, PresentationContextResultReason}};
 use snafu::{OptionExt, Report, ResultExt, Whatever};
 use tracing::{debug, info, warn};
 

storescp/src/store_sync.rs

@@ -5,7 +5,7 @@ use dicom_dictionary_std::tags;
 use dicom_encoding::transfer_syntax::TransferSyntaxIndex;
 use dicom_object::{FileMetaTableBuilder, InMemDicomObject};
 use dicom_transfer_syntax_registry::TransferSyntaxRegistry;
-use dicom_ul::{Pdu, ServerAssociation, association::{Association, CloseSocket, SyncAssociation}, pdu::{PDataValueType, PresentationContextResultReason}};
+use dicom_ul::{Pdu, ServerAssociation, association::{Association, CloseSocket}, pdu::{PDataValueType, PresentationContextResultReason}};
 use snafu::{OptionExt, Report, ResultExt, Whatever};
 use tracing::{debug, info, warn};
 

storescu/src/store_async.rs

@@ -5,7 +5,7 @@ use dicom_encoding::TransferSyntaxIndex;
 use dicom_object::{open_file, InMemDicomObject};
 use dicom_transfer_syntax_registry::TransferSyntaxRegistry;
 use dicom_ul::{
-    Pdu, association::{Association, AsyncAssociation, client::AsyncClientAssociation}, pdu::{PDataValue, PDataValueType}
+    Pdu, association::client::AsyncClientAssociation, pdu::{PDataValue, PDataValueType}
 };
 use indicatif::ProgressBar;
 use snafu::{OptionExt, Report, ResultExt};

storescu/src/store_sync.rs

@@ -7,7 +7,7 @@ use dicom_encoding::TransferSyntaxIndex;
 use dicom_object::{open_file, InMemDicomObject};
 use dicom_transfer_syntax_registry::TransferSyntaxRegistry;
 use dicom_ul::{
-    ClientAssociation, Pdu, association::{Association, CloseSocket, SyncAssociation}, pdu::{PDataValue, PDataValueType}
+    ClientAssociation, Pdu, association::CloseSocket, pdu::{PDataValue, PDataValueType}
 };
 use indicatif::ProgressBar;
 use snafu::{OptionExt, Report, ResultExt};

ul/README.md

@@ -3,7 +3,23 @@
 [![CratesIO](https://img.shields.io/crates/v/dicom-ul.svg)](https://crates.io/crates/dicom-ul)
 [![Documentation](https://docs.rs/dicom-ul/badge.svg)](https://docs.rs/dicom-ul)
 
-This is an implementation of the DICOM upper layer protocol.
+An implementation of the DICOM upper layer protocol.
+This crate contains the types and methods needed
+to interact with DICOM nodes through the upper layer protocol.
+It can be used as a base for finite-state machines and higher-level helpers,
+enabling the creation of concrete
+service class users (SCUs) and service class providers (SCPs).
+TLS support for secure transport connections
+is also available via [Rustls](https://crates.io/crates/rustls).
+
+Examples of DICOM network tools constructed using `dicom-ul` include
+[dicom-storescp](https://crates.io/crates/dicom-storescp),
+[dicom-storescu](https://crates.io/crates/dicom-storescu),
+and [dicom-findscu](https://crates.io/crates/dicom-findscu).
+
+This crate is part of the [DICOM-rs](https://github.com/Enet4/dicom-rs) project
+and is contained by the parent crate [`dicom`](https://crates.io/crates/dicom)
+for convenience.
 
 ## Testing