diff options
author | jRimbault <jacques.rimbault@gmail.com> | 2020-10-17 11:09:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-17 11:09:27 +0200 |
commit | 95bb901b8a4927fb50386a5c52a285392b60f90d (patch) | |
tree | f8170a5bc266e01a74a9d52fd2678719fb87f8d0 | |
parent | 3287e48b6575aba083ce5aca8a8ab2e16323b25d (diff) |
chore: fix the double compiling of lib and bin (#1616)
* fix: rust modules are compiled twice
The modules being declared both in the _library_ crate and the _binary_
crate made cargo compile everything twice:
1. for the library
2. for the binary
What happened was:
1. The library "starship" was compiled.
2. The binary "starship" (and all its modules) were compiled.
* fix: stop compiling every rust module twice
restrict visibility
* Run cargo fmt
* Add bug_report module
Co-authored-by: Matan Kushner <hello@matchai.dev>
Co-authored-by: Kevin Song <chips@ksong.dev>
-rw-r--r-- | src/configure.rs | 2 | ||||
-rw-r--r-- | src/lib.rs | 7 | ||||
-rw-r--r-- | src/main.rs | 20 |
3 files changed, 8 insertions, 21 deletions
diff --git a/src/configure.rs b/src/configure.rs index ac9b93e3f..bb70c88cb 100644 --- a/src/configure.rs +++ b/src/configure.rs @@ -4,7 +4,7 @@ use std::io::ErrorKind; use std::process; use std::process::Command; -use starship::config::StarshipConfig; +use crate::config::StarshipConfig; use std::fs::File; use std::io::Write; use toml::map::Map; diff --git a/src/lib.rs b/src/lib.rs index 15a38074b..fb2361b86 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,13 +1,16 @@ // Lib is present to allow for benchmarking +pub mod bug_report; pub mod config; pub mod configs; +pub mod configure; pub mod context; pub mod formatter; +pub mod init; pub mod logger; pub mod module; -pub mod modules; +mod modules; pub mod print; -pub mod segment; +mod segment; mod utils; #[cfg(test)] diff --git a/src/main.rs b/src/main.rs index 46dc86e25..3957faa6e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,27 +2,11 @@ use clap::{crate_authors, crate_version}; use std::io; use std::time::SystemTime; -mod bug_report; -mod config; -mod configs; -mod configure; -mod context; -mod formatter; -mod init; -mod logger; -mod module; -mod modules; -mod print; -mod segment; -mod utils; - -#[cfg(test)] -mod test; - -use crate::module::ALL_MODULES; use clap::{App, AppSettings, Arg, Shell, SubCommand}; use rand::distributions::Alphanumeric; use rand::Rng; +use starship::module::ALL_MODULES; +use starship::*; fn main() { logger::init(); |