Merge Ian's fixes to satisfy and/or silence Clippy.

The net effect of this branch is that 'cargo clippy' has no remaining
complaints.

diff --cc src/client.rs
Simple merge

diff --cc src/coloured_string.rs
Simple merge

diff --cc src/text.rs
Simple merge