Skip to content

UI tests: remove redundant colons in line annotations #139448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions tests/incremental/const-generics/hash-tyvid-regression-1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,9 @@ where
{
use std::convert::TryFrom;
<[T; N.get()]>::try_from(())
//~^ error: the trait bound
//~| error: the trait bound
//~| error: mismatched types
//~^ error the trait bound
//~| error the trait bound
//~| error mismatched types
}

fn main() {}
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ where
{
fn eq(&self, other: &&'a [A]) -> bool {
self.0 == other
//~^ error: can't compare
//~^ error can't compare
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ where
fn new() -> Self {
let mut node = Node::new();
node.keys.some_function();
//~^ error: no method named
//~^ error no method named
node
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ where
fn split(&mut self, i: usize, k: K, right: bool) -> Node<K, D> {
let mut node = Node::new();
node.keys.push(k);
//~^ error: no method named
//~^ error no method named
node
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ where
C: Delegates<FileCap<{ false }>>,
{
writes_to_specific_path(&cap);
//~^ error: the trait bound
//~^ error the trait bound
}

fn writes_to_specific_path<C>(cap: &C)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ where
[(); { S * 2 }]: Default;

impl<'a, T, const S: usize> Iterator for BufferIter<'a, T, S> {
//~^ error: the trait bound
//~^^ error: unconstrained generic constant
//~^ error the trait bound
//~^^ error unconstrained generic constant
type Item = &'a T;

fn next(&mut self) -> Option<Self::Item> {
//~^ error: the trait bound
//~^^ error: unconstrained generic constant
//~^ error the trait bound
//~^^ error unconstrained generic constant
None
}
}
Expand Down
2 changes: 1 addition & 1 deletion tests/incremental/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ fn main() {
}

extern "unadjusted" fn foo() {}
//[cfail2]~^ ERROR: "unadjusted" ABI is an implementation detail and perma-unstable
//[cfail2]~^ ERROR "unadjusted" ABI is an implementation detail and perma-unstable
92 changes: 46 additions & 46 deletions tests/rustdoc-ui/disambiguator-endswith-named-suffix.rs
Original file line number Diff line number Diff line change
@@ -1,107 +1,107 @@
//@ check-pass
//@ normalize-stderr: "nightly|beta|1\.[0-9][0-9]\.[0-9]" -> "$$CHANNEL"

//! [struct@m!()] //~ WARN: unmatched disambiguator `struct` and suffix `!()`
//! [struct@m!()] //~ WARN unmatched disambiguator `struct` and suffix `!()`
//! [struct@m!{}]
//! [struct@m![]]
//! [struct@f()] //~ WARN: unmatched disambiguator `struct` and suffix `()`
//! [struct@m!] //~ WARN: unmatched disambiguator `struct` and suffix `!`
//! [struct@f()] //~ WARN unmatched disambiguator `struct` and suffix `()`
//! [struct@m!] //~ WARN unmatched disambiguator `struct` and suffix `!`
//!
//! [enum@m!()] //~ WARN: unmatched disambiguator `enum` and suffix `!()`
//! [enum@m!()] //~ WARN unmatched disambiguator `enum` and suffix `!()`
//! [enum@m!{}]
//! [enum@m![]]
//! [enum@f()] //~ WARN: unmatched disambiguator `enum` and suffix `()`
//! [enum@m!] //~ WARN: unmatched disambiguator `enum` and suffix `!`
//! [enum@f()] //~ WARN unmatched disambiguator `enum` and suffix `()`
//! [enum@m!] //~ WARN unmatched disambiguator `enum` and suffix `!`
//!
//! [trait@m!()] //~ WARN: unmatched disambiguator `trait` and suffix `!()`
//! [trait@m!()] //~ WARN unmatched disambiguator `trait` and suffix `!()`
//! [trait@m!{}]
//! [trait@m![]]
//! [trait@f()] //~ WARN: unmatched disambiguator `trait` and suffix `()`
//! [trait@m!] //~ WARN: unmatched disambiguator `trait` and suffix `!`
//! [trait@f()] //~ WARN unmatched disambiguator `trait` and suffix `()`
//! [trait@m!] //~ WARN unmatched disambiguator `trait` and suffix `!`
//!
//! [module@m!()] //~ WARN: unmatched disambiguator `module` and suffix `!()`
//! [module@m!()] //~ WARN unmatched disambiguator `module` and suffix `!()`
//! [module@m!{}]
//! [module@m![]]
//! [module@f()] //~ WARN: unmatched disambiguator `module` and suffix `()`
//! [module@m!] //~ WARN: unmatched disambiguator `module` and suffix `!`
//! [module@f()] //~ WARN unmatched disambiguator `module` and suffix `()`
//! [module@m!] //~ WARN unmatched disambiguator `module` and suffix `!`
//!
//! [mod@m!()] //~ WARN: unmatched disambiguator `mod` and suffix `!()`
//! [mod@m!()] //~ WARN unmatched disambiguator `mod` and suffix `!()`
//! [mod@m!{}]
//! [mod@m![]]
//! [mod@f()] //~ WARN: unmatched disambiguator `mod` and suffix `()`
//! [mod@m!] //~ WARN: unmatched disambiguator `mod` and suffix `!`
//! [mod@f()] //~ WARN unmatched disambiguator `mod` and suffix `()`
//! [mod@m!] //~ WARN unmatched disambiguator `mod` and suffix `!`
//!
//! [const@m!()] //~ WARN: unmatched disambiguator `const` and suffix `!()`
//! [const@m!()] //~ WARN unmatched disambiguator `const` and suffix `!()`
//! [const@m!{}]
//! [const@m![]]
//! [const@f()] //~ WARN: incompatible link kind for `f`
//! [const@m!] //~ WARN: unmatched disambiguator `const` and suffix `!`
//! [const@f()] //~ WARN incompatible link kind for `f`
//! [const@m!] //~ WARN unmatched disambiguator `const` and suffix `!`
//!
//! [constant@m!()] //~ WARN: unmatched disambiguator `constant` and suffix `!()`
//! [constant@m!()] //~ WARN unmatched disambiguator `constant` and suffix `!()`
//! [constant@m!{}]
//! [constant@m![]]
//! [constant@f()] //~ WARN: incompatible link kind for `f`
//! [constant@m!] //~ WARN: unmatched disambiguator `constant` and suffix `!`
//! [constant@f()] //~ WARN incompatible link kind for `f`
//! [constant@m!] //~ WARN unmatched disambiguator `constant` and suffix `!`
//!
//! [static@m!()] //~ WARN: unmatched disambiguator `static` and suffix `!()`
//! [static@m!()] //~ WARN unmatched disambiguator `static` and suffix `!()`
//! [static@m!{}]
//! [static@m![]]
//! [static@f()] //~ WARN: incompatible link kind for `f`
//! [static@m!] //~ WARN: unmatched disambiguator `static` and suffix `!`
//! [static@f()] //~ WARN incompatible link kind for `f`
//! [static@m!] //~ WARN unmatched disambiguator `static` and suffix `!`
//!
//! [function@m!()] //~ WARN: unmatched disambiguator `function` and suffix `!()`
//! [function@m!()] //~ WARN unmatched disambiguator `function` and suffix `!()`
//! [function@m!{}]
//! [function@m![]]
//! [function@f()]
//! [function@m!] //~ WARN: unmatched disambiguator `function` and suffix `!`
//! [function@m!] //~ WARN unmatched disambiguator `function` and suffix `!`
//!
//! [fn@m!()] //~ WARN: unmatched disambiguator `fn` and suffix `!()`
//! [fn@m!()] //~ WARN unmatched disambiguator `fn` and suffix `!()`
//! [fn@m!{}]
//! [fn@m![]]
//! [fn@f()]
//! [fn@m!] //~ WARN: unmatched disambiguator `fn` and suffix `!`
//! [fn@m!] //~ WARN unmatched disambiguator `fn` and suffix `!`
//!
//! [method@m!()] //~ WARN: unmatched disambiguator `method` and suffix `!()`
//! [method@m!()] //~ WARN unmatched disambiguator `method` and suffix `!()`
//! [method@m!{}]
//! [method@m![]]
//! [method@f()]
//! [method@m!] //~ WARN: unmatched disambiguator `method` and suffix `!`
//! [method@m!] //~ WARN unmatched disambiguator `method` and suffix `!`
//!
//! [derive@m!()] //~ WARN: incompatible link kind for `m`
//! [derive@m!{}] //~ WARN: incompatible link kind for `m`
//! [derive@m!()] //~ WARN incompatible link kind for `m`
//! [derive@m!{}] //~ WARN incompatible link kind for `m`
//! [derive@m![]]
//! [derive@f()] //~ WARN: unmatched disambiguator `derive` and suffix `()`
//! [derive@m!] //~ WARN: incompatible link kind for `m`
//! [derive@f()] //~ WARN unmatched disambiguator `derive` and suffix `()`
//! [derive@m!] //~ WARN incompatible link kind for `m`
//!
//! [type@m!()] //~ WARN: unmatched disambiguator `type` and suffix `!()`
//! [type@m!()] //~ WARN unmatched disambiguator `type` and suffix `!()`
//! [type@m!{}]
//! [type@m![]]
//! [type@f()] //~ WARN: unmatched disambiguator `type` and suffix `()`
//! [type@m!] //~ WARN: unmatched disambiguator `type` and suffix `!`
//! [type@f()] //~ WARN unmatched disambiguator `type` and suffix `()`
//! [type@m!] //~ WARN unmatched disambiguator `type` and suffix `!`
//!
//! [value@m!()] //~ WARN: unmatched disambiguator `value` and suffix `!()`
//! [value@m!()] //~ WARN unmatched disambiguator `value` and suffix `!()`
//! [value@m!{}]
//! [value@m![]]
//! [value@f()]
//! [value@m!] //~ WARN: unmatched disambiguator `value` and suffix `!`
//! [value@m!] //~ WARN unmatched disambiguator `value` and suffix `!`
//!
//! [macro@m!()]
//! [macro@m!{}]
//! [macro@m![]]
//! [macro@f()] //~ WARN: unmatched disambiguator `macro` and suffix `()`
//! [macro@f()] //~ WARN unmatched disambiguator `macro` and suffix `()`
//! [macro@m!]
//!
//! [prim@m!()] //~ WARN: unmatched disambiguator `prim` and suffix `!()`
//! [prim@m!()] //~ WARN unmatched disambiguator `prim` and suffix `!()`
//! [prim@m!{}]
//! [prim@m![]]
//! [prim@f()] //~ WARN: unmatched disambiguator `prim` and suffix `()`
//! [prim@m!] //~ WARN: unmatched disambiguator `prim` and suffix `!`
//! [prim@f()] //~ WARN unmatched disambiguator `prim` and suffix `()`
//! [prim@m!] //~ WARN unmatched disambiguator `prim` and suffix `!`
//!
//! [primitive@m!()] //~ WARN: unmatched disambiguator `primitive` and suffix `!()`
//! [primitive@m!()] //~ WARN unmatched disambiguator `primitive` and suffix `!()`
//! [primitive@m!{}]
//! [primitive@m![]]
//! [primitive@f()] //~ WARN: unmatched disambiguator `primitive` and suffix `()`
//! [primitive@m!] //~ WARN: unmatched disambiguator `primitive` and suffix `!`
//! [primitive@f()] //~ WARN unmatched disambiguator `primitive` and suffix `()`
//! [primitive@m!] //~ WARN unmatched disambiguator `primitive` and suffix `!`

#[macro_export]
macro_rules! m {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//@ check-pass

//! [macro@m!] //~ WARN: unresolved link to `m`
//! [macro@m!] //~ WARN unresolved link to `m`

//issue#126986

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pub fn f() -> impl Sized {
pub enum E {
//~^ ERROR: recursive type
//~^ ERROR recursive type
V(E),
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
fn f() -> impl Sized {
enum E {
//~^ ERROR: recursive type
//~^ ERROR recursive type
V(E),
}

Expand Down
4 changes: 2 additions & 2 deletions tests/rustdoc-ui/intra-doc/feature-gate-intra-doc-pointers.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//! [pointer::add]
//~^ ERROR: experimental
//~^ ERROR experimental
//! [pointer::wrapping_add]
//~^ ERROR: experimental
//~^ ERROR experimental
//! [pointer] // This is explicitly allowed
//! [reference] // This is explicitly allowed
2 changes: 1 addition & 1 deletion tests/rustdoc-ui/issues/issue-120444-1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ mod webdavfs {

/// [`Vfs`][crate::Vfs]
pub use webdavfs::A;
//~^^ error: redundant explicit link target
//~^^ error redundant explicit link target

/// [`Vfs`]
pub use webdavfs::B;
Expand Down
2 changes: 1 addition & 1 deletion tests/rustdoc-ui/issues/issue-120444-2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pub mod webdavfs {

/// [`Vfs`][crate::Vfs]
pub use webdavfs::A;
//~^^ error: redundant explicit link target
//~^^ error redundant explicit link target

/// [`Vfs`]
pub use webdavfs::B;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
//~^ ERROR unknown lint
//~| NOTE lint is unstable
//~| NOTE see issue
//~| NOTE: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
//~| NOTE this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
2 changes: 1 addition & 1 deletion tests/rustdoc-ui/mismatched_arg_count.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ trait Trait<'a> {
type Alias<'a, T> = <T as Trait<'a>>::Assoc;

fn bar<'a, T: Trait<'a>>(_: Alias<'a, 'a, T>) {}
//~^ error: type alias takes 1 lifetime argument but 2 lifetime arguments were supplied
//~^ error type alias takes 1 lifetime argument but 2 lifetime arguments were supplied
2 changes: 1 addition & 1 deletion tests/rustdoc-ui/not-wf-ambiguous-normalization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ struct DefaultAllocator;
// `<DefaultAllocator as Allocator>::Buffer` to be ambiguous,
// which caused an ICE with `-Znormalize-docs`.
impl<T> Allocator for DefaultAllocator {
//~^ ERROR: the type parameter `T` is not constrained
//~^ ERROR the type parameter `T` is not constrained
type Buffer = ();
}

Expand Down
28 changes: 14 additions & 14 deletions tests/ui-fulldeps/hash-stable-is-unstable.rs
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
//@ compile-flags: -Zdeduplicate-diagnostics=yes
extern crate rustc_data_structures;
//~^ use of unstable library feature `rustc_private`
//~| NOTE: issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
//~| NOTE: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
//~| NOTE issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
//~| NOTE this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
extern crate rustc_macros;
//~^ use of unstable library feature `rustc_private`
//~| NOTE: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
//~| NOTE: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
//~| NOTE see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
//~| NOTE this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
extern crate rustc_query_system;
//~^ use of unstable library feature `rustc_private`
//~| NOTE: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
//~| NOTE: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
//~| NOTE see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
//~| NOTE this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date

use rustc_macros::HashStable;
//~^ use of unstable library feature `rustc_private`
//~| NOTE: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
//~| NOTE: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
//~| NOTE see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
//~| NOTE this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date

#[derive(HashStable)]
//~^ use of unstable library feature `rustc_private`
//~| NOTE: in this expansion of #[derive(HashStable)]
//~| NOTE: in this expansion of #[derive(HashStable)]
//~| NOTE: in this expansion of #[derive(HashStable)]
//~| NOTE: in this expansion of #[derive(HashStable)]
//~| NOTE: see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
//~| NOTE: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
//~| NOTE in this expansion of #[derive(HashStable)]
//~| NOTE in this expansion of #[derive(HashStable)]
//~| NOTE in this expansion of #[derive(HashStable)]
//~| NOTE in this expansion of #[derive(HashStable)]
//~| NOTE see issue #27812 <https://github.com/rust-lang/rust/issues/27812> for more information
//~| NOTE this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
struct Test;

fn main() {}
2 changes: 1 addition & 1 deletion tests/ui/abi/c-zst.rs
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,4 @@ extern crate minicore;
use minicore::*;

#[rustc_abi(debug)]
extern "C" fn pass_zst(_: ()) {} //~ ERROR: fn_abi
extern "C" fn pass_zst(_: ()) {} //~ ERROR fn_abi
Loading
Loading