Skip to content

Bump diesel to 2.3.7 and diesel-dtrace to 0.5.0.#10056

Merged
mergeconflict merged 1 commit intomainfrom
mergeconflict/bump-diesel
Mar 13, 2026
Merged

Bump diesel to 2.3.7 and diesel-dtrace to 0.5.0.#10056
mergeconflict merged 1 commit intomainfrom
mergeconflict/bump-diesel

Conversation

@mergeconflict
Copy link
Contributor

@mergeconflict mergeconflict commented Mar 13, 2026

This dependency version bump is in preparation for bumping the rust toolchain to 1.94.0 (#10058). Without it, we get some compiler warnings about conflicting min symbols imported from diesel:

warning: `min` is ambiguous
   --> nexus/db-queries/src/db/datastore/ereport.rs:22:35
    |
 22 | use diesel::dsl::{count_distinct, min};
    |                                   ^^^ ambiguous name
    |
    = warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
    = note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
    = note: ambiguous because of multiple glob imports of a name in the same module
note: `min` could refer to the type alias defined here
   --> /Users/dr/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/diesel-2.2.12/src/lib.rs:319:13
    |
319 |     pub use crate::helper_types::*;
    |             ^^^^^^^^^^^^^^^^^^^
    = help: consider updating this dependency to resolve this error
    = help: if updating the dependency does not resolve the problem report the problem to the author of the relevant crate
note: `min` could also refer to the type alias defined here
   --> /Users/dr/.cargo/registry/src/index.crates.io-1949cf8c6b5b557f/diesel-2.2.12/src/lib.rs:322:13
    |
322 |     pub use crate::expression::dsl::*;
    |             ^^^^^^^^^^^^^^^^^^^^^^
    = note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

Also replace deprecated diesel::dsl::count_distinct() with count().aggregate_distinct() from AggregateExpressionMethods.

This dependency version bump is in preparation for bumping the rust toolchain to 1.94.0. Without it, we get some compiler warnings about conflicting `min` symbols imported from diesel.

Replace deprecated diesel::dsl::count_distinct() with
count().aggregate_distinct() from AggregateExpressionMethods.
@mergeconflict mergeconflict enabled auto-merge (squash) March 13, 2026 17:13
@mergeconflict mergeconflict merged commit b0d1a3c into main Mar 13, 2026
18 checks passed
@mergeconflict mergeconflict deleted the mergeconflict/bump-diesel branch March 13, 2026 19:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants