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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f81796e5224f
Choose a base ref
...
head repository: NixOS/ofborg
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 830f37669917
Choose a head ref
1 contributor

Commits on Jan 2, 2019

  1. Update nixpkgs

    @grahamc
    grahamc committed Jan 2, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    ecc49cf View commit details

  2. clippy: eliminate redundant field definitions

    @grahamc
    grahamc committed Jan 2, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9b9941f View commit details

Commits on Jan 3, 2019

  1. clippy: drop unneeded returns

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1b5287d View commit details

  2. clippy: drop unneeded format strings

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9be551f View commit details

  3. Pass the mozilla overlay to shell.nix's import

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0263690 View commit details

  4. Clippy: returning the result of a let binding

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8fb7eab View commit details

  5. Clippy: don't if true return true else return false

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    cb7012e View commit details

  6. clippy: don't need to add & to all patterns

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1ceae29 View commit details

  7. clippy: All the struct fields are matched to a wildcard pattern, cons… 

    …ider using ..
    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0c0cf89 View commit details

  8. clippy: fix most of: argument is passed by value, but not consumed in… 

    … the function body
    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    7eb3b81 View commit details

  9. clippy: &Vec<T> -> &[T]

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    848f1a0 View commit details

  10. Clippy: comparisons of array len to 0

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    99159dd View commit details

  11. clippy: useless use of vec[]

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    48d2815 View commit details

  12. Clippy: redundant pattern matching, consider using is_err

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a9e2c02 View commit details

  13. clippy: map .clone -> cloned

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    0ab2ce4 View commit details

  14. clippy: unwrap_or/ok_or(function call) unwrap_or_else/ok_or_else

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    fc8494b View commit details

  15. clippy: single-character string constant used as pattern

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2a90813 View commit details

  16. clippy: don't clone a copy

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8fe6899 View commit details

  17. clippy: if _ then _ ... is an expression

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2b338c3 View commit details

  18. clippy: as_bytes on string literals

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f2a0ca2 View commit details

  19. clippy: identical conversion

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    91e23d1 View commit details

  20. clippy: drop &ref

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    e9f437d View commit details

  21. clippy: Unneeded lifetime

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    c73cf2e View commit details

  22. clippy: write -> write_all

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    1d906ff View commit details

  23. cargo fmt

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    164e2cc View commit details

  24. build phase for rust pedantry

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8797402 View commit details

  25. Check clippy and fmt in travis

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    671a925 View commit details

  26. clippy: Implement defaults

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    8122e01 View commit details

  27. clippy: unneeded borrow

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    64dafe5 View commit details

  28. Extra nl

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f2030c2 View commit details

  29. Clippy: nix: borrow the op

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d49bd44 View commit details

  30. Box MsgType::Finish(BuildResult)

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    63fcd85 View commit details

  31. clippy: Action::Publish(QueueMsg box contenst

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    053ea86 View commit details

  32. fixup formatting

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    41105c1 View commit details

  33. fixup: box the buildresult in finish

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    434f4dc View commit details

  34. move pedantry up, set -x

    @grahamc
    grahamc committed Jan 3, 2019

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    grahamc Graham Christensen
    GPG key ID: ACA1C1D120C83D5C
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    f6192a7 View commit details

  35. Merge pull request #295 from NixOS/clippy 

    Clippy and cargo fmt
    @grahamc
    grahamc authored Jan 3, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    830f376 View commit details
Showing with 1,375 additions and 2,936 deletions.
  1. +4 −2 .travis.yml
  2. +0 −1 nix/default.nix
  3. +0 −1,442 nix/nixpkgs-pr50452.patch
  4. +3 −3 nix/nixpkgs.json
  5. +110 −154 ofborg/build.rs
  6. +14 −13 ofborg/src/acl.rs
  7. +42 −50 ofborg/src/asynccmd.rs
  8. +7 −10 ofborg/src/bin/build-faker.rs
  9. +13 −13 ofborg/src/bin/builder.rs
  10. +4 −7 ofborg/src/bin/evaluation-filter.rs
  11. +4 −7 ofborg/src/bin/github-comment-filter.rs
  12. +4 −6 ofborg/src/bin/github-comment-poster.rs
  13. +3 −6 ofborg/src/bin/log-message-collector.rs
  14. +5 −8 ofborg/src/bin/log-message-generator.rs
  15. +14 −10 ofborg/src/bin/mass-rebuilder.rs
  16. +4 −5 ofborg/src/bin/simple-build.rs
  17. +6 −12 ofborg/src/bin/stats.rs
  18. +52 −55 ofborg/src/checkout.rs
  19. +30 −26 ofborg/src/clone.rs
  20. +50 −77 ofborg/src/commentparser.rs
  21. +6 −6 ofborg/src/commitstatus.rs
  22. +33 −36 ofborg/src/config.rs
  23. +11 −13 ofborg/src/easyamqp.rs
  24. +6 −6 ofborg/src/evalchecker.rs
  25. +2 −2 ofborg/src/files.rs
  26. +2 −2 ofborg/src/ghevent/issuecomment.rs
  27. +5 −3 ofborg/src/ghevent/mod.rs
  28. +6 −8 ofborg/src/ghevent/pullrequestevent.rs
  29. +40 −37 ofborg/src/lib.rs
  30. +2 −3 ofborg/src/locks.rs
  31. +9 −16 ofborg/src/message/buildjob.rs
  32. +0 −1 ofborg/src/message/buildlogmsg.rs
  33. +59 −42 ofborg/src/message/buildresult.rs
  34. +0 −1 ofborg/src/message/common.rs
  35. +4 −5 ofborg/src/message/massrebuildjob.rs
  36. +2 −2 ofborg/src/message/mod.rs
  37. +150 −162 ofborg/src/nix.rs
  38. +16 −15 ofborg/src/notifyworker.rs
  39. +30 −28 ofborg/src/outpathdiff.rs
  40. +12 −6 ofborg/src/stats.rs
  41. +47 −38 ofborg/src/tagger.rs
  42. +79 −86 ofborg/src/tasks/build.rs
  43. +13 −20 ofborg/src/tasks/eval/stdenvs.rs
  44. +30 −37 ofborg/src/tasks/evaluationfilter.rs
  45. +16 −22 ofborg/src/tasks/githubcommentfilter.rs
  46. +104 −86 ofborg/src/tasks/githubcommentposter.rs
  47. +106 −120 ofborg/src/tasks/log_message_collector.rs
  48. +124 −168 ofborg/src/tasks/massrebuilder.rs
  49. +4 −5 ofborg/src/tasks/mod.rs
  50. +16 −18 ofborg/src/tasks/statscollector.rs
  51. +2 −2 ofborg/src/test_scratch.rs
  52. +16 −18 ofborg/src/worker.rs
  53. +11 −14 ofborg/src/writetoline.rs
  54. +43 −1 shell.nix
6 changes: 4 additions & 2 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -3,9 +3,11 @@ nix: 2.1
sudo: true
matrix:
include:
- name: cargo pedantry
script: nix-shell --run checkPhase --arg useNix1 false -A mozilla-rust-overlay
- name: checkPhase - Nix 2
script: nix-shell --run checkPhase --arg useNix1 false
- name: checkPhase - Nix 2
script: nix-shell --run checkPhase --arg useNix1 false
- name: checkPhase - Nix 1
script: nix-shell --run checkPhase --arg useNix1 true
- name: nix-build
script: nix-build -A ofborg.rs
1 change: 0 additions & 1 deletion nix/default.nix
View file
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ in import (hostpkgs.stdenv.mkDerivation {
};

patches = [
./nixpkgs-pr50452.patch
];

moveToOut = ''
Loading