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, 4 insertions, 4 deletions

diff --git a/src/output/grid.rs b/src/output/grid.rs
index 69001bf..f944fbb 100644
--- a/src/output/grid.rs
+++ b/src/output/grid.rs
@@ -1,9 +1,9 @@
-use colours::Colours;
+use term_grid as grid;
+
 use file::File;
-use filetype::file_colour;
 use output::DisplayWidth;
-
-use term_grid as grid;
+use output::colours::Colours;
+use super::file_colour;
 
 
 #[derive(PartialEq, Debug, Copy, Clone)]