Skip to content

Commit 1f72129

Browse files
committed
Auto merge of #107026 - Dylan-DPC:rollup-4fonvdc, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #103702 (Lift `T: Sized` bounds from some `strict_provenance` pointer methods) - #106441 (relax reference requirement on SocketAddrExt::from_abstract_name) - #106718 (finish trait solver skeleton work) - #106950 (Don't do pointer arithmetic on pointers to deallocated memory) - #107014 (rustdoc: remove deprecated / unused code from main.js) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 74c1ad5 + 43b1e73 commit 1f72129

File tree

24 files changed

+952
-706
lines changed

24 files changed

+952
-706
lines changed

Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -4783,6 +4783,7 @@ dependencies = [
47834783
"rustc_middle",
47844784
"rustc_parse_format",
47854785
"rustc_query_system",
4786+
"rustc_serialize",
47864787
"rustc_session",
47874788
"rustc_span",
47884789
"rustc_target",

compiler/rustc_middle/src/infer/canonical.rs

+6
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,12 @@ TrivialTypeTraversalAndLiftImpls! {
339339
}
340340

341341
impl<'tcx> CanonicalVarValues<'tcx> {
342+
/// Creates dummy var values which should not be used in a
343+
/// canonical response.
344+
pub fn dummy() -> CanonicalVarValues<'tcx> {
345+
CanonicalVarValues { var_values: Default::default() }
346+
}
347+
342348
#[inline]
343349
pub fn len(&self) -> usize {
344350
self.var_values.len()

compiler/rustc_middle/src/ty/sty.rs

-11
Original file line numberDiff line numberDiff line change
@@ -1113,17 +1113,6 @@ impl<'tcx, T> Binder<'tcx, T> {
11131113
if self.0.has_escaping_bound_vars() { None } else { Some(self.skip_binder()) }
11141114
}
11151115

1116-
pub fn no_bound_vars_ignoring_escaping(self, tcx: TyCtxt<'tcx>) -> Option<T>
1117-
where
1118-
T: TypeFoldable<'tcx>,
1119-
{
1120-
if !self.0.has_escaping_bound_vars() {
1121-
Some(self.skip_binder())
1122-
} else {
1123-
self.0.try_fold_with(&mut SkipBindersAt { index: ty::INNERMOST, tcx }).ok()
1124-
}
1125-
}
1126-
11271116
/// Splits the contents into two things that share the same binder
11281117
/// level as the original, returning two distinct binders.
11291118
///

compiler/rustc_trait_selection/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ rustc_infer = { path = "../rustc_infer" }
1919
rustc_lint_defs = { path = "../rustc_lint_defs" }
2020
rustc_macros = { path = "../rustc_macros" }
2121
rustc_query_system = { path = "../rustc_query_system" }
22+
rustc_serialize = { path = "../rustc_serialize" }
2223
rustc_session = { path = "../rustc_session" }
2324
rustc_span = { path = "../rustc_span" }
2425
rustc_target = { path = "../rustc_target" }

compiler/rustc_trait_selection/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#![feature(never_type)]
2222
#![feature(result_option_inspect)]
2323
#![feature(type_alias_impl_trait)]
24+
#![feature(min_specialization)]
2425
#![recursion_limit = "512"] // For rustdoc
2526

2627
#[macro_use]

0 commit comments

Comments
 (0)