From e7f8c0d1050bc8871f5bb63cfe5018ed854d91e3 Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Tue, 6 Nov 2018 14:21:52 +0100 Subject: [PATCH 1/2] Sidestep link error from rustfix'ed code by using a *defined* static. As a drive-by, added `-g` to the compile-flags so that the test more reliably fails to compile when the extern static in question is *not* provided. (I.e. this is making the test more robust in the face of potential future revisions.) Fix #54388. --- src/test/ui/extern/extern-const.fixed | 25 +++++++++++++++++++++++++ src/test/ui/extern/extern-const.rs | 24 ++++++++++++------------ src/test/ui/extern/extern-const.stderr | 2 +- 3 files changed, 38 insertions(+), 13 deletions(-) create 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 new file mode 100644 index 00000000000..0229362cf0e --- /dev/null +++ b/src/test/ui/extern/extern-const.fixed @@ -0,0 +1,25 @@ +// This test is checking that extern items cannot be const. It also +// checks that `rustfix` suggests the alternative of using an extern +// static. +// +// #54388: an unused reference to an undefined static may or may not +// compile. To sidestep this by using one that *is* defined. + +// run-rustfix +// compile-flags: -g -Z continue-parse-after-error +#![feature(libc)] +extern crate libc; + +#[link(name = "rust_test_helpers", kind = "static")] +extern "C" { + static rust_dbg_static_mut: libc::c_int; //~ 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 = rust_dbg_static_mut; + } +} diff --git a/src/test/ui/extern/extern-const.rs b/src/test/ui/extern/extern-const.rs index d8a167311d5..e7b17152555 100644 --- a/src/test/ui/extern/extern-const.rs +++ b/src/test/ui/extern/extern-const.rs @@ -1,18 +1,18 @@ -// 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. +// This test is checking that extern items cannot be const. It also +// checks that `rustfix` suggests the alternative of using an extern +// static. // -// 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. +// #54388: an unused reference to an undefined static may or may not +// compile. To sidestep this by using one that *is* defined. -// FIXME(#54388): re-enable rustfix later, when this test has consistent output across targets -// compile-flags: -Z continue-parse-after-error +// run-rustfix +// compile-flags: -g -Z continue-parse-after-error +#![feature(libc)] +extern crate libc; +#[link(name = "rust_test_helpers", kind = "static")] extern "C" { - const C: u8; //~ ERROR extern items cannot be `const` + const rust_dbg_static_mut: libc::c_int; //~ ERROR extern items cannot be `const` } fn main() { @@ -20,6 +20,6 @@ fn main() { // but this also requires `unsafe` (a deny-by-default lint at comment time, // future error; Issue #36247) unsafe { - let _x = C; + let _x = rust_dbg_static_mut; } } diff --git a/src/test/ui/extern/extern-const.stderr b/src/test/ui/extern/extern-const.stderr index cbed5e56c76..7ebaec0368e 100644 --- a/src/test/ui/extern/extern-const.stderr +++ b/src/test/ui/extern/extern-const.stderr @@ -1,7 +1,7 @@ error: extern items cannot be `const` --> $DIR/extern-const.rs:15:5 | -LL | const C: u8; //~ ERROR extern items cannot be `const` +LL | const rust_dbg_static_mut: libc::c_int; //~ ERROR extern items cannot be `const` | ^^^^^ help: try using a static value: `static` error: aborting due to previous error From 34ffbdb965dd84c6eb6309cacc1f44d6304fdd17 Mon Sep 17 00:00:00 2001 From: "Felix S. Klock II" Date: Wed, 7 Nov 2018 16:33:41 +0100 Subject: [PATCH 2/2] This test will not link on wasm32. --- src/test/ui/extern/extern-const.fixed | 6 +++--- src/test/ui/extern/extern-const.rs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/ui/extern/extern-const.fixed b/src/test/ui/extern/extern-const.fixed index 0229362cf0e..dca5698a70c 100644 --- a/src/test/ui/extern/extern-const.fixed +++ b/src/test/ui/extern/extern-const.fixed @@ -1,11 +1,11 @@ -// This test is checking that extern items cannot be const. It also -// checks that `rustfix` suggests the alternative of using an extern -// static. +// Check extern items cannot be const + `rustfix` suggests using +// extern static. // // #54388: an unused reference to an undefined static may or may not // compile. To sidestep this by using one that *is* defined. // run-rustfix +// ignore-wasm32 no external library to link to. // compile-flags: -g -Z continue-parse-after-error #![feature(libc)] extern crate libc; diff --git a/src/test/ui/extern/extern-const.rs b/src/test/ui/extern/extern-const.rs index e7b17152555..07dbe545a85 100644 --- a/src/test/ui/extern/extern-const.rs +++ b/src/test/ui/extern/extern-const.rs @@ -1,11 +1,11 @@ -// This test is checking that extern items cannot be const. It also -// checks that `rustfix` suggests the alternative of using an extern -// static. +// Check extern items cannot be const + `rustfix` suggests using +// extern static. // // #54388: an unused reference to an undefined static may or may not // compile. To sidestep this by using one that *is* defined. // run-rustfix +// ignore-wasm32 no external library to link to. // compile-flags: -g -Z continue-parse-after-error #![feature(libc)] extern crate libc;