Skip to content

Commit 5a46f1f

Browse files
authored
Fix clippy lints (#3087)
Fixes borked CI
1 parent 452bf82 commit 5a46f1f

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

src/http/client.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -881,7 +881,7 @@ impl Http {
881881
map.insert("guild_id".to_string(), guild_id.get().into());
882882
}
883883

884-
from_value(value).map_err(From::from)
884+
from_value(value)
885885
}
886886

887887
/// Creates a Guild Scheduled Event.
@@ -1946,7 +1946,7 @@ impl Http {
19461946
map.insert("guild_id".to_string(), guild_id.get().into());
19471947
}
19481948

1949-
from_value::<Member>(value).map_err(From::from)
1949+
from_value::<Member>(value)
19501950
}
19511951

19521952
/// Edits a message by Id.
@@ -2171,7 +2171,7 @@ impl Http {
21712171
map.insert("guild_id".to_string(), guild_id.get().into());
21722172
}
21732173

2174-
from_value(value).map_err(From::from)
2174+
from_value(value)
21752175
}
21762176

21772177
/// Changes the position of a role in a guild.
@@ -2209,7 +2209,7 @@ impl Http {
22092209
}
22102210
}
22112211

2212-
from_value(value).map_err(From::from)
2212+
from_value(value)
22132213
}
22142214

22152215
/// Modifies a scheduled event.
@@ -2269,7 +2269,7 @@ impl Http {
22692269
map.insert("guild_id".to_string(), guild_id.get().into());
22702270
}
22712271

2272-
from_value(value).map_err(From::from)
2272+
from_value(value)
22732273
}
22742274

22752275
/// Edits a thread channel in the [`GuildChannel`] given its Id.
@@ -3750,7 +3750,7 @@ impl Http {
37503750
}
37513751
}
37523752

3753-
from_value(value).map_err(From::from)
3753+
from_value(value)
37543754
}
37553755

37563756
/// Gets the amount of users that can be pruned.
@@ -3804,7 +3804,7 @@ impl Http {
38043804
map.insert("guild_id".to_string(), guild_id.get().into());
38053805
}
38063806

3807-
from_value(value).map_err(From::from)
3807+
from_value(value)
38083808
}
38093809

38103810
/// Retrieves a list of roles in a [`Guild`].
@@ -3830,7 +3830,7 @@ impl Http {
38303830
}
38313831
}
38323832

3833-
from_value(value).map_err(From::from)
3833+
from_value(value)
38343834
}
38353835

38363836
/// Gets a scheduled event by Id.
@@ -3956,7 +3956,7 @@ impl Http {
39563956
}
39573957
}
39583958

3959-
from_value(value).map_err(From::from)
3959+
from_value(value)
39603960
}
39613961

39623962
/// Retrieves a single sticker in a [`Guild`].
@@ -3983,7 +3983,7 @@ impl Http {
39833983
map.insert("guild_id".to_string(), guild_id.get().into());
39843984
}
39853985

3986-
from_value(value).map_err(From::from)
3986+
from_value(value)
39873987
}
39883988

39893989
/// Retrieves the webhooks for the given [guild][`Guild`]'s Id.
@@ -4120,7 +4120,7 @@ impl Http {
41204120
map.insert("guild_id".to_string(), guild_id.get().into());
41214121
}
41224122

4123-
from_value(value).map_err(From::from)
4123+
from_value(value)
41244124
}
41254125

41264126
/// Gets information about a specific invite.
@@ -4185,7 +4185,7 @@ impl Http {
41854185
map.insert("guild_id".to_string(), guild_id.get().into());
41864186
}
41874187

4188-
from_value(value).map_err(From::from)
4188+
from_value(value)
41894189
}
41904190

41914191
/// Gets a message by an Id, bots only.
@@ -4736,7 +4736,7 @@ impl Http {
47364736
}
47374737
}
47384738

4739-
from_value(value).map_err(From::from)
4739+
from_value(value)
47404740
}
47414741

47424742
/// Starts removing some members from a guild based on the last time they've been online.

src/internal/macros.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ macro_rules! bitflags {
145145
}
146146
) => {
147147
$(#[$outer])*
148-
#[repr(packed)]
148+
#[repr(Rust, packed)]
149149
$vis struct $BitFlags($T);
150150

151151
bitflags::bitflags! {

src/model/colour.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ impl Colour {
124124
#[allow(clippy::cast_lossless)]
125125
#[must_use]
126126
pub const fn from_rgb(red: u8, green: u8, blue: u8) -> Colour {
127-
Colour((red as u32) << 16 | (green as u32) << 8 | blue as u32)
127+
Colour(((red as u32) << 16) | ((green as u32) << 8) | blue as u32)
128128
}
129129

130130
/// Returns the red RGB component of this Colour.

src/model/id.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ macro_rules! id_u64 {
138138

139139
/// The inner storage of an ID.
140140
#[derive(Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)]
141-
#[repr(packed)]
141+
#[repr(Rust, packed)]
142142
pub(crate) struct InnerId(NonZeroU64);
143143

144144
struct SnowflakeVisitor;
@@ -235,7 +235,7 @@ newtype_display_impl!(ShardId, |this| this.0);
235235
/// The specific algorithm used is currently just a sequential index but this is subject to change.
236236
#[cfg_attr(feature = "typesize", derive(typesize::derive::TypeSize))]
237237
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, PartialOrd, Ord, Deserialize, Serialize)]
238-
#[repr(packed)]
238+
#[repr(Rust, packed)]
239239
pub struct AnswerId(u8);
240240

241241
impl AnswerId {

src/model/permissions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ pub const PRESET_VOICE: Permissions = Permissions::from_bits_truncate(
265265
/// [`User`]: super::user::User
266266
#[cfg_attr(feature = "typesize", derive(typesize::derive::TypeSize))]
267267
#[derive(Copy, Clone, Default, Debug, Eq, Hash, PartialEq)]
268-
#[repr(packed)]
268+
#[repr(Rust, packed)]
269269
pub struct Permissions(u64);
270270

271271
generate_permissions! {

0 commit comments

Comments
 (0)