Skip to content

Commit b923ea4

Browse files
borsbors
committed
Auto merge of #124849 - matthiaskrgr:rollup-68humsk, r=matthiaskrgr
Rollup of 5 pull requests Successful merges: - #124738 (rustdoc: dedup search form HTML) - #124827 (generalize hr alias: avoid unconstrainable infer vars) - #124832 (narrow down visibilities in `rustc_parse::lexer`) - #124842 (replace another Option<Span> by DUMMY_SP) - #124846 (Don't ICE when we cannot eval a const to a valtree in the new solver) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 0f40f14 + 067f632 commit b923ea4

File tree

20 files changed

+254
-73
lines changed

20 files changed

+254
-73
lines changed

‎compiler/rustc_const_eval/src/const_eval/error.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use rustc_middle::mir::AssertKind;
77
use rustc_middle::query::TyCtxtAt;
88
use rustc_middle::ty::TyCtxt;
99
use rustc_middle::ty::{layout::LayoutError, ConstInt};
10-
use rustc_span::{Span, Symbol, DUMMY_SP};
10+
use rustc_span::{Span, Symbol};
1111

1212
use super::CompileTimeInterpreter;
1313
use crate::errors::{self, FrameNote, ReportErrorExt};
@@ -121,7 +121,7 @@ where
121121
pub(super) fn report<'tcx, C, F, E>(
122122
tcx: TyCtxt<'tcx>,
123123
error: InterpError<'tcx>,
124-
span: Option<Span>,
124+
span: Span,
125125
get_span_and_frames: C,
126126
mk: F,
127127
) -> ErrorHandled
@@ -135,16 +135,16 @@ where
135135
// Don't emit a new diagnostic for these errors, they are already reported elsewhere or
136136
// should remain silent.
137137
err_inval!(Layout(LayoutError::Unknown(_))) | err_inval!(TooGeneric) => {
138-
ErrorHandled::TooGeneric(span.unwrap_or(DUMMY_SP))
138+
ErrorHandled::TooGeneric(span)
139139
}
140-
err_inval!(AlreadyReported(guar)) => ErrorHandled::Reported(guar, span.unwrap_or(DUMMY_SP)),
140+
err_inval!(AlreadyReported(guar)) => ErrorHandled::Reported(guar, span),
141141
err_inval!(Layout(LayoutError::ReferencesError(guar))) => {
142-
ErrorHandled::Reported(guar.into(), span.unwrap_or(DUMMY_SP))
142+
ErrorHandled::Reported(guar.into(), span)
143143
}
144144
// Report remaining errors.
145145
_ => {
146146
let (our_span, frames) = get_span_and_frames();
147-
let span = span.unwrap_or(our_span);
147+
let span = span.substitute_dummy(our_span);
148148
let err = mk(span, frames);
149149
let mut err = tcx.dcx().create_err(err);
150150

‎compiler/rustc_const_eval/src/const_eval/eval_queries.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use rustc_middle::ty::print::with_no_trimmed_paths;
1212
use rustc_middle::ty::{self, Ty, TyCtxt};
1313
use rustc_session::lint;
1414
use rustc_span::def_id::LocalDefId;
15-
use rustc_span::Span;
15+
use rustc_span::{Span, DUMMY_SP};
1616
use rustc_target::abi::{self, Abi};
1717

1818
use super::{CanAccessMutGlobal, CompileTimeEvalContext, CompileTimeInterpreter};
@@ -298,7 +298,7 @@ pub fn eval_to_const_value_raw_provider<'tcx>(
298298
super::report(
299299
tcx,
300300
error.into_kind(),
301-
Some(span),
301+
span,
302302
|| (span, vec![]),
303303
|span, _| errors::NullaryIntrinsicError { span },
304304
)
@@ -406,7 +406,7 @@ fn eval_in_interpreter<'tcx, R: InterpretationResult<'tcx>>(
406406
super::report(
407407
*ecx.tcx,
408408
error,
409-
None,
409+
DUMMY_SP,
410410
|| super::get_span_and_frames(ecx.tcx, ecx.stack()),
411411
|span, frames| ConstEvalError { span, error_kind: kind, instance, frame_notes: frames },
412412
)
@@ -461,7 +461,7 @@ fn report_validation_error<'mir, 'tcx>(
461461
crate::const_eval::report(
462462
*ecx.tcx,
463463
error,
464-
None,
464+
DUMMY_SP,
465465
|| crate::const_eval::get_span_and_frames(ecx.tcx, ecx.stack()),
466466
move |span, frames| errors::ValidationFailure { span, ub_note, frames, raw_bytes },
467467
)

‎compiler/rustc_hir_typeck/src/closure.rs

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ struct ExpectedSig<'tcx> {
3131
sig: ty::PolyFnSig<'tcx>,
3232
}
3333

34+
#[derive(Debug)]
3435
struct ClosureSignatures<'tcx> {
3536
/// The signature users of the closure see.
3637
bound_sig: ty::PolyFnSig<'tcx>,
@@ -713,25 +714,16 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
713714
// [c2]: https://github.com/rust-lang/rust/pull/45072#issuecomment-341096796
714715
self.commit_if_ok(|_| {
715716
let mut all_obligations = vec![];
716-
let inputs: Vec<_> = iter::zip(
717-
decl.inputs,
718-
supplied_sig.inputs().skip_binder(), // binder moved to (*) below
719-
)
720-
.map(|(hir_ty, &supplied_ty)| {
721-
// Instantiate (this part of..) S to S', i.e., with fresh variables.
722-
self.instantiate_binder_with_fresh_vars(
723-
hir_ty.span,
724-
BoundRegionConversionTime::FnCall,
725-
// (*) binder moved to here
726-
supplied_sig.inputs().rebind(supplied_ty),
727-
)
728-
})
729-
.collect();
717+
let supplied_sig = self.instantiate_binder_with_fresh_vars(
718+
self.tcx.def_span(expr_def_id),
719+
BoundRegionConversionTime::FnCall,
720+
supplied_sig,
721+
);
730722

731723
// The liberated version of this signature should be a subtype
732724
// of the liberated form of the expectation.
733725
for ((hir_ty, &supplied_ty), expected_ty) in iter::zip(
734-
iter::zip(decl.inputs, &inputs),
726+
iter::zip(decl.inputs, supplied_sig.inputs()),
735727
expected_sigs.liberated_sig.inputs(), // `liberated_sig` is E'.
736728
) {
737729
// Check that E' = S'.
@@ -744,11 +736,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
744736
all_obligations.extend(obligations);
745737
}
746738

747-
let supplied_output_ty = self.instantiate_binder_with_fresh_vars(
748-
decl.output.span(),
749-
BoundRegionConversionTime::FnCall,
750-
supplied_sig.output(),
751-
);
739+
let supplied_output_ty = supplied_sig.output();
752740
let cause = &self.misc(decl.output.span());
753741
let InferOk { value: (), obligations } = self.at(cause, self.param_env).eq(
754742
DefineOpaqueTypes::Yes,
@@ -757,7 +745,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
757745
)?;
758746
all_obligations.extend(obligations);
759747

760-
let inputs = inputs.into_iter().map(|ty| self.resolve_vars_if_possible(ty));
748+
let inputs =
749+
supplied_sig.inputs().into_iter().map(|&ty| self.resolve_vars_if_possible(ty));
761750

762751
expected_sigs.liberated_sig = self.tcx.mk_fn_sig(
763752
inputs,
@@ -1013,6 +1002,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
10131002
result
10141003
}
10151004

1005+
#[instrument(level = "debug", skip(self), ret)]
10161006
fn closure_sigs(
10171007
&self,
10181008
expr_def_id: LocalDefId,

‎compiler/rustc_infer/src/infer/relate/generalize.rs

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,13 @@ impl<'tcx> Generalizer<'_, 'tcx> {
350350
&mut self,
351351
alias: ty::AliasTy<'tcx>,
352352
) -> Result<Ty<'tcx>, TypeError<'tcx>> {
353-
if self.infcx.next_trait_solver() && !alias.has_escaping_bound_vars() {
353+
// We do not eagerly replace aliases with inference variables if they have
354+
// escaping bound vars, see the method comment for details. However, when we
355+
// are inside of an alias with escaping bound vars replacing nested aliases
356+
// with inference variables can cause incorrect ambiguity.
357+
//
358+
// cc trait-system-refactor-initiative#110
359+
if self.infcx.next_trait_solver() && !alias.has_escaping_bound_vars() && !self.in_alias {
354360
return Ok(self.infcx.next_ty_var_in_universe(
355361
TypeVariableOrigin { param_def_id: None, span: self.span },
356362
self.for_universe,
@@ -492,9 +498,30 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
492498
let origin = inner.type_variables().var_origin(vid);
493499
let new_var_id =
494500
inner.type_variables().new_var(self.for_universe, origin);
495-
let u = Ty::new_var(self.tcx(), new_var_id);
496-
debug!("replacing original vid={:?} with new={:?}", vid, u);
497-
Ok(u)
501+
// If we're in the new solver and create a new inference
502+
// variable inside of an alias we eagerly constrain that
503+
// inference variable to prevent unexpected ambiguity errors.
504+
//
505+
// This is incomplete as it pulls down the universe of the
506+
// original inference variable, even though the alias could
507+
// normalize to a type which does not refer to that type at
508+
// all. I don't expect this to cause unexpected errors in
509+
// practice.
510+
//
511+
// We only need to do so for type and const variables, as
512+
// region variables do not impact normalization, and will get
513+
// correctly constrained by `AliasRelate` later on.
514+
//
515+
// cc trait-system-refactor-initiative#108
516+
if self.infcx.next_trait_solver()
517+
&& !self.infcx.intercrate
518+
&& self.in_alias
519+
{
520+
inner.type_variables().equate(vid, new_var_id);
521+
}
522+
523+
debug!("replacing original vid={:?} with new={:?}", vid, new_var_id);
524+
Ok(Ty::new_var(self.tcx(), new_var_id))
498525
}
499526
}
500527
}
@@ -614,6 +641,15 @@ impl<'tcx> TypeRelation<'tcx> for Generalizer<'_, 'tcx> {
614641
universe: self.for_universe,
615642
})
616643
.vid;
644+
645+
// See the comment for type inference variables
646+
// for more details.
647+
if self.infcx.next_trait_solver()
648+
&& !self.infcx.intercrate
649+
&& self.in_alias
650+
{
651+
variable_table.union(vid, new_var_id);
652+
}
617653
Ok(ty::Const::new_var(self.tcx(), new_var_id, c.ty()))
618654
}
619655
}

‎compiler/rustc_parse/src/lexer/diagnostics.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use rustc_span::source_map::SourceMap;
55
use rustc_span::Span;
66

77
#[derive(Default)]
8-
pub struct TokenTreeDiagInfo {
8+
pub(super) struct TokenTreeDiagInfo {
99
/// Stack of open delimiters and their spans. Used for error message.
1010
pub open_braces: Vec<(Delimiter, Span)>,
1111
pub unmatched_delims: Vec<UnmatchedDelim>,
@@ -21,7 +21,7 @@ pub struct TokenTreeDiagInfo {
2121
pub matching_block_spans: Vec<(Span, Span)>,
2222
}
2323

24-
pub fn same_indentation_level(sm: &SourceMap, open_sp: Span, close_sp: Span) -> bool {
24+
pub(super) fn same_indentation_level(sm: &SourceMap, open_sp: Span, close_sp: Span) -> bool {
2525
match (sm.span_to_margin(open_sp), sm.span_to_margin(close_sp)) {
2626
(Some(open_padding), Some(close_padding)) => open_padding == close_padding,
2727
_ => false,
@@ -30,7 +30,7 @@ pub fn same_indentation_level(sm: &SourceMap, open_sp: Span, close_sp: Span) ->
3030

3131
// When we get a `)` or `]` for `{`, we should emit help message here
3232
// it's more friendly compared to report `unmatched error` in later phase
33-
pub fn report_missing_open_delim(err: &mut Diag<'_>, unmatched_delims: &[UnmatchedDelim]) -> bool {
33+
fn report_missing_open_delim(err: &mut Diag<'_>, unmatched_delims: &[UnmatchedDelim]) -> bool {
3434
let mut reported_missing_open = false;
3535
for unmatch_brace in unmatched_delims.iter() {
3636
if let Some(delim) = unmatch_brace.found_delim
@@ -51,7 +51,7 @@ pub fn report_missing_open_delim(err: &mut Diag<'_>, unmatched_delims: &[Unmatch
5151
reported_missing_open
5252
}
5353

54-
pub fn report_suspicious_mismatch_block(
54+
pub(super) fn report_suspicious_mismatch_block(
5555
err: &mut Diag<'_>,
5656
diag_info: &TokenTreeDiagInfo,
5757
sm: &SourceMap,

‎compiler/rustc_parse/src/lexer/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ struct StringReader<'psess, 'src> {
112112
}
113113

114114
impl<'psess, 'src> StringReader<'psess, 'src> {
115-
pub fn dcx(&self) -> &'psess DiagCtxt {
115+
fn dcx(&self) -> &'psess DiagCtxt {
116116
&self.psess.dcx
117117
}
118118

‎compiler/rustc_parse/src/lexer/unicode_chars.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use crate::{
99
use rustc_span::{symbol::kw, BytePos, Pos, Span};
1010

1111
#[rustfmt::skip] // for line breaks
12-
pub(crate) const UNICODE_ARRAY: &[(char, &str, &str)] = &[
12+
pub(super) const UNICODE_ARRAY: &[(char, &str, &str)] = &[
1313
('
', "Line Separator", " "),
1414
('
', "Paragraph Separator", " "),
1515
(' ', "Ogham Space mark", " "),

‎compiler/rustc_trait_selection/src/solve/eval_ctxt/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,12 +1052,12 @@ impl<'tcx> EvalCtxt<'_, 'tcx> {
10521052
ty: Ty<'tcx>,
10531053
) -> Option<ty::Const<'tcx>> {
10541054
use rustc_middle::mir::interpret::ErrorHandled;
1055-
match self.infcx.try_const_eval_resolve(param_env, unevaluated, ty, DUMMY_SP) {
1056-
Ok(ct) => Some(ct),
1055+
match self.infcx.const_eval_resolve(param_env, unevaluated, DUMMY_SP) {
1056+
Ok(Some(val)) => Some(ty::Const::new_value(self.tcx(), val, ty)),
1057+
Ok(None) | Err(ErrorHandled::TooGeneric(_)) => None,
10571058
Err(ErrorHandled::Reported(e, _)) => {
10581059
Some(ty::Const::new_error(self.tcx(), e.into(), ty))
10591060
}
1060-
Err(ErrorHandled::TooGeneric(_)) => None,
10611061
}
10621062
}
10631063

‎compiler/rustc_trait_selection/src/solve/inspect/build.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,10 @@ impl<'tcx> ProofTreeBuilder<'tcx> {
376376
(
377377
DebugSolver::GoalEvaluation(goal_evaluation),
378378
DebugSolver::CanonicalGoalEvaluation(canonical_goal_evaluation),
379-
) => goal_evaluation.evaluation = Some(canonical_goal_evaluation),
379+
) => {
380+
let prev = goal_evaluation.evaluation.replace(canonical_goal_evaluation);
381+
assert_eq!(prev, None);
382+
}
380383
_ => unreachable!(),
381384
}
382385
}

‎src/librustdoc/html/static/js/storage.js

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,3 +239,46 @@ window.addEventListener("pageshow", ev => {
239239
setTimeout(updateSidebarWidth, 0);
240240
}
241241
});
242+
243+
// Custom elements are used to insert some JS-dependent features into Rustdoc,
244+
// because the [parser] runs the connected callback
245+
// synchronously. It needs to be added synchronously so that nothing below it
246+
// becomes visible until after it's done. Otherwise, you get layout jank.
247+
//
248+
// That's also why this is in storage.js and not main.js.
249+
//
250+
// [parser]: https://html.spec.whatwg.org/multipage/parsing.html
251+
class RustdocSearchElement extends HTMLElement {
252+
constructor() {
253+
super();
254+
}
255+
connectedCallback() {
256+
const rootPath = getVar("root-path");
257+
const currentCrate = getVar("current-crate");
258+
this.innerHTML = `<nav class="sub">
259+
<form class="search-form">
260+
<span></span> <!-- This empty span is a hacky fix for Safari - See #93184 -->
261+
<div id="sidebar-button" tabindex="-1">
262+
<a href="${rootPath}${currentCrate}/all.html" title="show sidebar"></a>
263+
</div>
264+
<input
265+
class="search-input"
266+
name="search"
267+
aria-label="Run search in the documentation"
268+
autocomplete="off"
269+
spellcheck="false"
270+
placeholder="Type ‘S’ or ‘/’ to search, ‘?’ for more options…"
271+
type="search">
272+
<div id="help-button" tabindex="-1">
273+
<a href="${rootPath}help.html" title="help">?</a>
274+
</div>
275+
<div id="settings-menu" tabindex="-1">
276+
<a href="${rootPath}settings.html" title="settings">
277+
Settings
278+
</a>
279+
</div>
280+
</form>
281+
</nav>`;
282+
}
283+
}
284+
window.customElements.define("rustdoc-search", RustdocSearchElement);

‎src/librustdoc/html/templates/page.html

Lines changed: 3 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -117,30 +117,9 @@ <h2>Files</h2> {# #}
117117
<div class="sidebar-resizer"></div> {# #}
118118
<main> {# #}
119119
{% if page.css_class != "src" %}<div class="width-limiter">{% endif %}
120-
<nav class="sub"> {# #}
121-
<form class="search-form"> {# #}
122-
<span></span> {# This empty span is a hacky fix for Safari - See #93184 #}
123-
<div id="sidebar-button" tabindex="-1"> {# #}
124-
<a href="{{page.root_path|safe}}{{layout.krate|safe}}/all.html" title="show sidebar"></a> {# #}
125-
</div> {# #}
126-
<input {#+ #}
127-
class="search-input" {#+ #}
128-
name="search" {#+ #}
129-
aria-label="Run search in the documentation" {#+ #}
130-
autocomplete="off" {#+ #}
131-
spellcheck="false" {#+ #}
132-
placeholder="Type ‘S’ or ‘/’ to search, ‘?’ for more options…" {#+ #}
133-
type="search"> {# #}
134-
<div id="help-button" tabindex="-1"> {# #}
135-
<a href="{{page.root_path|safe}}help.html" title="help">?</a> {# #}
136-
</div> {# #}
137-
<div id="settings-menu" tabindex="-1"> {# #}
138-
<a href="{{page.root_path|safe}}settings.html" title="settings"> {# #}
139-
Settings {# #}
140-
</a> {# #}
141-
</div> {# #}
142-
</form> {# #}
143-
</nav> {# #}
120+
{# defined in storage.js to avoid duplicating complex UI across every page #}
121+
{# and because the search form only works if JS is enabled anyway #}
122+
<rustdoc-search></rustdoc-search> {# #}
144123
<section id="main-content" class="content">{{ content|safe }}</section> {# #}
145124
{% if page.css_class != "src" %}</div>{% endif %}
146125
</main> {# #}

‎src/tools/html-checker/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ fn check_html_file(file: &Path) -> usize {
2929
.arg("-quiet")
3030
.arg("--mute-id") // this option is useful in case we want to mute more warnings
3131
.arg("yes")
32+
.arg("--new-blocklevel-tags")
33+
.arg("rustdoc-search") // custom elements
3234
.arg("--mute")
3335
.arg(&to_mute_s)
3436
.arg(file);

‎tests/rustdoc-gui/javascript-disabled.goml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ javascript: false
44

55
go-to: "file://" + |DOC_PATH| + "/test_docs/struct.Foo.html"
66
show-text: true
7-
assert-css: (".sub", {"display": "none"})
7+
assert-false: ".sub"
88

99
// Even though JS is disabled, we should still have themes applied. Links are never black-colored
1010
// if styles are applied so we check that they are not.

0 commit comments

Comments
 (0)