Skip to content

Rollup of 5 pull requests #112755

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jun 18, 2023
Merged

Rollup of 5 pull requests #112755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
316742e
io: soften ‘at most one write attempt’ requirement in io::Write::write
mina86 Jan 22, 2023
8654669
Update library/std/src/io/mod.rs
mina86 Feb 3, 2023
5451dfe
Update library/std/src/io/mod.rs
mina86 Feb 28, 2023
7d57cd5
Update library/std/src/io/mod.rs
mina86 Mar 3, 2023
886085a
std: only depend on dlmalloc for wasm*-unknown
cuviper Jun 15, 2023
3078de7
add dry_run check
beepster4096 Jun 16, 2023
f874345
`Bound::predicates` to return `Clause`
dswij Jun 17, 2023
52d3fc9
Move WF goal to clause
compiler-errors Jun 15, 2023
6594c75
Move ConstEvaluatable to Clause
compiler-errors Jun 15, 2023
4343d36
Move some bounds computation out of astconv into its own file
compiler-errors Jun 16, 2023
876f00a
Rollup merge of #107200 - mina86:c, r=Amanieu
matthiaskrgr Jun 18, 2023
8d3d3cc
Rollup merge of #112667 - compiler-errors:wf-goal-is-clause, r=lcnr
matthiaskrgr Jun 18, 2023
eb40590
Rollup merge of #112685 - cuviper:wasm-dlmalloc, r=Mark-Simulacrum
matthiaskrgr Jun 18, 2023
a066e1b
Rollup merge of #112722 - DrMeepster:patch-2, r=clubby789
matthiaskrgr Jun 18, 2023
3436069
Rollup merge of #112734 - dswij:bounds-predicates-clause, r=compiler-…
matthiaskrgr Jun 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion compiler/rustc_borrowck/src/region_infer/opaque_types.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,8 @@ fn check_opaque_type_well_formed<'tcx>(
// Require the hidden type to be well-formed with only the generics of the opaque type.
// Defining use functions may have more bounds than the opaque type, which is ok, as long as the
// hidden type is well formed even without those bounds.
let predicate = ty::Binder::dummy(ty::PredicateKind::WellFormed(definition_ty.into()));
let predicate =
ty::Binder::dummy(ty::PredicateKind::Clause(ty::Clause::WellFormed(definition_ty.into())));
ocx.register_obligation(Obligation::misc(tcx, definition_span, def_id, param_env, predicate));

// Check that all obligations are satisfied by the implementation's
Expand Down
10 changes: 6 additions & 4 deletions compiler/rustc_borrowck/src/type_check/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1419,9 +1419,11 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {
//
// See #91068 for an example.
self.prove_predicates(
sig.inputs_and_output
.iter()
.map(|ty| ty::Binder::dummy(ty::PredicateKind::WellFormed(ty.into()))),
sig.inputs_and_output.iter().map(|ty| {
ty::Binder::dummy(ty::PredicateKind::Clause(ty::Clause::WellFormed(
ty.into(),
)))
}),
term_location.to_locations(),
ConstraintCategory::Boring,
);
Expand Down Expand Up @@ -1850,7 +1852,7 @@ impl<'a, 'tcx> TypeChecker<'a, 'tcx> {

let array_ty = rvalue.ty(body.local_decls(), tcx);
self.prove_predicate(
ty::PredicateKind::WellFormed(array_ty.into()),
ty::PredicateKind::Clause(ty::Clause::WellFormed(array_ty.into())),
Locations::Single(location),
ConstraintCategory::Boring,
);
Expand Down
Loading