From 3bdba74ed3f8a859331ff658a6c0235855331095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Re=CC=81my=20Rakic?= Date: Thu, 20 Sep 2018 23:22:42 +0200 Subject: [PATCH] Disable rustfix temporarily on extern-const.rs `src/test/ui/extern/extern-const.rs` seems to have an inconsistent behaviour across build configurations, possibly non-deterministically. This is tracked in issue 54388. For this PR, disable running rustfix on it because it failed on CI, until that issue is fixed. --- src/test/ui/extern/extern-const.fixed | 25 ------------------------- src/test/ui/extern/extern-const.rs | 2 +- 2 files changed, 1 insertion(+), 26 deletions(-) delete mode 100644 src/test/ui/extern/extern-const.fixed diff --git a/src/test/ui/extern/extern-const.fixed b/src/test/ui/extern/extern-const.fixed deleted file mode 100644 index 6e131ca41aa9..000000000000 --- a/src/test/ui/extern/extern-const.fixed +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2017 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -// run-rustfix -// compile-flags: -Z continue-parse-after-error - -extern "C" { - static C: u8; //~ ERROR extern items cannot be `const` -} - -fn main() { - // We suggest turning the (illegal) extern `const` into an extern `static`, - // but this also requires `unsafe` (a deny-by-default lint at comment time, - // future error; Issue #36247) - unsafe { - let _x = C; - } -} diff --git a/src/test/ui/extern/extern-const.rs b/src/test/ui/extern/extern-const.rs index 4a766b9724dc..d8a167311d55 100644 --- a/src/test/ui/extern/extern-const.rs +++ b/src/test/ui/extern/extern-const.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -// run-rustfix +// FIXME(#54388): re-enable rustfix later, when this test has consistent output across targets // compile-flags: -Z continue-parse-after-error extern "C" {