Assign FIXMEs to me and remove obsolete ones
Also fixed capitalization of documentation
This commit is contained in:
parent
136eaa1b25
commit
f25d2bd53b
5 changed files with 5 additions and 18 deletions
|
@ -63,7 +63,7 @@ pub trait TraitEngine<'tcx>: 'tcx {
|
||||||
infcx: &InferCtxt<'_, 'tcx>,
|
infcx: &InferCtxt<'_, 'tcx>,
|
||||||
) -> Result<(), Vec<FulfillmentError<'tcx>>>;
|
) -> Result<(), Vec<FulfillmentError<'tcx>>>;
|
||||||
|
|
||||||
// FIXME this should not provide a default body for chalk as chalk should be updated
|
// FIXME(fee1-dead) this should not provide a default body for chalk as chalk should be updated
|
||||||
fn select_with_constness_where_possible(
|
fn select_with_constness_where_possible(
|
||||||
&mut self,
|
&mut self,
|
||||||
infcx: &InferCtxt<'_, 'tcx>,
|
infcx: &InferCtxt<'_, 'tcx>,
|
||||||
|
|
|
@ -316,7 +316,7 @@ impl<'cx, 'tcx> SelectionContext<'cx, 'tcx> {
|
||||||
self.infcx.tcx
|
self.infcx.tcx
|
||||||
}
|
}
|
||||||
|
|
||||||
/// returns `true` if the predicate is considered `const` to
|
/// Returns `true` if the predicate is considered `const` to
|
||||||
/// this selection context.
|
/// this selection context.
|
||||||
pub fn is_predicate_const(&self, pred: ty::Predicate<'_>) -> bool {
|
pub fn is_predicate_const(&self, pred: ty::Predicate<'_>) -> bool {
|
||||||
match pred.kind().skip_binder() {
|
match pred.kind().skip_binder() {
|
||||||
|
|
|
@ -6,9 +6,7 @@ use rustc_infer::infer::{InferCtxt, TyCtxtInferExt};
|
||||||
use rustc_infer::traits::TraitEngineExt as _;
|
use rustc_infer::traits::TraitEngineExt as _;
|
||||||
use rustc_middle::ty::query::Providers;
|
use rustc_middle::ty::query::Providers;
|
||||||
use rustc_middle::ty::subst::{GenericArg, Subst, UserSelfTy, UserSubsts};
|
use rustc_middle::ty::subst::{GenericArg, Subst, UserSelfTy, UserSubsts};
|
||||||
use rustc_middle::ty::{
|
use rustc_middle::ty::{self, FnSig, Lift, PolyFnSig, Ty, TyCtxt, TypeFoldable, Variance};
|
||||||
self, FnSig, Lift, PolyFnSig, PredicateKind, Ty, TyCtxt, TypeFoldable, Variance,
|
|
||||||
};
|
|
||||||
use rustc_middle::ty::{ParamEnv, ParamEnvAnd, Predicate, ToPredicate};
|
use rustc_middle::ty::{ParamEnv, ParamEnvAnd, Predicate, ToPredicate};
|
||||||
use rustc_span::DUMMY_SP;
|
use rustc_span::DUMMY_SP;
|
||||||
use rustc_trait_selection::infer::InferCtxtBuilderExt;
|
use rustc_trait_selection::infer::InferCtxtBuilderExt;
|
||||||
|
@ -87,16 +85,7 @@ impl AscribeUserTypeCx<'me, 'tcx> {
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn prove_predicate(&mut self, mut predicate: Predicate<'tcx>) {
|
fn prove_predicate(&mut self, predicate: Predicate<'tcx>) {
|
||||||
if let PredicateKind::Trait(mut tr) = predicate.kind().skip_binder() {
|
|
||||||
if let hir::Constness::Const = tr.constness {
|
|
||||||
// FIXME check if we actually want to prove const predicates inside AscribeUserType
|
|
||||||
tr.constness = hir::Constness::NotConst;
|
|
||||||
predicate =
|
|
||||||
predicate.kind().rebind(PredicateKind::Trait(tr)).to_predicate(self.tcx());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
self.fulfill_cx.register_predicate_obligation(
|
self.fulfill_cx.register_predicate_obligation(
|
||||||
self.infcx,
|
self.infcx,
|
||||||
Obligation::new(ObligationCause::dummy(), self.param_env, predicate),
|
Obligation::new(ObligationCause::dummy(), self.param_env, predicate),
|
||||||
|
|
|
@ -10,7 +10,7 @@ pub const MY_VEC: Vec<usize> = Vec::new();
|
||||||
#[allow(dead_code)]
|
#[allow(dead_code)]
|
||||||
pub const MY_STRING: String = String::new();
|
pub const MY_STRING: String = String::new();
|
||||||
|
|
||||||
// FIXME remove this struct once we put `K: ?const Ord` on BTreeMap::new.
|
// FIXME(fee1-dead) remove this struct once we put `K: ?const Ord` on BTreeMap::new.
|
||||||
#[derive(PartialEq, Eq, PartialOrd)]
|
#[derive(PartialEq, Eq, PartialOrd)]
|
||||||
pub struct MyType;
|
pub struct MyType;
|
||||||
|
|
||||||
|
|
|
@ -25,8 +25,6 @@
|
||||||
#![feature(string_remove_matches)]
|
#![feature(string_remove_matches)]
|
||||||
#![feature(const_btree_new)]
|
#![feature(const_btree_new)]
|
||||||
#![feature(const_trait_impl)]
|
#![feature(const_trait_impl)]
|
||||||
// FIXME remove this when const_trait_impl is not incomplete anymore
|
|
||||||
#![allow(incomplete_features)]
|
|
||||||
|
|
||||||
use std::collections::hash_map::DefaultHasher;
|
use std::collections::hash_map::DefaultHasher;
|
||||||
use std::hash::{Hash, Hasher};
|
use std::hash::{Hash, Hasher};
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue