diff options
| author | bors <bors@rust-lang.org> | 2023-06-18 10:02:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-18 10:02:56 +0000 |
| commit | 76fb0e38087cb8fcc6de5fe2ce347e939dfdb0bd (patch) | |
| tree | 275264ac3e2c5b1ebed184ca58def3c7b8e6a8e6 /src/tools | |
| parent | 0c2c243342ec2a2427f0624fac5ac59f0ee6fbcd (diff) | |
| parent | 3436069c3430b15bb10e660d0e66f599dccd068b (diff) | |
| download | rust-76fb0e38087cb8fcc6de5fe2ce347e939dfdb0bd.tar.gz rust-76fb0e38087cb8fcc6de5fe2ce347e939dfdb0bd.zip | |
Auto merge of #112755 - matthiaskrgr:rollup-e4bhbgn, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #107200 (io: soften ‘at most one write attempt’ requirement in io::Write::write) - #112667 (Move WF/ConstEvaluatable goal to clause) - #112685 (std: only depend on dlmalloc for wasm*-unknown) - #112722 (bootstrap: check for dry run when copying env vars for msvc) - #112734 (Make `Bound::predicates` use `Clause`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs b/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs index c0d2c835d63..860a489494c 100644 --- a/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs +++ b/src/tools/clippy/clippy_utils/src/qualify_min_const_fn.rs @@ -33,8 +33,8 @@ pub fn is_min_const_fn<'tcx>(tcx: TyCtxt<'tcx>, body: &Body<'tcx>, msrv: &Msrv) | ty::Clause::Trait(..) | ty::Clause::ConstArgHasType(..), ) - | ty::PredicateKind::WellFormed(_) - | ty::PredicateKind::ConstEvaluatable(..) + | ty::PredicateKind::Clause(ty::Clause::WellFormed(_)) + | ty::PredicateKind::Clause(ty::Clause::ConstEvaluatable(..)) | ty::PredicateKind::ConstEquate(..) | ty::PredicateKind::TypeWellFormedFromEnv(..) => continue, ty::PredicateKind::AliasRelate(..) => panic!("alias relate predicate on function: {predicate:#?}"), |