Add Context::data_ref (#3017)

This is needed for use cases like returning a borrow into the user data
from a function which takes a reference to Context.

Author: GnomedDev

.github/workflows/ci.yml

@@ -3,8 +3,8 @@ name: CI
 on: [push, pull_request]
 
 env:
-  rust_min: 1.79.0
-  rust_nightly: nightly-2024-06-21
+  rust_min: 1.82.0
+  rust_nightly: nightly-2024-11-01
 
 jobs:
   test:

Cargo.toml

@@ -10,7 +10,7 @@ readme = "README.md"
 repository = "https://github.com/serenity-rs/serenity.git"
 version = "0.12.2"
 edition = "2021"
-rust-version = "1.79"
+rust-version = "1.82.0"
 include = ["src/**/*", "LICENSE.md", "README.md", "CHANGELOG.md", "build.rs"]
 
 [workspace]

README.md

@@ -100,7 +100,7 @@ tokio = { version = "1.21.2", features = ["macros", "rt-multi-thread"] }
 
 ## MSRV Policy
 
-Serenity's minimum supported Rust version (MSRV) is Rust 1.79.
+Serenity's minimum supported Rust version (MSRV) is Rust 1.82.
 
 We opt to keep MSRV stable on the `current` branch. This means it will remain
 unchanged between minor releases. Occasionally, dependencies may violate SemVer
@@ -244,5 +244,5 @@ a Rust-native cloud development platform that allows deploying Serenity bots for
 [repo:andesite]: https://github.com/natanbc/andesite
 [repo:lavaplayer]: https://github.com/sedmelluq/lavaplayer
 [logo]: https://raw.githubusercontent.com/serenity-rs/serenity/current/logo.png
-[rust-version-badge]: https://img.shields.io/badge/rust-1.79.0+-93450a.svg?style=flat-square
-[rust-version-link]: https://blog.rust-lang.org/2024/06/13/Rust-1.79.0.html
+[rust-version-badge]: https://img.shields.io/badge/rust-1.82.0+-93450a.svg?style=flat-square
+[rust-version-link]: https://blog.rust-lang.org/2024/10/17/Rust-1.82.0.html

src/builder/create_attachment.rs

@@ -5,7 +5,7 @@ use serde::ser::{Serialize, SerializeSeq, Serializer};
 use tokio::fs::File;
 use tokio::io::AsyncReadExt;
 
-#[allow(unused)] // Error is used in docs
+#[expect(unused)] // Error is used in docs
 use crate::error::{Error, Result};
 #[cfg(feature = "http")]
 use crate::http::Http;
@@ -232,7 +232,7 @@ impl<'a> EditAttachments<'a> {
     ///
     /// Opposite of [`Self::keep`].
     pub fn remove(mut self, id: AttachmentId) -> Self {
-        #[allow(clippy::match_like_matches_macro)] // `matches!` is less clear here
+        #[expect(clippy::match_like_matches_macro)] // `matches!` is less clear here
         self.new_and_existing_attachments.retain(|a| match a {
             NewOrExisting::Existing(a) if a.id == id => false,
             _ => true,
@@ -241,7 +241,7 @@ impl<'a> EditAttachments<'a> {
     }
 
     /// Adds a new attachment to the attachment list.
-    #[allow(clippy::should_implement_trait)] // Clippy thinks add == std::ops::Add::add
+    #[expect(clippy::should_implement_trait)] // Clippy thinks add == std::ops::Add::add
     pub fn add(mut self, attachment: CreateAttachment<'a>) -> Self {
         self.new_and_existing_attachments.push(NewOrExisting::New(attachment));
         self

src/builder/create_components.rs

@@ -242,7 +242,7 @@ impl Serialize for CreateSelectMenuKind<'_> {
             default_values: &'a [CreateSelectMenuDefault],
         }
 
-        #[allow(clippy::ref_option)]
+        #[expect(clippy::ref_option)]
         fn map<'a>(
             values: &'a Option<Cow<'a, [impl Into<Mention> + Copy]>>,
         ) -> impl Iterator<Item = CreateSelectMenuDefault> + 'a {

src/gateway/client/context.rs

@@ -85,6 +85,18 @@ impl Context {
             .expect("Type provided to Context should be the same as ClientBuilder::data.")
     }
 
+    /// A version of [`Self::data`] which returns a reference to the Data.
+    ///
+    /// This is useful if you need to borrow `Data` with the lifetime of `Context`, but otherwise
+    /// [`Self::data`] should be used.
+    #[must_use]
+    #[expect(clippy::needless_lifetimes, reason = "Easier to understand when explicitly written")]
+    pub fn data_ref<'a, Data: Send + Sync + 'static>(&'a self) -> &'a Data {
+        self.data
+            .downcast_ref()
+            .expect("Type provided to Context should be the same as ClientBuilder::data.")
+    }
+
     /// Sets the current user as being [`Online`]. This maintains the current activity.
     ///
     /// # Examples

src/gateway/ws.rs

@@ -162,7 +162,7 @@ impl WsClient {
         Ok(())
     }
 
-    #[allow(clippy::missing_errors_doc)]
+    #[expect(clippy::missing_errors_doc)]
     pub async fn send_chunk_guild(
         &mut self,
         guild_id: GuildId,

src/http/client.rs

@@ -3063,7 +3063,7 @@ impl Http {
         .await
     }
 
-    #[allow(clippy::too_many_arguments)]
+    #[expect(clippy::too_many_arguments)]
     /// Gets all entitlements for the current app, active and expired.
     pub async fn get_entitlements(
         &self,

src/http/error.rs

@@ -419,7 +419,7 @@ impl StdError for HttpError {
     }
 }
 
-#[allow(clippy::missing_errors_doc)]
+#[expect(clippy::missing_errors_doc)]
 pub fn deserialize_errors<'de, D: Deserializer<'de>>(
     deserializer: D,
 ) -> StdResult<FixedArray<DiscordJsonSingleError>, D::Error> {

src/http/ratelimiting.rs

@@ -474,7 +474,7 @@ mod tests {
     }
 
     #[test]
-    #[allow(clippy::float_cmp)]
+    #[expect(clippy::float_cmp)]
     fn test_parse_header_good() -> Result<()> {
         let headers = headers();