bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #90387 - matthiaskrgr:rollup-b2x8v0x, r=matthiaskrgr

Browse source 
Rollup of 3 pull requests

Successful merges:

 - #90082 (Fix minor typos)
 - #90336 (Remove extra lines in examples for `Duration::try_from_secs_*`)
 - #90376 (Various cleanups around opaque types)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2021-10-28 22:44:45 +00:00
commit df76418f1e
9 changed files with 599 additions and 655 deletions
Download patch file Download diff file Expand all files Collapse all files

1
compiler/rustc_borrowck/src/type_check/mod.rs
View file

@ -36,7 +36,6 @@ use rustc_span::def_id::CRATE_DEF_ID;
use rustc_span::{Span, DUMMY_SP};
use rustc_target::abi::VariantIdx;
use rustc_trait_selection::infer::InferCtxtExt as _;
use rustc_trait_selection::opaque_types::InferCtxtExt;
use rustc_trait_selection::traits::error_reporting::InferCtxtExt as _;
use rustc_trait_selection::traits::query::type_op;
use rustc_trait_selection::traits::query::type_op::custom::CustomTypeOp;