Merge and reorder imports

This change brings them in-line with the default settings of
rust-analyzer. Originally, I disliked this style, but by now, I've grown
used to it and prefer it slightly. Also, I like staying on the default
path since I usually don't need to check the imports to see if
rust-analyzer messed anything up (except for omitting the self:: when
importing modules defined in the current module, grr :D).

I've also come around to the idea of trailing mod definitions instead of
putting them at the top: I would also put module definitions that
contain code instead of referencing another file below the imports. It
feels weird to have code above imports. So it just makes sense to do the
same for all types of mod definitions.

If rustfmt ever gains stable support for grouping imports, I'll probably
use that instead.
This commit is contained in:
Joscha 2025-02-21 12:42:51 +01:00
parent 816d8f86a3
commit fbc64de607
41 changed files with 332 additions and 273 deletions

View file

@ -1,7 +1,6 @@
//! Auto-generate markdown documentation.
use std::collections::HashMap;
use std::path::PathBuf;
use std::{collections::HashMap, path::PathBuf};
use cove_input::KeyBinding;
pub use cove_macro::Document;

View file

@ -1,16 +1,17 @@
pub mod doc;
mod euph;
mod keys;
use std::io::ErrorKind;
use std::path::{Path, PathBuf};
use std::{fs, io};
use std::{
fs,
io::{self, ErrorKind},
path::{Path, PathBuf},
};
use doc::Document;
use serde::Deserialize;
pub use crate::euph::*;
pub use crate::keys::*;
pub use crate::{euph::*, keys::*};
pub mod doc;
mod euph;
mod keys;
#[derive(Debug, thiserror::Error)]
pub enum Error {