Formatting and typos (#63)

* Fix typo and run rustfmt.

* Also add rustfmt check to travis... this might be temporary.

* Add a bit on default config files being created in the debian extended description.

* Add rustup component add to travis.

* Disable rustfmt for now, seems to play weird on windows builds.

* Remove unneccesary deprecate ignore.
This commit is contained in:
Clement Tsang 2020-03-05 02:09:29 -05:00 committed by GitHub
parent d018c6ee88
commit 188858fedd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 17 additions and 15 deletions

View File

@ -25,8 +25,10 @@ before_install:
before_script: before_script:
- rustup target add $TARGET - rustup target add $TARGET
- rustup component add clippy - rustup component add clippy
#- rustup component add rustfmt
script: script:
- cargo clippy -- -D clippy::all - cargo clippy -- -D clippy::all
#- cargo fmt -- --check
- cargo build --verbose --target $TARGET - cargo build --verbose --target $TARGET
- cargo test --verbose --target $TARGET - cargo test --verbose --target $TARGET

View File

@ -55,5 +55,6 @@ assets = [
] ]
extended-description = """\ extended-description = """\
By default, bottom will look for a config file in ~/.config/bottom/bottom.toml. By default, bottom will look for a config file in ~/.config/bottom/bottom.toml.
If one is not specified it will fall back to defaults. If one is not specified it will fall back to defaults. If a config file does not
exist at the specified or default location, a blank one will be created for the user.
""" """

View File

@ -134,7 +134,7 @@ Run using `btm`.
- `-s`, `--show_disabled_data` will show data entries in the graph legends even if the lines for that entry are disabled. - `-s`, `--show_disabled_data` will show data entries in the graph legends even if the lines for that entry are disabled.
- `-C`, `--config` takes in a file path leading to a TOML file. If doesn't exist, creates one. - `-C`, `--config` takes in a file path leading to a TOML file. If the file doesn't exist, one will be created.
- `-b`, `--basic` will enable basic mode, removing all graphs from the main interface and condensing data. - `-b`, `--basic` will enable basic mode, removing all graphs from the main interface and condensing data.

View File

@ -99,7 +99,6 @@ fn get_matches() -> clap::ArgMatches<'static> {
.get_matches() .get_matches()
} }
#[allow(deprecated)]
fn main() -> error::Result<()> { fn main() -> error::Result<()> {
create_logger()?; create_logger()?;
let matches = get_matches(); let matches = get_matches();