diff --git a/postgres-shared/src/rows.rs b/postgres-shared/src/rows.rs index 9d7fabf3..3320415e 100644 --- a/postgres-shared/src/rows.rs +++ b/postgres-shared/src/rows.rs @@ -11,7 +11,7 @@ mod sealed { use stmt::Column; pub trait Sealed { - fn idx(&self, stmt: &[Column]) -> Option; + fn __idx(&self, stmt: &[Column]) -> Option; } } @@ -22,7 +22,7 @@ pub trait RowIndex: Sealed {} impl Sealed for usize { #[inline] - fn idx(&self, stmt: &[Column]) -> Option { + fn __idx(&self, stmt: &[Column]) -> Option { if *self >= stmt.len() { None } else { @@ -35,7 +35,7 @@ impl RowIndex for usize {} impl Sealed for str { #[inline] - fn idx(&self, stmt: &[Column]) -> Option { + fn __idx(&self, stmt: &[Column]) -> Option { if let Some(idx) = stmt.iter().position(|d| d.name() == self) { return Some(idx); }; @@ -56,8 +56,8 @@ where T: ?Sized + Sealed, { #[inline] - fn idx(&self, columns: &[Column]) -> Option { - T::idx(*self, columns) + fn __idx(&self, columns: &[Column]) -> Option { + T::__idx(*self, columns) } } diff --git a/postgres/src/rows.rs b/postgres/src/rows.rs index 49bfde75..90cce793 100644 --- a/postgres/src/rows.rs +++ b/postgres/src/rows.rs @@ -225,7 +225,7 @@ impl<'a> Row<'a> { I: RowIndex, T: FromSql, { - let idx = match idx.idx(&self.stmt_info.columns) { + let idx = match idx.__idx(&self.stmt_info.columns) { Some(idx) => idx, None => return None, }; @@ -247,7 +247,7 @@ impl<'a> Row<'a> { where I: RowIndex + fmt::Debug, { - match idx.idx(&self.stmt_info.columns) { + match idx.__idx(&self.stmt_info.columns) { Some(idx) => self.data.get(idx), None => panic!("invalid index {:?}", idx), } diff --git a/tokio-postgres/src/rows.rs b/tokio-postgres/src/rows.rs index 2fe054ca..482f7cc1 100644 --- a/tokio-postgres/src/rows.rs +++ b/tokio-postgres/src/rows.rs @@ -69,7 +69,7 @@ impl Row { T: FromSql, I: RowIndex, { - let idx = match idx.idx(&self.columns) { + let idx = match idx.__idx(&self.columns) { Some(idx) => idx, None => return Ok(None), };