Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4c2bd19

Browse files
committedAug 30, 2024
Auto merge of rust-lang#129770 - workingjubilee:rollup-6dm8m8j, r=workingjubilee
Rollup of 10 pull requests Successful merges: - rust-lang#120221 (Don't make statement nonterminals match pattern nonterminals) - rust-lang#127897 (add `aarch64_unknown_nto_qnx700` target - QNX 7.0 support for aarch64le) - rust-lang#129123 (rustdoc-json: Add test for `Self` type) - rust-lang#129642 (Bump backtrace to 0.3.74~ish) - rust-lang#129675 (allow BufReader::peek to be called on unsized types) - rust-lang#129723 (Simplify some extern providers) - rust-lang#129724 (Remove `Option<!>` return types.) - rust-lang#129725 (Stop using `ty::GenericPredicates` for non-predicates_of queries) - rust-lang#129733 (Subtree update of `rust-analyzer`) - rust-lang#129754 (wasi: Fix sleeping for `Duration::MAX`) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 0d63418 + 2e53bb9 commit 4c2bd19

File tree

346 files changed

+9627
-3176
lines changed

Some content is hidden

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

346 files changed

+9627
-3176
lines changed
 

‎compiler/rustc_lint/src/multiple_supertrait_upcastable.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,7 @@ impl<'tcx> LateLintPass<'tcx> for MultipleSupertraitUpcastable {
4545
let direct_super_traits_iter = cx
4646
.tcx
4747
.explicit_super_predicates_of(def_id)
48-
.predicates
49-
.into_iter()
48+
.iter_identity_copied()
5049
.filter_map(|(pred, _)| pred.as_trait_clause());
5150
if direct_super_traits_iter.count() > 1 {
5251
cx.emit_span_lint(

‎compiler/rustc_metadata/src/rmeta/decoder.rs

-32
Original file line numberDiff line numberDiff line change
@@ -1070,34 +1070,6 @@ impl<'a> CrateMetadataRef<'a> {
10701070
)
10711071
}
10721072

1073-
fn get_explicit_item_bounds<'tcx>(
1074-
self,
1075-
index: DefIndex,
1076-
tcx: TyCtxt<'tcx>,
1077-
) -> ty::EarlyBinder<'tcx, &'tcx [(ty::Clause<'tcx>, Span)]> {
1078-
let lazy = self.root.tables.explicit_item_bounds.get(self, index);
1079-
let output = if lazy.is_default() {
1080-
&mut []
1081-
} else {
1082-
tcx.arena.alloc_from_iter(lazy.decode((self, tcx)))
1083-
};
1084-
ty::EarlyBinder::bind(&*output)
1085-
}
1086-
1087-
fn get_explicit_item_super_predicates<'tcx>(
1088-
self,
1089-
index: DefIndex,
1090-
tcx: TyCtxt<'tcx>,
1091-
) -> ty::EarlyBinder<'tcx, &'tcx [(ty::Clause<'tcx>, Span)]> {
1092-
let lazy = self.root.tables.explicit_item_super_predicates.get(self, index);
1093-
let output = if lazy.is_default() {
1094-
&mut []
1095-
} else {
1096-
tcx.arena.alloc_from_iter(lazy.decode((self, tcx)))
1097-
};
1098-
ty::EarlyBinder::bind(&*output)
1099-
}
1100-
11011073
fn get_variant(
11021074
self,
11031075
kind: DefKind,
@@ -1323,10 +1295,6 @@ impl<'a> CrateMetadataRef<'a> {
13231295
self.root.tables.optimized_mir.get(self, id).is_some()
13241296
}
13251297

1326-
fn cross_crate_inlinable(self, id: DefIndex) -> bool {
1327-
self.root.tables.cross_crate_inlinable.get(self, id)
1328-
}
1329-
13301298
fn get_fn_has_self_parameter(self, id: DefIndex, sess: &'a Session) -> bool {
13311299
self.root
13321300
.tables
There was a problem loading the remainder of the diff.

0 commit comments

Comments
 (0)
Failed to load comments.