bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove extern crate rustc_middle from rustc_const_eval.

Browse source 
This requires exporting the interpreter macros so they can be used with
`use crate::interpret::*`.
This commit is contained in:
Nicholas Nethercote 2024-05-08 19:03:14 +10:00
parent f12e935795
commit 4497d345a8
32 changed files with 101 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

38
compiler/rustc_middle/src/mir/interpret/mod.rs
View file

@ -8,11 +8,13 @@ macro_rules! err_unsup {
)
};
}
pub use err_unsup;
#[macro_export]
macro_rules! err_unsup_format {
($($tt:tt)*) => { err_unsup!(Unsupported(format!($($tt)*))) };
($($tt:tt)*) => { $crate::err_unsup!(Unsupported(format!($($tt)*))) };
}
pub use err_unsup_format;
#[macro_export]
macro_rules! err_inval {
@ -22,6 +24,7 @@ macro_rules! err_inval {
)
};
}
pub use err_inval;
#[macro_export]
macro_rules! err_ub {
@ -31,11 +34,13 @@ macro_rules! err_ub {
)
};
}
pub use err_ub;
#[macro_export]
macro_rules! err_ub_format {
($($tt:tt)*) => { err_ub!(Ub(format!($($tt)*))) };
}
pub use err_ub_format;
#[macro_export]
macro_rules! err_exhaust {
@ -45,6 +50,7 @@ macro_rules! err_exhaust {
)
};
}
pub use err_exhaust;
#[macro_export]
macro_rules! err_machine_stop {
@ -52,42 +58,50 @@ macro_rules! err_machine_stop {
$crate::mir::interpret::InterpError::MachineStop(Box::new($($tt)*))
};
}
pub use err_machine_stop;
// In the `throw_*` macros, avoid `return` to make them work with `try {}`.
#[macro_export]
macro_rules! throw_unsup {
($($tt:tt)*) => { do yeet err_unsup!($($tt)*) };
($($tt:tt)*) => { do yeet $crate::err_unsup!($($tt)*) };
}
pub use throw_unsup;
#[macro_export]
macro_rules! throw_unsup_format {
($($tt:tt)*) => { throw_unsup!(Unsupported(format!($($tt)*))) };
($($tt:tt)*) => { $crate::throw_unsup!(Unsupported(format!($($tt)*))) };
}
pub use throw_unsup_format;
#[macro_export]
macro_rules! throw_inval {
($($tt:tt)*) => { do yeet err_inval!($($tt)*) };
($($tt:tt)*) => { do yeet $crate::err_inval!($($tt)*) };
}
pub use throw_inval;
#[macro_export]
macro_rules! throw_ub {
($($tt:tt)*) => { do yeet err_ub!($($tt)*) };
($($tt:tt)*) => { do yeet $crate::err_ub!($($tt)*) };
}
pub use throw_ub;
#[macro_export]
macro_rules! throw_ub_format {
($($tt:tt)*) => { throw_ub!(Ub(format!($($tt)*))) };
($($tt:tt)*) => { $crate::throw_ub!(Ub(format!($($tt)*))) };
}
pub use throw_ub_format;
#[macro_export]
macro_rules! throw_exhaust {
($($tt:tt)*) => { do yeet err_exhaust!($($tt)*) };
($($tt:tt)*) => { do yeet $crate::err_exhaust!($($tt)*) };
}
pub use throw_exhaust;
#[macro_export]
macro_rules! throw_machine_stop {
($($tt:tt)*) => { do yeet err_machine_stop!($($tt)*) };
($($tt:tt)*) => { do yeet $crate::err_machine_stop!($($tt)*) };
}
pub use throw_machine_stop;
#[macro_export]
macro_rules! err_ub_custom {
@ -95,8 +109,8 @@ macro_rules! err_ub_custom {
$(
let ($($name,)*) = ($($value,)*);
)?
err_ub!(Custom(
rustc_middle::error::CustomSubdiagnostic {
$crate::err_ub!(Custom(
$crate::error::CustomSubdiagnostic {
msg: || $msg,
add_args: Box::new(move |mut set_arg| {
$($(
@ -107,11 +121,13 @@ macro_rules! err_ub_custom {
))
}};
}
pub use err_ub_custom;
#[macro_export]
macro_rules! throw_ub_custom {
($($tt:tt)*) => { do yeet err_ub_custom!($($tt)*) };
($($tt:tt)*) => { do yeet $crate::err_ub_custom!($($tt)*) };
}
pub use throw_ub_custom;
mod allocation;
mod error;