Skip to content

Commit

Permalink
Merge pull request #3978 from weiznich/drop/vendored_once_cell
Browse files Browse the repository at this point in the history
Drop our vendored copy of OnceCell
  • Loading branch information
weiznich committed Apr 5, 2024
2 parents cabd7df + b8dddd5 commit ac43e5b
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 120 deletions.
2 changes: 1 addition & 1 deletion diesel/src/pg/connection/result.rs
Expand Up @@ -11,7 +11,7 @@ use std::{slice, str};
use super::raw::{RawConnection, RawResult};
use super::row::PgRow;
use crate::result::{DatabaseErrorInformation, DatabaseErrorKind, Error, QueryResult};
use crate::util::OnceCell;
use std::cell::OnceCell;

#[allow(missing_debug_implementations)]
pub struct PgResult {
Expand Down
2 changes: 1 addition & 1 deletion diesel/src/sqlite/connection/stmt.rs
Expand Up @@ -8,8 +8,8 @@ use crate::query_builder::{QueryFragment, QueryId};
use crate::result::Error::DatabaseError;
use crate::result::*;
use crate::sqlite::{Sqlite, SqliteType};
use crate::util::OnceCell;
use libsqlite3_sys as ffi;
use std::cell::OnceCell;
use std::ffi::{CStr, CString};
use std::io::{stderr, Write};
use std::os::raw as libc;
Expand Down
6 changes: 0 additions & 6 deletions diesel/src/util.rs
Expand Up @@ -9,9 +9,3 @@ pub trait TupleAppend<T> {
pub trait TupleSize {
const SIZE: usize;
}

#[cfg(any(feature = "postgres", feature = "sqlite"))]
mod once_cell;

#[cfg(any(feature = "postgres", feature = "sqlite"))]
pub(crate) use self::once_cell::OnceCell;
112 changes: 0 additions & 112 deletions diesel/src/util/once_cell.rs

This file was deleted.

0 comments on commit ac43e5b

Please sign in to comment.