Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2018-ification #444

Merged
merged 4 commits into from
Apr 1, 2020
Merged

2018-ification #444

merged 4 commits into from
Apr 1, 2020

Commits on Apr 1, 2020

  1. fix incompatibilities with edition 2018 module changes 

    With this we could add `edition = "2018"` to enable new features like
async/await.
    @LnL7 @cole-h
    LnL7 authored and cole-h committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    c7978ac View commit details
    Browse the repository at this point in the history

  2. More 2018-ification and minor formatting changes 

    2018-ification changes include:
* replacing `extern crate` imports (except for ones annotated with
`#[macro_use]` to prevent touching more files; maybe in a follow-up)
* removing standalone imports; for example, `use serde_json;` -- the
code already uses `serde_json::*` where necessary

Minor formatting changes include:
* collapsing imports from the same root (e.g. `use std::io::Read; use
std::io::BufRead` -> `use std::io::{BufRead, Read};`
* separating `crate` imports from external imports from `std` imports --
this is how many project seem to order their imports, most notably the
official Rust repo
* moving some `use`s from the first line to below the file's doc comment
* changing file-level doc comments from `///` to `//!` (so they actually
show up as documentation)
* `rustfmt` messing with the `nom` macros in `src/commentparser.rs`

Most of the 2018-ification was done by `cargo fix --edition-idioms`, but
all changes were manually inspected to catch any detrimental changes,
and `cargo test`/`cargo check` still succeed.
    @cole-h
    cole-h committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    cbe2e62 View commit details
    Browse the repository at this point in the history

  3. 2018-ify carnix 

    Ran `nix-shell -p carnix --run ./nix/update-carnix.sh`.
    @cole-h
    cole-h committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    c37b652 View commit details
    Browse the repository at this point in the history

  4. Silence cargo pedantry

    @cole-h
    cole-h committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    a872255 View commit details
    Browse the repository at this point in the history