Skip to content

Merge changes from PR and fix rustfmt #74

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.

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

Merged
merged 2 commits into from
Apr 19, 2017
Merged

Merge changes from PR and fix rustfmt #74

merged 2 commits into from
Apr 19, 2017

Conversation

solidsnack
Copy link
Collaborator

Fixes a warning in original PR.

Addresses seeming regression or instability in rustfmt. Many things changed to be able to pass checkstyle. Some things, it seems it just can not format. Filed a bug with them: rust-lang/rustfmt#1460

Eric Coan and others added 2 commits April 18, 2017 20:39
tl;dr

panics are super scary, probably don't need to panic just because
we barfed on one change. simply logging it, and returning should
be fine.

---

Motivation:

We were looking through the source of jsoncdc, and had noticed there was
a panic inside `append_change`. We couldn't think of a reason to panic
here (although we don't have as much insight I'm sure). Talking it over
we decided to switch to simply logging the unrecognized change action
instead.

We don't see a problem with replacing this panic (and all of the tests
still pass), however if you want we can change this PR to use a
compile time feature that isn't on by default.

Docker Changes:

I was unable to build the dockerfile when attempting to run tests.
Specifically it failed building `rustfmt`, by adding in gcc-multilib
I was able to build the dockerfile so I've added that into my change too.

util/travis Changes:

I was unable to get travis to build correctly. so I made two changes
The first was changing substitution of `"$LD_LIBRARY_PATH"` to:
`"${LD_LIBRARY_PATH:-}"` which sets the string to empty if it's not defined
since if it's not defined the script errors due to: `set -o nounset`

I also was unable to get this to build onto mac, since postgis had developed
a dependency on outdated postgres. this now forces the uninstall of the old
postgres in order to make sure we can get a current one.
Also addresses a warning.
@solidsnack solidsnack merged commit cff1cb6 into master Apr 19, 2017
@solidsnack solidsnack deleted the maestro branch September 20, 2017 05:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant