Skip to content

Commit

Permalink
chore: bump rust 1.83.0 (#576)
Browse files Browse the repository at this point in the history
  • Loading branch information
baszalmstra authored Dec 1, 2024
1 parent 0acea1c commit ba2a7b2
Show file tree
Hide file tree
Showing 59 changed files with 1,253 additions and 986 deletions.
File renamed without changes.
1,636 changes: 1,010 additions & 626 deletions Cargo.lock

Large diffs are not rendered by default.

64 changes: 32 additions & 32 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,69 +16,69 @@ license = "MIT OR Apache-2.0"
categories = ["game-development"]

[workspace.dependencies]
annotate-snippets = { version = "0.10.0", default-features = false }
anyhow = { version = "1.0.75", default-features = false }
apple-codesign = { version = "0.27.0", default-features = false }
annotate-snippets = { version = "0.10.2", default-features = false }
anyhow = { version = "1.0.93", default-features = false }
apple-codesign = { version = "0.29.0", default-features = false }
array-init = { version = "2.1.0", default-features = false }
bitflags = { version = "2.5.0", default-features = false }
by_address = { version = "1.1.0", default-features = false }
bytecount = { version = "0.6.7", default-features = false }
bytemuck = { version = "1.14.0", default-features = false }
bitflags = { version = "2.6.0", default-features = false }
by_address = { version = "1.2.1", default-features = false }
bytecount = { version = "0.6.8", default-features = false }
bytemuck = { version = "1.20.0", default-features = false }
cargo-husky = { version = "1", default-features = false }
cbindgen = { version = "0.24.5", default-features = false }
clap = { version = "4.4.11", default-features = false }
crossbeam-channel = { version = "0.5.9", default-features = false }
clap = { version = "4.5.21", default-features = false }
crossbeam-channel = { version = "0.5.13", default-features = false }
ctrlc = { version = "3.4", default-features = false }
difference = "2.0"
drop_bomb = { version = "0.1.5", default-features = false }
either = { version = "1.9.0", default-features = false }
either = { version = "1.13.0", default-features = false }
ena = { version = "0.14", default-features = false }
extendhash = { version = "1.0.10", default-features = false }
heck = "0.4.1"
inkwell = { version = "0.2.0", default-features = false }
insta = { version = "1.34.0", default-features = false }
itertools = { version = "0.12.0", default-features = false }
insta = { version = "1.41.1", default-features = false }
itertools = { version = "0.12.1", default-features = false }
la-arena = { version = "0.3.1", default-features = false }
lazy_static = { version = "1.4.0", default-features = false }
libloading = { version = "0.8.1", default-features = false }
lazy_static = { version = "1.5.0", default-features = false }
libloading = { version = "0.8.6", default-features = false }
lld_rs = { version = "140.0.0", default-features = false }
lockfile = { version = "0.4.0", default-features = false }
log = { version = "0.4.20", default-features = false }
lsp-server = { version = "0.7.5", default-features = false }
log = { version = "0.4.22", default-features = false }
lsp-server = { version = "0.7.7", default-features = false }
lsp-types = { version = "=0.95.0", default-features = false }
mdbook = { version = "0.4.36", default-features = false }
once_cell = { version = "1.19.0", default-features = false }
parking_lot = { version = "0.12.1", default-features = false }
paste = { version = "1.0.14", default-features = false }
mdbook = { version = "0.4.43", default-features = false }
once_cell = { version = "1.20.2", default-features = false }
parking_lot = { version = "0.12.3", default-features = false }
paste = { version = "1.0.15", default-features = false }
pretty_env_logger = { version = "0.5.0", default-features = false }
proc-macro2 = { version = "1.0", default-features = false }
pulldown-cmark = { version = "0.9.3", default-features = false }
pulldown-cmark = { version = "0.9.6", default-features = false }
quote = { version = "1.0", default-features = false }
ra_ap_text_edit = { version = "0.0.190", default-features = false }
relative-path = { version = "1.9", default-features = false }
ron = "0.8.1"
rowan = { version = "0.15.15", default-features = false }
rowan = { version = "0.15.16", default-features = false }
rustc-hash = { version = "1.1.0", default-features = false }
salsa = { version = "0.16.1", default-features = false }
semver = { version = "1.0", default-features = false }
seq-macro = { version = "0.3.5", default-features = false }
serde = { version = "1.0.193", default-features = false }
serde = { version = "1.0.215", default-features = false }
serde_derive = { version = "1.0", default-features = false }
serde_json = { version = "1.0", default-features = false }
smallvec = { version = "1.11.2", default-features = false }
smol_str = { version = "0.2.1", default-features = false }
smallvec = { version = "1.13.2", default-features = false }
smol_str = { version = "0.2.2", default-features = false }
syn = { version = "2.0", default-features = false }
tempdir = { version = "0.3.7", default-features = false }
tempfile = { version = "3.8", default-features = false }
tera = { version = "1.19.1", default-features = false }
termcolor = { version = "1.1", default-features = false }
tempfile = { version = "3.14", default-features = false }
tera = { version = "1.20.0", default-features = false }
termcolor = { version = "1.4", default-features = false }
text-size = { version = "1.1.1", default-features = false }
text_trees = { version = "0.1.2", default-features = false }
thiserror = { version = "1.0.51", default-features = false }
thiserror = { version = "1.0.69", default-features = false }
threadpool = { version = "1.8.1", default-features = false }
toml = { version = "0.8.8", default-features = false }
unicode-xid = { version = "0.2.4", default-features = false }
walkdir = { version = "2.4.0", default-features = false }
toml = { version = "0.8.19", default-features = false }
unicode-xid = { version = "0.2.6", default-features = false }
walkdir = { version = "2.5.0", default-features = false }
yansi-term = { version = "0.1.2", default-features = false }
notify = { version = "5.2.0" }
winapi = { version = "0.3.9", default-features = false }
Expand Down
8 changes: 4 additions & 4 deletions crates/mun_abi/src/assembly_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ pub struct AssemblyInfo<'a> {
pub num_dependencies: u32,
}

impl<'a> AssemblyInfo<'a> {
impl AssemblyInfo<'_> {
/// Returns an iterator over the assembly's dependencies.
pub fn dependencies(&self) -> impl Iterator<Item = &str> {
let dependencies = if self.num_dependencies == 0 {
Expand All @@ -32,11 +32,11 @@ impl<'a> AssemblyInfo<'a> {
}
}

unsafe impl<'a> Send for AssemblyInfo<'a> {}
unsafe impl<'a> Sync for AssemblyInfo<'a> {}
unsafe impl Send for AssemblyInfo<'_> {}
unsafe impl Sync for AssemblyInfo<'_> {}

#[cfg(feature = "serde")]
impl<'a> serde::Serialize for AssemblyInfo<'a> {
impl serde::Serialize for AssemblyInfo<'_> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand Down
2 changes: 1 addition & 1 deletion crates/mun_abi/src/dispatch_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ impl<'a> DispatchTable<'a> {
}

#[cfg(feature = "serde")]
impl<'a> serde::Serialize for DispatchTable<'a> {
impl serde::Serialize for DispatchTable<'_> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand Down
24 changes: 12 additions & 12 deletions crates/mun_abi/src/function_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -42,18 +42,18 @@ pub struct FunctionSignature<'a> {
pub num_arg_types: u16,
}

unsafe impl<'a> Send for FunctionDefinition<'a> {}
unsafe impl<'a> Sync for FunctionDefinition<'a> {}
unsafe impl Send for FunctionDefinition<'_> {}
unsafe impl Sync for FunctionDefinition<'_> {}

impl<'a> FunctionPrototype<'a> {
impl FunctionPrototype<'_> {
/// Returns the function's name.
pub fn name(&self) -> &str {
unsafe { str::from_utf8_unchecked(CStr::from_ptr(self.name).to_bytes()) }
}
}

unsafe impl<'a> Send for FunctionPrototype<'a> {}
unsafe impl<'a> Sync for FunctionPrototype<'a> {}
unsafe impl Send for FunctionPrototype<'_> {}
unsafe impl Sync for FunctionPrototype<'_> {}

impl<'a> FunctionSignature<'a> {
/// Returns the function's arguments' types.
Expand All @@ -75,19 +75,19 @@ impl<'a> FunctionSignature<'a> {
}
}

impl<'a> PartialEq for FunctionSignature<'a> {
impl PartialEq for FunctionSignature<'_> {
fn eq(&self, other: &Self) -> bool {
self.return_type() == other.return_type() && self.arg_types().eq(other.arg_types())
}
}

impl<'a> Eq for FunctionSignature<'a> {}
impl Eq for FunctionSignature<'_> {}

unsafe impl<'a> Send for FunctionSignature<'a> {}
unsafe impl<'a> Sync for FunctionSignature<'a> {}
unsafe impl Send for FunctionSignature<'_> {}
unsafe impl Sync for FunctionSignature<'_> {}

#[cfg(feature = "serde")]
impl<'a> serde::Serialize for FunctionDefinition<'a> {
impl serde::Serialize for FunctionDefinition<'_> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand All @@ -102,7 +102,7 @@ impl<'a> serde::Serialize for FunctionDefinition<'a> {
}

#[cfg(feature = "serde")]
impl<'a> serde::Serialize for FunctionPrototype<'a> {
impl serde::Serialize for FunctionPrototype<'_> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand All @@ -117,7 +117,7 @@ impl<'a> serde::Serialize for FunctionPrototype<'a> {
}

#[cfg(feature = "serde")]
impl<'a> serde::Serialize for FunctionSignature<'a> {
impl serde::Serialize for FunctionSignature<'_> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand Down
6 changes: 3 additions & 3 deletions crates/mun_abi/src/module_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,11 @@ impl<'a> ModuleInfo<'a> {
}
}

unsafe impl<'a> Send for ModuleInfo<'a> {}
unsafe impl<'a> Sync for ModuleInfo<'a> {}
unsafe impl Send for ModuleInfo<'_> {}
unsafe impl Sync for ModuleInfo<'_> {}

#[cfg(feature = "serde")]
impl<'a> serde::Serialize for ModuleInfo<'a> {
impl serde::Serialize for ModuleInfo<'_> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand Down
6 changes: 3 additions & 3 deletions crates/mun_abi/src/struct_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ impl<'a> StructDefinition<'a> {
}
}

impl<'a> PartialEq for StructDefinition<'a> {
impl PartialEq for StructDefinition<'_> {
fn eq(&self, other: &Self) -> bool {
self.guid == other.guid
}
}

impl<'a> Eq for StructDefinition<'a> {}
impl Eq for StructDefinition<'_> {}

#[cfg(feature = "serde")]
impl<'a> serde::Serialize for StructDefinition<'a> {
impl serde::Serialize for StructDefinition<'_> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand Down
12 changes: 6 additions & 6 deletions crates/mun_abi/src/type_id.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ pub struct ArrayTypeId<'a> {
pub element: &'a TypeId<'a>,
}

unsafe impl<'a> Send for TypeId<'a> {}
unsafe impl Send for TypeId<'_> {}

unsafe impl<'a> Sync for TypeId<'a> {}
unsafe impl Sync for TypeId<'_> {}

impl<'a> From<Guid> for TypeId<'a> {
impl From<Guid> for TypeId<'_> {
fn from(guid: Guid) -> Self {
TypeId::Concrete(guid)
}
Expand All @@ -60,7 +60,7 @@ impl<'a> From<PointerTypeId<'a>> for TypeId<'a> {
}
}

impl<'a> fmt::Display for TypeId<'a> {
impl fmt::Display for TypeId<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
TypeId::Concrete(guid) => guid.fmt(f),
Expand All @@ -70,7 +70,7 @@ impl<'a> fmt::Display for TypeId<'a> {
}
}

impl<'a> fmt::Display for PointerTypeId<'a> {
impl fmt::Display for PointerTypeId<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
if self.mutable {
write!(f, "*mut ")
Expand All @@ -81,7 +81,7 @@ impl<'a> fmt::Display for PointerTypeId<'a> {
}
}

impl<'a> fmt::Display for ArrayTypeId<'a> {
impl fmt::Display for ArrayTypeId<'_> {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(f, "[{}]", &self.element)
}
Expand Down
16 changes: 8 additions & 8 deletions crates/mun_abi/src/type_info.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ pub struct TypeDefinition<'a> {
pub data: TypeDefinitionData<'a>,
}

impl<'a> Debug for TypeDefinition<'a> {
impl Debug for TypeDefinition<'_> {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
f.debug_struct("TypeDefinition")
.field("name", &self.name())
Expand All @@ -45,7 +45,7 @@ impl<'a> Debug for TypeDefinition<'a> {
}

#[cfg(feature = "serde")]
impl<'a> serde::Serialize for TypeDefinition<'a> {
impl serde::Serialize for TypeDefinition<'_> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand Down Expand Up @@ -118,26 +118,26 @@ impl<'a> TypeDefinition<'a> {
}
}

impl<'a> fmt::Display for TypeDefinition<'a> {
impl fmt::Display for TypeDefinition<'_> {
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
write!(f, "{}", self.name())
}
}

impl<'a> PartialEq for TypeDefinition<'a> {
impl PartialEq for TypeDefinition<'_> {
fn eq(&self, other: &Self) -> bool {
self.size_in_bits == other.size_in_bits
&& self.alignment == other.alignment
&& self.data == other.data
}
}

impl<'a> Eq for TypeDefinition<'a> {}
impl Eq for TypeDefinition<'_> {}

unsafe impl<'a> Send for TypeDefinition<'a> {}
unsafe impl<'a> Sync for TypeDefinition<'a> {}
unsafe impl Send for TypeDefinition<'_> {}
unsafe impl Sync for TypeDefinition<'_> {}

impl<'a> TypeDefinitionData<'a> {
impl TypeDefinitionData<'_> {
/// Returns whether this is a struct type.
pub fn is_struct(&self) -> bool {
matches!(self, TypeDefinitionData::Struct(_))
Expand Down
2 changes: 1 addition & 1 deletion crates/mun_abi/src/type_lut.rs
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ impl<'a> TypeLut<'a> {
}

#[cfg(feature = "serde")]
impl<'a> serde::Serialize for TypeLut<'a> {
impl serde::Serialize for TypeLut<'_> {
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
where
S: serde::Serializer,
Expand Down
2 changes: 1 addition & 1 deletion crates/mun_codegen/src/code_gen/symbols/ir_type_builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use crate::{
pub struct TypeIdBuilder<'ink, 'a, 'b, 'c> {
context: &'a IrValueContext<'ink, 'b, 'c>,

/// A map of ir::TypeIds that have already have already been interned.
/// A map of `ir::TypeIds` that have already have already been interned.
interned_types: RefCell<FxHashMap<Arc<TypeId>, Global<'ink, ir::TypeId<'ink>>>>,
}

Expand Down
Loading

0 comments on commit ba2a7b2

Please sign in to comment.