fix unqualified_local_imports in rustc_const_eval

This commit is contained in:
Ralf Jung 2024-09-23 11:57:12 +02:00
parent 4c43757e43
commit 1eb51e717e
3 changed files with 11 additions and 8 deletions

View File

@ -16,12 +16,12 @@
mod machine; mod machine;
mod valtrees; mod valtrees;
pub use dummy_machine::*; pub use self::dummy_machine::*;
pub use error::*; pub use self::error::*;
pub use eval_queries::*; pub use self::eval_queries::*;
pub use fn_queries::*; pub use self::fn_queries::*;
pub use machine::*; pub use self::machine::*;
pub(crate) use valtrees::{eval_to_valtree, valtree_to_const_value}; pub(crate) use self::valtrees::{eval_to_valtree, valtree_to_const_value};
// We forbid type-level constants that contain more than `VALTREE_MAX_NODES` nodes. // We forbid type-level constants that contain more than `VALTREE_MAX_NODES` nodes.
const VALTREE_MAX_NODES: usize = 100000; const VALTREE_MAX_NODES: usize = 100000;

View File

@ -19,12 +19,12 @@
mod validity; mod validity;
mod visitor; mod visitor;
use eval_context::{from_known_layout, mir_assign_valid_types};
#[doc(no_inline)] #[doc(no_inline)]
pub use rustc_middle::mir::interpret::*; // have all the `interpret` symbols in one place: here pub use rustc_middle::mir::interpret::*; // have all the `interpret` symbols in one place: here
pub use self::call::FnArg; pub use self::call::FnArg;
pub use self::eval_context::{InterpCx, format_interp_error}; pub use self::eval_context::{InterpCx, format_interp_error};
use self::eval_context::{from_known_layout, mir_assign_valid_types};
pub use self::intern::{ pub use self::intern::{
HasStaticRootDefId, InternKind, InternResult, intern_const_alloc_for_constprop, HasStaticRootDefId, InternKind, InternResult, intern_const_alloc_for_constprop,
intern_const_alloc_recursive, intern_const_alloc_recursive,

View File

@ -1,6 +1,8 @@
// tidy-alphabetical-start // tidy-alphabetical-start
#![allow(internal_features)] #![allow(internal_features)]
#![allow(rustc::diagnostic_outside_of_impl)] #![allow(rustc::diagnostic_outside_of_impl)]
#![cfg_attr(not(bootstrap), feature(unqualified_local_imports))]
#![cfg_attr(not(bootstrap), warn(unqualified_local_imports))]
#![doc(rust_logo)] #![doc(rust_logo)]
#![feature(assert_matches)] #![feature(assert_matches)]
#![feature(box_patterns)] #![feature(box_patterns)]
@ -25,10 +27,11 @@
use std::sync::atomic::AtomicBool; use std::sync::atomic::AtomicBool;
pub use errors::ReportErrorExt;
use rustc_middle::ty; use rustc_middle::ty;
use rustc_middle::util::Providers; use rustc_middle::util::Providers;
pub use self::errors::ReportErrorExt;
rustc_fluent_macro::fluent_messages! { "../messages.ftl" } rustc_fluent_macro::fluent_messages! { "../messages.ftl" }
pub fn provide(providers: &mut Providers) { pub fn provide(providers: &mut Providers) {