Skip to content

Commit 52e3cf1

Browse files
committed
Auto merge of #79306 - GuillaumeGomez:rollup-4cnudfj, r=GuillaumeGomez
Rollup of 4 pull requests Successful merges: - #78670 (Remove FIXME comment in some incremental test suite) - #79292 (Fix typo in doc comment for report_too_many_hashes) - #79300 (Prevent feature information to be hidden if it's on the impl directly) - #79302 (Add regression test for issue 73899) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 828461b + 749fe40 commit 52e3cf1

File tree

9 files changed

+36
-9
lines changed

9 files changed

+36
-9
lines changed

Diff for: compiler/rustc_parse/src/lexer/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ impl<'a> StringReader<'a> {
510510
FatalError.raise()
511511
}
512512

513-
/// Note: It was decided to not add a test case, because it would be to big.
513+
/// Note: It was decided to not add a test case, because it would be too big.
514514
/// <https://github.com/rust-lang/rust/pull/50296#issuecomment-392135180>
515515
fn report_too_many_hashes(&self, start: BytePos, found: usize) -> ! {
516516
self.fatal_span_(

Diff for: src/librustdoc/html/static/main.js

+8-2
Original file line numberDiff line numberDiff line change
@@ -2332,12 +2332,18 @@ function defocusSearchBar() {
23322332
var dontApplyBlockRule = toggle.parentNode.parentNode.id !== "main";
23332333
if (action === "show") {
23342334
removeClass(relatedDoc, "fns-now-collapsed");
2335-
removeClass(docblock, "hidden-by-usual-hider");
2335+
// Stability information is never hidden.
2336+
if (hasClass(docblock, "stability") === false) {
2337+
removeClass(docblock, "hidden-by-usual-hider");
2338+
}
23362339
onEachLazy(toggle.childNodes, adjustToggle(false, dontApplyBlockRule));
23372340
onEachLazy(relatedDoc.childNodes, implHider(false, dontApplyBlockRule));
23382341
} else if (action === "hide") {
23392342
addClass(relatedDoc, "fns-now-collapsed");
2340-
addClass(docblock, "hidden-by-usual-hider");
2343+
// Stability information should be shown even when detailed info is hidden.
2344+
if (hasClass(docblock, "stability") === false) {
2345+
addClass(docblock, "hidden-by-usual-hider");
2346+
}
23412347
onEachLazy(toggle.childNodes, adjustToggle(true, dontApplyBlockRule));
23422348
onEachLazy(relatedDoc.childNodes, implHider(true, dontApplyBlockRule));
23432349
}

Diff for: src/test/incremental/add_private_fn_at_krate_root_cc/struct_point.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// revisions:cfail1 cfail2
66
// compile-flags: -Z query-dep-graph
77
// aux-build:point.rs
8-
// build-pass (FIXME(62277): could be check-pass?)
8+
// build-pass
99

1010
#![feature(rustc_attrs)]
1111
#![feature(stmt_expr_attributes)]

Diff for: src/test/incremental/change_add_field/struct_point.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// revisions:cfail1 cfail2
77
// compile-flags: -Z query-dep-graph
8-
// build-pass (FIXME(62277): could be check-pass?)
8+
// build-pass
99

1010
#![feature(rustc_attrs)]
1111
#![feature(stmt_expr_attributes)]

Diff for: src/test/incremental/change_private_impl_method/struct_point.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
// revisions:cfail1 cfail2
55
// compile-flags: -Z query-dep-graph
6-
// build-pass (FIXME(62277): could be check-pass?)
6+
// build-pass
77

88
#![feature(rustc_attrs)]
99
#![feature(stmt_expr_attributes)]

Diff for: src/test/incremental/change_pub_inherent_method_body/struct_point.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// revisions:cfail1 cfail2
44
// compile-flags: -Z query-dep-graph
5-
// build-pass (FIXME(62277): could be check-pass?)
5+
// build-pass
66

77
#![crate_type = "rlib"]
88
#![feature(rustc_attrs)]

Diff for: src/test/incremental/change_pub_inherent_method_sig/struct_point.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
// revisions:cfail1 cfail2
44
// compile-flags: -Z query-dep-graph
5-
// build-pass (FIXME(62277): could be check-pass?)
5+
// build-pass
66

77
#![crate_type = "rlib"]
88
#![feature(rustc_attrs)]

Diff for: src/test/incremental/issue-49595/issue-49595.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// revisions:cfail1 cfail2 cfail3
22
// compile-flags: -Z query-dep-graph --test
3-
// build-pass (FIXME(62277): could be check-pass?)
3+
// build-pass
44

55
#![feature(rustc_attrs)]
66
#![crate_type = "rlib"]

Diff for: src/test/ui/issues/issue-73899.rs

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
// run-pass
2+
#![feature(const_evaluatable_checked)]
3+
#![feature(const_generics)]
4+
#![allow(incomplete_features)]
5+
6+
trait Foo {}
7+
8+
impl<const N: usize> Foo for [(); N] where Self: FooImpl<{ N == 0 }> {}
9+
10+
trait FooImpl<const IS_ZERO: bool> {}
11+
12+
impl FooImpl<{ 0u8 == 0u8 }> for [(); 0] {}
13+
14+
impl<const N: usize> FooImpl<{ 0u8 != 0u8 }> for [(); N] {}
15+
16+
fn foo<T: Foo>(_v: T) {}
17+
18+
fn main() {
19+
foo([]);
20+
foo([()]);
21+
}

0 commit comments

Comments
 (0)