mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-22 14:55:26 +00:00
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
This commit is contained in:
commit
52e3cf13aa
@ -510,7 +510,7 @@ impl<'a> StringReader<'a> {
|
||||
FatalError.raise()
|
||||
}
|
||||
|
||||
/// Note: It was decided to not add a test case, because it would be to big.
|
||||
/// Note: It was decided to not add a test case, because it would be too big.
|
||||
/// <https://github.com/rust-lang/rust/pull/50296#issuecomment-392135180>
|
||||
fn report_too_many_hashes(&self, start: BytePos, found: usize) -> ! {
|
||||
self.fatal_span_(
|
||||
|
@ -2332,12 +2332,18 @@ function defocusSearchBar() {
|
||||
var dontApplyBlockRule = toggle.parentNode.parentNode.id !== "main";
|
||||
if (action === "show") {
|
||||
removeClass(relatedDoc, "fns-now-collapsed");
|
||||
// Stability information is never hidden.
|
||||
if (hasClass(docblock, "stability") === false) {
|
||||
removeClass(docblock, "hidden-by-usual-hider");
|
||||
}
|
||||
onEachLazy(toggle.childNodes, adjustToggle(false, dontApplyBlockRule));
|
||||
onEachLazy(relatedDoc.childNodes, implHider(false, dontApplyBlockRule));
|
||||
} else if (action === "hide") {
|
||||
addClass(relatedDoc, "fns-now-collapsed");
|
||||
// Stability information should be shown even when detailed info is hidden.
|
||||
if (hasClass(docblock, "stability") === false) {
|
||||
addClass(docblock, "hidden-by-usual-hider");
|
||||
}
|
||||
onEachLazy(toggle.childNodes, adjustToggle(true, dontApplyBlockRule));
|
||||
onEachLazy(relatedDoc.childNodes, implHider(true, dontApplyBlockRule));
|
||||
}
|
||||
|
@ -5,7 +5,7 @@
|
||||
// revisions:cfail1 cfail2
|
||||
// compile-flags: -Z query-dep-graph
|
||||
// aux-build:point.rs
|
||||
// build-pass (FIXME(62277): could be check-pass?)
|
||||
// build-pass
|
||||
|
||||
#![feature(rustc_attrs)]
|
||||
#![feature(stmt_expr_attributes)]
|
||||
|
@ -5,7 +5,7 @@
|
||||
|
||||
// revisions:cfail1 cfail2
|
||||
// compile-flags: -Z query-dep-graph
|
||||
// build-pass (FIXME(62277): could be check-pass?)
|
||||
// build-pass
|
||||
|
||||
#![feature(rustc_attrs)]
|
||||
#![feature(stmt_expr_attributes)]
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
// revisions:cfail1 cfail2
|
||||
// compile-flags: -Z query-dep-graph
|
||||
// build-pass (FIXME(62277): could be check-pass?)
|
||||
// build-pass
|
||||
|
||||
#![feature(rustc_attrs)]
|
||||
#![feature(stmt_expr_attributes)]
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
// revisions:cfail1 cfail2
|
||||
// compile-flags: -Z query-dep-graph
|
||||
// build-pass (FIXME(62277): could be check-pass?)
|
||||
// build-pass
|
||||
|
||||
#![crate_type = "rlib"]
|
||||
#![feature(rustc_attrs)]
|
||||
|
@ -2,7 +2,7 @@
|
||||
|
||||
// revisions:cfail1 cfail2
|
||||
// compile-flags: -Z query-dep-graph
|
||||
// build-pass (FIXME(62277): could be check-pass?)
|
||||
// build-pass
|
||||
|
||||
#![crate_type = "rlib"]
|
||||
#![feature(rustc_attrs)]
|
||||
|
@ -1,6 +1,6 @@
|
||||
// revisions:cfail1 cfail2 cfail3
|
||||
// compile-flags: -Z query-dep-graph --test
|
||||
// build-pass (FIXME(62277): could be check-pass?)
|
||||
// build-pass
|
||||
|
||||
#![feature(rustc_attrs)]
|
||||
#![crate_type = "rlib"]
|
||||
|
21
src/test/ui/issues/issue-73899.rs
Normal file
21
src/test/ui/issues/issue-73899.rs
Normal file
@ -0,0 +1,21 @@
|
||||
// run-pass
|
||||
#![feature(const_evaluatable_checked)]
|
||||
#![feature(const_generics)]
|
||||
#![allow(incomplete_features)]
|
||||
|
||||
trait Foo {}
|
||||
|
||||
impl<const N: usize> Foo for [(); N] where Self: FooImpl<{ N == 0 }> {}
|
||||
|
||||
trait FooImpl<const IS_ZERO: bool> {}
|
||||
|
||||
impl FooImpl<{ 0u8 == 0u8 }> for [(); 0] {}
|
||||
|
||||
impl<const N: usize> FooImpl<{ 0u8 != 0u8 }> for [(); N] {}
|
||||
|
||||
fn foo<T: Foo>(_v: T) {}
|
||||
|
||||
fn main() {
|
||||
foo([]);
|
||||
foo([()]);
|
||||
}
|
Loading…
Reference in New Issue
Block a user