OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Moved some short functions back into fn_ctxt.rs

Browse Source
This commit is contained in:
Nicholas-Baron 2020-10-11 15:59:41 -07:00
parent 21751fa93b
commit 48291cf1d7
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
compiler/rustc_typeck/src/check/fn_ctxt.rs
View File

@ -11,7 +11,9 @@ use rustc_middle::hir::map::blocks::FnLikeNode;
use rustc_middle::ty::fold::TypeFoldable;
use rustc_middle::ty::subst::GenericArgKind;
use rustc_middle::ty::{self, Const, Ty, TyCtxt};
use rustc_session::Session;
use rustc_span::{self, Span};
use rustc_trait_selection::traits::{ObligationCause, ObligationCauseCode};
use std::cell::{Cell, RefCell};
use std::ops::Deref;
@ -104,8 +106,6 @@ pub struct FnCtxt<'a, 'tcx> {
pub(super) inh: &'a Inherited<'a, 'tcx>,
}
// FIXME: This impl is for functions which access the (private) `err_count_on_creation` field.
// It looks like that field will be changed soon and so this solution may end up being temporary.
impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
pub fn new(
inh: &'a Inherited<'a, 'tcx>,
@ -132,6 +132,19 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
inh,
}
}
pub fn cause(&self, span: Span, code: ObligationCauseCode<'tcx>) -> ObligationCause<'tcx> {
ObligationCause::new(span, self.body_id, code)
}
pub fn misc(&self, span: Span) -> ObligationCause<'tcx> {
self.cause(span, ObligationCauseCode::MiscObligation)
}
pub fn sess(&self) -> &Session {
&self.tcx.sess
}
pub fn errors_reported_since_creation(&self) -> bool {
self.tcx.sess.err_count() > self.err_count_on_creation
}

11
compiler/rustc_typeck/src/check/fn_ctxt_impl.rs
View File

@ -54,9 +54,6 @@ use std::mem::replace;
use std::slice;
impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
pub fn sess(&self) -> &Session {
&self.tcx.sess
}
/// Produces warning on the given node, if the current point in the
/// function is unreachable, and there hasn't been another warning.
@ -90,14 +87,6 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
}
}
pub fn cause(&self, span: Span, code: ObligationCauseCode<'tcx>) -> ObligationCause<'tcx> {
ObligationCause::new(span, self.body_id, code)
}
pub fn misc(&self, span: Span) -> ObligationCause<'tcx> {
self.cause(span, ObligationCauseCode::MiscObligation)
}
/// Resolves type and const variables in `ty` if possible. Unlike the infcx
/// version (resolve_vars_if_possible), this version will
/// also select obligations if it seems useful, in an effort