Update rust

This commit is contained in:
jude 2024-02-22 18:35:37 +00:00
parent 6c20bf2a0f
commit dd7e681285
8 changed files with 6 additions and 13 deletions

2
Cargo.lock generated
View File

@ -2357,7 +2357,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]] [[package]]
name = "reminder_rs" name = "reminder-rs"
version = "1.7.0-rc1" version = "1.7.0-rc1"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.21.7",

View File

@ -1,5 +1,5 @@
[package] [package]
name = "reminder_rs" name = "reminder-rs"
version = "1.7.0-rc1" version = "1.7.0-rc1"
authors = ["Jude Southworth <judesouthworth@pm.me>"] authors = ["Jude Southworth <judesouthworth@pm.me>"]
edition = "2021" edition = "2021"

View File

@ -10,9 +10,9 @@ pub const CHARACTERS: &str = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWX
const THEME_COLOR_FALLBACK: u32 = 0x8fb677; const THEME_COLOR_FALLBACK: u32 = 0x8fb677;
pub const MACRO_MAX_COMMANDS: usize = 5; pub const MACRO_MAX_COMMANDS: usize = 5;
use poise::serenity_prelude::CreateAttachment; use std::{collections::HashSet, env};
use std::{collections::HashSet, env, iter::FromIterator};
use poise::serenity_prelude::CreateAttachment;
use regex::Regex; use regex::Regex;
lazy_static! { lazy_static! {

View File

@ -95,16 +95,12 @@ impl fmt::Display for Error {
trait OverflowOp: Sized { trait OverflowOp: Sized {
fn mul(self, other: Self) -> Result<Self, Error>; fn mul(self, other: Self) -> Result<Self, Error>;
fn add(self, other: Self) -> Result<Self, Error>;
} }
impl OverflowOp for u64 { impl OverflowOp for u64 {
fn mul(self, other: Self) -> Result<Self, Error> { fn mul(self, other: Self) -> Result<Self, Error> {
self.checked_mul(other).ok_or(Error::NumberOverflow) self.checked_mul(other).ok_or(Error::NumberOverflow)
} }
fn add(self, other: Self) -> Result<Self, Error> {
self.checked_add(other).ok_or(Error::NumberOverflow)
}
} }
#[derive(Copy, Clone)] #[derive(Copy, Clone)]

View File

@ -1,5 +1,4 @@
use std::{ use std::{
convert::TryFrom,
fmt::{Display, Formatter, Result as FmtResult}, fmt::{Display, Formatter, Result as FmtResult},
str::from_utf8, str::from_utf8,
time::{SystemTime, UNIX_EPOCH}, time::{SystemTime, UNIX_EPOCH},

View File

@ -1,5 +1,3 @@
use prometheus;
use crate::metrics::REGISTRY; use crate::metrics::REGISTRY;
#[get("/metrics")] #[get("/metrics")]

View File

@ -1 +1 @@
/home/jude/reminder-bot/reminder-dashboard/dist/static/assets /home/jude/reminder-dashboard/dist/static/assets

View File

@ -1 +1 @@
/home/jude/reminder-bot/reminder-dashboard/dist/index.html /home/jude/reminder-dashboard/dist/index.html