diff --git a/Cargo.toml b/Cargo.toml index 4bd0c3fa76e2..ede457a9e2b2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -133,7 +133,7 @@ authors = ["The Wasmtime Project Developers"] edition = "2021" # Wasmtime's current policy is that this number can be no larger than the # current stable release of Rust minus 2. -rust-version = "1.72.0" +rust-version = "1.73.0" [workspace.lints.rust] # Turn on some lints which are otherwise allow-by-default in rustc. diff --git a/cranelift/codegen/src/isle_prelude.rs b/cranelift/codegen/src/isle_prelude.rs index 33a7fd4242f6..39bc55027028 100644 --- a/cranelift/codegen/src/isle_prelude.rs +++ b/cranelift/codegen/src/isle_prelude.rs @@ -819,7 +819,7 @@ macro_rules! isle_common_prelude_methods { } #[inline] - fn signed_cond_code(&mut self, cc: &condcodes::IntCC) -> Option { + fn signed_cond_code(&mut self, cc: &IntCC) -> Option { match cc { IntCC::Equal | IntCC::UnsignedGreaterThanOrEqual diff --git a/cranelift/codegen/src/machinst/isle.rs b/cranelift/codegen/src/machinst/isle.rs index 6967aa9bce82..c1f543b9e64b 100644 --- a/cranelift/codegen/src/machinst/isle.rs +++ b/cranelift/codegen/src/machinst/isle.rs @@ -7,8 +7,8 @@ use std::cell::Cell; pub use super::MachLabel; use super::RetPair; pub use crate::ir::{ - condcodes, condcodes::CondCode, dynamic_to_fixed, Constant, DynamicStackSlot, ExternalName, - FuncRef, GlobalValue, Immediate, SigRef, StackSlot, + condcodes::CondCode, dynamic_to_fixed, Constant, DynamicStackSlot, ExternalName, FuncRef, + GlobalValue, Immediate, SigRef, StackSlot, }; pub use crate::isa::{unwind::UnwindInst, TargetIsa}; pub use crate::machinst::{ diff --git a/cranelift/codegen/src/machinst/mod.rs b/cranelift/codegen/src/machinst/mod.rs index 2d8acd2947c5..3ebcf8b74d09 100644 --- a/cranelift/codegen/src/machinst/mod.rs +++ b/cranelift/codegen/src/machinst/mod.rs @@ -81,6 +81,7 @@ pub use buffer::*; pub mod helpers; pub use helpers::*; pub mod inst_common; +#[allow(unused_imports)] // not used in all backends right now pub use inst_common::*; pub mod valueregs; pub use reg::*; diff --git a/cranelift/codegen/src/opts.rs b/cranelift/codegen/src/opts.rs index 2d05057fcb4c..c24e6190eeea 100644 --- a/cranelift/codegen/src/opts.rs +++ b/cranelift/codegen/src/opts.rs @@ -1,7 +1,6 @@ //! Optimization driver using ISLE rewrite rules on an egraph. use crate::egraph::{NewOrExistingInst, OptimizeCtx}; -use crate::ir::condcodes; pub use crate::ir::condcodes::{FloatCC, IntCC}; use crate::ir::dfg::ValueDef; pub use crate::ir::immediates::{Ieee32, Ieee64, Imm64, Offset32, Uimm8, V128Imm};