Skip to content

Fix formatting error with embedded migrations#2159

Merged
weiznich merged 1 commit intodiesel-rs:masterfrom
geomaniac:another-solution-for-fix-formatting-error-with-embedded-migrations
Sep 3, 2019
Merged

Fix formatting error with embedded migrations#2159
weiznich merged 1 commit intodiesel-rs:masterfrom
geomaniac:another-solution-for-fix-formatting-error-with-embedded-migrations

Conversation

@geomaniac
Copy link
Contributor

@geomaniac geomaniac commented Sep 2, 2019

In Display impl forMigrationName, use the migration version if Migration::file_path returns None.

This is based on the work from @sorccu in #1993.

Fixes #1977.

@geomaniac geomaniac force-pushed the another-solution-for-fix-formatting-error-with-embedded-migrations branch from ee5865d to 1c592df Compare September 2, 2019 12:46
@weiznich weiznich requested a review from a team September 2, 2019 12:47
@JohnTitor
Copy link
Member

JohnTitor commented Sep 2, 2019

Could you rebase it to prevent travis from being terminated?

@geomaniac
Copy link
Contributor Author

geomaniac commented Sep 2, 2019

Could you rebase it to prevent travis from being terminated?

Ah your PR just got merged. Sure, give me a sec.

@geomaniac
Fix formatting error with embedded migrations
78ad40d 
In Display impl for`MigrationName`, use the migration version if `Migration::file_path` returns None.

This is based on the work from @sorccu in diesel-rs#1993.

Fixes diesel-rs#1977.
@geomaniac geomaniac force-pushed the another-solution-for-fix-formatting-error-with-embedded-migrations branch from 1c592df to 78ad40d Compare September 2, 2019 13:36
@geomaniac
Copy link
Contributor Author

geomaniac commented Sep 3, 2019

Not quite sure what to do about the 1 failing test, seems to be something SSL related:

Caused by:

A [35] SSL connect error (error:14094410:SSL routines:ssl3_read_bytes:sslv3 alert handshake failure)

The command "rustc +$TRAVIS_RUST_VERSION --version &&[..]" exited with 101.

Btw, I just noticed there is another open PR #2111, that goes in a somewhat similar direction. I am not too attached to my changes, so if you rather want to go with #2111, I can close this PR.

@weiznich weiznich merged commit 2b06165 into diesel-rs:master Sep 3, 2019
This was referenced Sep 3, 2019
Closed
Closed
@geomaniac geomaniac deleted the another-solution-for-fix-formatting-error-with-embedded-migrations branch September 3, 2019 09:44
@lutter
Copy link

lutter commented Oct 30, 2019

I am glad to see this fixed. When will this appear in a release?

@weiznich
Copy link
Member

weiznich commented Oct 30, 2019

@lutter We do not give any ETA on release dates other than "when it is done".

@mikeyhew mikeyhew mentioned this pull request Mar 12, 2020
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@weiznich weiznich weiznich approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

formatter error

4 participants

@geomaniac @JohnTitor @lutter @weiznich