Skip to content

Commit

Permalink
Rollup merge of rust-lang#124326 - klensy:ignore-stage2, r=compiler-e…
Browse files Browse the repository at this point in the history
…rrors

tests: remove few ignore-stage2

beta was branched long ago, so can be removed
  • Loading branch information
matthiaskrgr committed Apr 24, 2024
2 parents 0bcf3d0 + e55436e commit 277d669
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 16 deletions.
2 changes: 0 additions & 2 deletions tests/ui/codemap_tests/huge_multispan_highlight.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//@ compile-flags: --error-format=human --color=always
//@ ignore-windows
// Temporary until next release:
//@ ignore-stage2
fn main() {
let _ = match true {
true => (
Expand Down
6 changes: 3 additions & 3 deletions tests/ui/codemap_tests/huge_multispan_highlight.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions tests/ui/diagnostic-flags/colored-session-opt-error.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
//@ check-pass
//@ ignore-windows
//@ compile-flags: -Cremark=foo --error-format=human --color=always
// Temporary until next release:
//@ ignore-stage2
fn main() {}
2 changes: 0 additions & 2 deletions tests/ui/error-emitter/highlighting.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
//@ compile-flags: --error-format=human --color=always
//@ error-pattern:for<'a> 
//@ edition:2018
// Temporary until next release:
//@ ignore-stage2

use core::pin::Pin;
use core::future::Future;
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/error-emitter/highlighting.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions tests/ui/error-emitter/multiline-multipart-suggestion.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
//@ compile-flags: --error-format=human --color=always
//@ error-pattern: missing lifetime specifier
// Temporary until next release:
//@ ignore-stage2

fn short(foo_bar: &Vec<&i32>) -> &i32 {
&12
Expand Down
6 changes: 3 additions & 3 deletions tests/ui/error-emitter/multiline-multipart-suggestion.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 277d669

Please sign in to comment.