Move colours module into output

This commit moves the colours module to be a sub-module of the output one.
This makes sense because finding which colour a certain file should be is only
done during output, and (I think) the only places that the `Colours` struct's
fields are ever queried is from the output module.

The only casualty was that the `file_colour` from the filetype module had to
be moved, as determining colours is no longer part of that module - only
determining filetype is. So it now reflects its name!

1 files changed, 3 insertions, 3 deletions

diff --git a/src/output/lines.rs b/src/output/lines.rs
index 39ef2c3..07c4351 100644
--- a/src/output/lines.rs
+++ b/src/output/lines.rs
@@ -1,9 +1,9 @@
-use colours::Colours;
-use file::File;
-
 use ansi_term::ANSIStrings;
 
+use file::File;
+
 use super::filename;
+use super::colours::Colours;
 
 
 #[derive(Clone, Copy, Debug, PartialEq)]