From f9d3570363dfbb1eb7275995ca2f8612ed36042f Mon Sep 17 00:00:00 2001 From: "Jan Alexander Steffens (heftig)" Date: Thu, 26 Dec 2019 03:09:26 +0100 Subject: [PATCH] Fix typo: Rename PGEscapse to PGEscape --- src/database.rs | 8 ++++---- src/main.rs | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/database.rs b/src/database.rs index 1be218e..de19644 100644 --- a/src/database.rs +++ b/src/database.rs @@ -164,9 +164,9 @@ fn get_missing_from_db(client: &mut Client, missing_sgs: &[i64]) -> BTreeMap(pub &'a str); +pub struct PGEscape<'a>(pub &'a str); -impl<'a> fmt::Display for PGEscapse<'a> { +impl<'a> fmt::Display for PGEscape<'a> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { let mut delim = Cow::from("$$"); while self.0.contains(&delim as &str) { @@ -181,12 +181,12 @@ impl<'a> fmt::Display for PGEscapse<'a> { #[test] fn test_pg_escape() { - let s = format!("{}", PGEscapse("test")); + let s = format!("{}", PGEscape("test")); assert_eq!(s, "$$test$$"); let dodgy_string = "test$$ing"; - let s = format!("{}", PGEscapse(dodgy_string)); + let s = format!("{}", PGEscape(dodgy_string)); // prefix and suffixes should match let start_pos = s.find(dodgy_string).expect("expected to find dodgy string"); diff --git a/src/main.rs b/src/main.rs index cf10ddd..d483f28 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,7 +23,7 @@ mod database; static GLOBAL: jemallocator::Jemalloc = jemallocator::Jemalloc; use compressor::Compressor; -use database::PGEscapse; +use database::PGEscape; use clap::{ crate_authors, crate_description, crate_name, crate_version, value_t_or_exit, App, Arg, @@ -269,10 +269,10 @@ fn main() { output, "({}, {}, {}, {}, {})", sg, - PGEscapse(room_id), - PGEscapse(t), - PGEscapse(s), - PGEscapse(e) + PGEscape(room_id), + PGEscape(t), + PGEscape(s), + PGEscape(e) ) .unwrap(); }