Skip to content

Commit 25a2c13

Browse files
committedFeb 18, 2021
Auto merge of #82249 - JohnTitor:rollup-3jbqija, r=JohnTitor
Rollup of 8 pull requests Successful merges: - #82055 (Add diagnostics for specific cases for const/type mismatch err) - #82155 (Use !Sync std::lazy::OnceCell in usefulness checking) - #82202 (add specs for riscv32/riscv64 musl targets) - #82203 (Move some tests to more reasonable directories - 4) - #82211 (make `suggest_setup` help messages better) - #82212 (Remove redundant rustc_data_structures path component) - #82240 (remove useless ?s (clippy::needless_question_marks)) - #82243 (Add more intra-doc links to std::io) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents d1462d8 + 21283da commit 25a2c13

File tree

76 files changed

+209
-77
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+209
-77
lines changed
 

‎compiler/rustc_infer/src/infer/canonical/query_response.rs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -507,12 +507,7 @@ impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
507507

508508
// Unify the original value for each variable with the value
509509
// taken from `query_response` (after applying `result_subst`).
510-
Ok(self.unify_canonical_vars(
511-
cause,
512-
param_env,
513-
original_values,
514-
substituted_query_response,
515-
)?)
510+
self.unify_canonical_vars(cause, param_env, original_values, substituted_query_response)
516511
}
517512

518513
/// Converts the region constraints resulting from a query into an

‎compiler/rustc_middle/src/ty/codec.rs‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ impl<'tcx, D: TyDecoder<'tcx>> Decodable<D> for SubstsRef<'tcx> {
253253
fn decode(decoder: &mut D) -> Result<Self, D::Error> {
254254
let len = decoder.read_usize()?;
255255
let tcx = decoder.tcx();
256-
Ok(tcx.mk_substs((0..len).map(|_| Decodable::decode(decoder)))?)
256+
tcx.mk_substs((0..len).map(|_| Decodable::decode(decoder)))
257257
}
258258
}
259259

@@ -314,7 +314,7 @@ impl<'tcx, D: TyDecoder<'tcx>> RefDecodable<'tcx, D> for ty::AdtDef {
314314
impl<'tcx, D: TyDecoder<'tcx>> RefDecodable<'tcx, D> for ty::List<Ty<'tcx>> {
315315
fn decode(decoder: &mut D) -> Result<&'tcx Self, D::Error> {
316316
let len = decoder.read_usize()?;
317-
Ok(decoder.tcx().mk_type_list((0..len).map(|_| Decodable::decode(decoder)))?)
317+
decoder.tcx().mk_type_list((0..len).map(|_| Decodable::decode(decoder)))
318318
}
319319
}
320320

@@ -323,9 +323,7 @@ impl<'tcx, D: TyDecoder<'tcx>> RefDecodable<'tcx, D>
323323
{
324324
fn decode(decoder: &mut D) -> Result<&'tcx Self, D::Error> {
325325
let len = decoder.read_usize()?;
326-
Ok(decoder
327-
.tcx()
328-
.mk_poly_existential_predicates((0..len).map(|_| Decodable::decode(decoder)))?)
326+
decoder.tcx().mk_poly_existential_predicates((0..len).map(|_| Decodable::decode(decoder)))
329327
}
330328
}
331329

‎compiler/rustc_middle/src/ty/print/pretty.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ pub trait PrettyPrinter<'tcx>:
607607
return Ok(self);
608608
}
609609

610-
return Ok(with_no_queries(|| {
610+
return with_no_queries(|| {
611611
let def_key = self.tcx().def_key(def_id);
612612
if let Some(name) = def_key.disambiguated_data.data.get_opt_name() {
613613
p!(write("{}", name));
@@ -649,7 +649,7 @@ pub trait PrettyPrinter<'tcx>:
649649
p!(" Sized");
650650
}
651651
Ok(self)
652-
})?);
652+
});
653653
}
654654
ty::Str => p!("str"),
655655
ty::Generator(did, substs, movability) => {

‎compiler/rustc_middle/src/ty/relate.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ pub fn relate_substs<R: TypeRelation<'tcx>>(
154154
relation.relate_with_variance(variance, a, b)
155155
});
156156

157-
Ok(tcx.mk_substs(params)?)
157+
tcx.mk_substs(params)
158158
}
159159

160160
impl<'tcx> Relate<'tcx> for ty::FnSig<'tcx> {
@@ -647,7 +647,7 @@ impl<'tcx> Relate<'tcx> for &'tcx ty::List<ty::Binder<ty::ExistentialPredicate<'
647647
_ => Err(TypeError::ExistentialMismatch(expected_found(relation, a, b))),
648648
}
649649
});
650-
Ok(tcx.mk_poly_existential_predicates(v)?)
650+
tcx.mk_poly_existential_predicates(v)
651651
}
652652
}
653653

0 commit comments

Comments
 (0)