WIP

Author: weiznich

diesel/Cargo.toml

@@ -44,7 +44,7 @@ ipnetwork = ">=0.12.2, <0.19.0"
 quickcheck = "0.9"
 
 [features]
-default = ["32-column-tables", "without-deprecated"]
+default = ["mysql", "postgres", "sqlite"]
 extras = ["chrono", "serde_json", "uuid", "network-address", "numeric", "r2d2"]
 unstable = ["diesel_derives/nightly"]
 large-tables = ["32-column-tables"]

diesel/src/mysql/connection/stmt/iterator.rs

@@ -157,7 +157,7 @@ pub struct MysqlField<'a> {
     _marker: PhantomData<&'a (Binds, StatementMetadata)>,
 }
 
-impl<'a> Field<Mysql> for MysqlField<'a> {
+impl<'a> Field<'a, Mysql> for MysqlField<'a> {
     fn field_name(&self) -> Option<&str> {
         self.metadata.fields()[self.idx].field_name()
     }
@@ -166,7 +166,10 @@ impl<'a> Field<Mysql> for MysqlField<'a> {
         (*self.bind)[self.idx].is_null()
     }
 
-    fn value<'b>(&'b self) -> Option<crate::backend::RawValue<'b, Mysql>> {
+    fn value<'b>(&'b self) -> Option<crate::backend::RawValue<'b, Mysql>>
+    where
+        'a: 'b,
+    {
         self.bind[self.idx].value()
     }
 }

diesel/src/pg/connection/row.rs

@@ -64,12 +64,15 @@ pub struct PgField<'a> {
     col_idx: usize,
 }
 
-impl<'a> Field<Pg> for PgField<'a> {
+impl<'a> Field<'a, Pg> for PgField<'a> {
     fn field_name(&self) -> Option<&str> {
         self.db_result.column_name(self.col_idx)
     }
 
-    fn value<'b>(&'b self) -> Option<crate::backend::RawValue<'b, Pg>> {
+    fn value<'b>(&'b self) -> Option<crate::backend::RawValue<'b, Pg>>
+    where
+        'a: 'b,
+    {
         let raw = self.db_result.get(self.row_idx, self.col_idx)?;
         let type_oid = self.db_result.column_type(self.col_idx);
 

diesel/src/util/once_cell.rs

@@ -13,9 +13,8 @@ use std::cell::UnsafeCell;
 /// # Examples
 ///
 /// ```
-/// #![feature(once_cell)]
 ///
-/// use std::lazy::OnceCell;
+/// use crate::lazy::OnceCell;
 ///
 /// let cell = OnceCell::new();
 /// assert!(cell.get().is_none());
@@ -60,9 +59,8 @@ impl<T> OnceCell<T> {
     /// # Examples
     ///
     /// ```
-    /// #![feature(once_cell)]
     ///
-    /// use std::lazy::OnceCell;
+    /// use crate::lazy::OnceCell;
     ///
     /// let cell = OnceCell::new();
     /// assert_eq!(cell.get_or_try_init(|| Err(())), Err(()));

diesel_bench/Cargo.toml

@@ -8,6 +8,13 @@ autobenches = false
 
 [workspace]
 
+[workspace.profile.bench]
+opt-level = 3
+debug = true
+lto = true
+incremental = false
+codegen-units = 1
+
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
@@ -42,7 +49,7 @@ bench = true
 harness = false
 
 [features]
-default = []
+default = ["sqlite"]
 postgres = ["diesel/postgres"]
 sqlite = ["diesel/sqlite"]
 mysql = ["diesel/mysql"]