Skip to content

Fix formatting error with embedded migrations #2159

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

Merged
weiznich merged 1 commit into from
Sep 3, 2019
Merged

Fix formatting error with embedded migrations #2159

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions diesel_migrations/migrations_internals/src/migration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ pub fn file_name<'a>(migration: &'a dyn Migration, sql_file: &'a str) -> Migrati

impl<'a> fmt::Display for MigrationFileName<'a> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let fpath = match self.migration.file_path() {
None => return Err(fmt::Error),
Some(v) => v.join(self.sql_file),
};
f.write_str(fpath.to_str().unwrap_or("Invalid utf8 in filename"))?;
Ok(())
if let Some(path) = self.migration.file_path() {
let fpath = path.join(self.sql_file);
f.write_str(fpath.to_str().unwrap_or("Invalid utf8 in filename"))
} else {
write!(f, "{}/{}", self.migration.version(), self.sql_file)
}
}
}

Expand Down