Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/ofborg
base: c2ea19fe47f0
Choose a base ref
...
head repository: NixOS/ofborg
compare: 7be15ba6d1a5
Choose a head ref
  • 5 commits
  • 50 files changed
  • 3 contributors

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 authored and cole-h committed Apr 1, 2020
    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 committed Apr 1, 2020
    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 committed Apr 1, 2020
    Copy the full SHA
    c37b652 View commit details
    Browse the repository at this point in the history
  4. Silence cargo pedantry

    cole-h committed Apr 1, 2020
    Copy the full SHA
    a872255 View commit details
    Browse the repository at this point in the history
  5. Merge pull request #444 from cole-h/2018

    2018-ification
    grahamc committed Apr 1, 2020
    Copy the full SHA
    7be15ba View commit details
    Browse the repository at this point in the history