From 2fd6c4a18a475a0474c035283e2c01480cbbc6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20Mi=C4=85sko?= Date: Fri, 24 Jan 2020 00:00:00 +0000 Subject: [PATCH] Remove unused ignore-license directives The tidy check was removed in rust-lang/rust#53617 --- src/libstd/sys/cloudabi/abi/bitflags.rs | 3 --- src/libstd/sys/cloudabi/abi/cloudabi.rs | 1 - src/test/pretty/top-level-doc-comments.rs | 5 ----- src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c | 1 - src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c | 2 -- src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c | 1 - src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c | 1 - src/test/run-make-fulldeps/c-static-dylib/cfoo.c | 1 - src/test/run-make-fulldeps/c-static-rlib/cfoo.c | 1 - .../run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp | 1 - src/test/run-make-fulldeps/extern-fn-generic/test.c | 1 - src/test/run-make-fulldeps/extern-fn-mangle/test.c | 1 - .../run-make-fulldeps/extern-fn-with-extern-types/ctest.c | 1 - .../run-make-fulldeps/extern-fn-with-packed-struct/test.c | 1 - src/test/run-make-fulldeps/extern-fn-with-union/ctest.c | 1 - src/test/run-make-fulldeps/glibc-staticlib-args/program.c | 1 - src/test/run-make-fulldeps/interdependent-c-libraries/bar.c | 1 - src/test/run-make-fulldeps/interdependent-c-libraries/foo.c | 1 - src/test/run-make-fulldeps/issue-25581/test.c | 1 - src/test/run-make-fulldeps/link-path-order/correct.c | 1 - src/test/run-make-fulldeps/link-path-order/wrong.c | 1 - src/test/run-make-fulldeps/linkage-attr-on-static/foo.c | 1 - src/test/run-make-fulldeps/lto-smoke-c/bar.c | 1 - src/test/run-make-fulldeps/manual-link/bar.c | 1 - src/test/run-make-fulldeps/manual-link/foo.c | 1 - .../run-make-fulldeps/sanitizer-staticlib-link/program.c | 1 - src/test/ui/attr-shebang.rs | 1 - .../ui/lexer-crlf-line-endings-string-literal-doc-comment.rs | 5 +---- 28 files changed, 1 insertion(+), 38 deletions(-) diff --git a/src/libstd/sys/cloudabi/abi/bitflags.rs b/src/libstd/sys/cloudabi/abi/bitflags.rs index 306936213ed11..2383277ad7284 100644 --- a/src/libstd/sys/cloudabi/abi/bitflags.rs +++ b/src/libstd/sys/cloudabi/abi/bitflags.rs @@ -21,9 +21,6 @@ // OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF // SUCH DAMAGE. -// Appease Rust's tidy. -// ignore-license - #[cfg(feature = "bitflags")] use bitflags::bitflags; diff --git a/src/libstd/sys/cloudabi/abi/cloudabi.rs b/src/libstd/sys/cloudabi/abi/cloudabi.rs index d113a7b3d60d4..b02faf1830c53 100644 --- a/src/libstd/sys/cloudabi/abi/cloudabi.rs +++ b/src/libstd/sys/cloudabi/abi/cloudabi.rs @@ -26,7 +26,6 @@ // Source: https://github.com/NuxiNL/cloudabi // Appease Rust's tidy. -// ignore-license // ignore-tidy-linelength //! **PLEASE NOTE: This entire crate including this diff --git a/src/test/pretty/top-level-doc-comments.rs b/src/test/pretty/top-level-doc-comments.rs index 16f95d334cbcf..b97927124c30f 100644 --- a/src/test/pretty/top-level-doc-comments.rs +++ b/src/test/pretty/top-level-doc-comments.rs @@ -1,11 +1,6 @@ /// Some doc comment. struct X; -// ignore-license - -// http://rust-lang.org/COPYRIGHT. -// - // pp-exact // Test that rust can properly pretty print a doc comment if it's the first line in a file. some diff --git a/src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c b/src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c index a975549354123..fea490cf9b45f 100644 --- a/src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c +++ b/src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c @@ -1,4 +1,3 @@ -// ignore-license #ifdef _WIN32 __declspec(dllexport) #endif diff --git a/src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c b/src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c index b2849326a7588..fea490cf9b45f 100644 --- a/src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c +++ b/src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c @@ -1,5 +1,3 @@ -// ignore-license - #ifdef _WIN32 __declspec(dllexport) #endif diff --git a/src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c b/src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c index 5729d411c5bcd..bb4036b06e13b 100644 --- a/src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c +++ b/src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c @@ -1,4 +1,3 @@ -// ignore-license void foo(); int main() { diff --git a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c index 5729d411c5bcd..bb4036b06e13b 100644 --- a/src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c +++ b/src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c @@ -1,4 +1,3 @@ -// ignore-license void foo(); int main() { diff --git a/src/test/run-make-fulldeps/c-static-dylib/cfoo.c b/src/test/run-make-fulldeps/c-static-dylib/cfoo.c index 113717a776a99..9fe07f82f9ed1 100644 --- a/src/test/run-make-fulldeps/c-static-dylib/cfoo.c +++ b/src/test/run-make-fulldeps/c-static-dylib/cfoo.c @@ -1,2 +1 @@ -// ignore-license int foo() { return 0; } diff --git a/src/test/run-make-fulldeps/c-static-rlib/cfoo.c b/src/test/run-make-fulldeps/c-static-rlib/cfoo.c index 113717a776a99..9fe07f82f9ed1 100644 --- a/src/test/run-make-fulldeps/c-static-rlib/cfoo.c +++ b/src/test/run-make-fulldeps/c-static-rlib/cfoo.c @@ -1,2 +1 @@ -// ignore-license int foo() { return 0; } diff --git a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp index aac3ba4220101..4c2fb9cdb8782 100644 --- a/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp +++ b/src/test/run-make-fulldeps/compiler-rt-works-on-mingw/foo.cpp @@ -1,4 +1,3 @@ -// ignore-license extern "C" void foo() { int *a = new int(3); delete a; diff --git a/src/test/run-make-fulldeps/extern-fn-generic/test.c b/src/test/run-make-fulldeps/extern-fn-generic/test.c index f9faef64afc41..a8504ff2afb06 100644 --- a/src/test/run-make-fulldeps/extern-fn-generic/test.c +++ b/src/test/run-make-fulldeps/extern-fn-generic/test.c @@ -1,4 +1,3 @@ -// ignore-license #include typedef struct TestStruct { diff --git a/src/test/run-make-fulldeps/extern-fn-mangle/test.c b/src/test/run-make-fulldeps/extern-fn-mangle/test.c index 1a9855dedec49..e94d75083b8ff 100644 --- a/src/test/run-make-fulldeps/extern-fn-mangle/test.c +++ b/src/test/run-make-fulldeps/extern-fn-mangle/test.c @@ -1,4 +1,3 @@ -// ignore-license #include uint32_t foo(); diff --git a/src/test/run-make-fulldeps/extern-fn-with-extern-types/ctest.c b/src/test/run-make-fulldeps/extern-fn-with-extern-types/ctest.c index c3d6166fb1284..3b6fb4cfce984 100644 --- a/src/test/run-make-fulldeps/extern-fn-with-extern-types/ctest.c +++ b/src/test/run-make-fulldeps/extern-fn-with-extern-types/ctest.c @@ -1,4 +1,3 @@ -// ignore-license #include #include diff --git a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.c b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.c index 4124e202c1dd0..52af3dceb109c 100644 --- a/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.c +++ b/src/test/run-make-fulldeps/extern-fn-with-packed-struct/test.c @@ -1,4 +1,3 @@ -// ignore-license // Pragma needed cause of gcc bug on windows: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=52991 #include diff --git a/src/test/run-make-fulldeps/extern-fn-with-union/ctest.c b/src/test/run-make-fulldeps/extern-fn-with-union/ctest.c index 8c87c230693d1..86cb64537236e 100644 --- a/src/test/run-make-fulldeps/extern-fn-with-union/ctest.c +++ b/src/test/run-make-fulldeps/extern-fn-with-union/ctest.c @@ -1,4 +1,3 @@ -// ignore-license #include #include diff --git a/src/test/run-make-fulldeps/glibc-staticlib-args/program.c b/src/test/run-make-fulldeps/glibc-staticlib-args/program.c index d704c39d5c42f..30f6974b75086 100644 --- a/src/test/run-make-fulldeps/glibc-staticlib-args/program.c +++ b/src/test/run-make-fulldeps/glibc-staticlib-args/program.c @@ -1,4 +1,3 @@ -// ignore-license void args_check(); int main() { diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c index c761f029effbe..812c975352872 100644 --- a/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c +++ b/src/test/run-make-fulldeps/interdependent-c-libraries/bar.c @@ -1,4 +1,3 @@ -// ignore-license void foo(); void bar() { foo(); } diff --git a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c index 2895ad473bf96..85e6cd8c3909a 100644 --- a/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c +++ b/src/test/run-make-fulldeps/interdependent-c-libraries/foo.c @@ -1,2 +1 @@ -// ignore-license void foo() {} diff --git a/src/test/run-make-fulldeps/issue-25581/test.c b/src/test/run-make-fulldeps/issue-25581/test.c index 5736b1730216d..52fbf78510a88 100644 --- a/src/test/run-make-fulldeps/issue-25581/test.c +++ b/src/test/run-make-fulldeps/issue-25581/test.c @@ -1,4 +1,3 @@ -// ignore-license #include #include diff --git a/src/test/run-make-fulldeps/link-path-order/correct.c b/src/test/run-make-fulldeps/link-path-order/correct.c index a595939f92e8c..3064af952f898 100644 --- a/src/test/run-make-fulldeps/link-path-order/correct.c +++ b/src/test/run-make-fulldeps/link-path-order/correct.c @@ -1,2 +1 @@ -// ignore-license int should_return_one() { return 1; } diff --git a/src/test/run-make-fulldeps/link-path-order/wrong.c b/src/test/run-make-fulldeps/link-path-order/wrong.c index c53e7e3c48c05..64275b3ad6bb0 100644 --- a/src/test/run-make-fulldeps/link-path-order/wrong.c +++ b/src/test/run-make-fulldeps/link-path-order/wrong.c @@ -1,2 +1 @@ -// ignore-license int should_return_one() { return 0; } diff --git a/src/test/run-make-fulldeps/linkage-attr-on-static/foo.c b/src/test/run-make-fulldeps/linkage-attr-on-static/foo.c index d7d33ea12e806..78a6934f57f76 100644 --- a/src/test/run-make-fulldeps/linkage-attr-on-static/foo.c +++ b/src/test/run-make-fulldeps/linkage-attr-on-static/foo.c @@ -1,4 +1,3 @@ -// ignore-license #include extern int32_t BAZ; diff --git a/src/test/run-make-fulldeps/lto-smoke-c/bar.c b/src/test/run-make-fulldeps/lto-smoke-c/bar.c index 5729d411c5bcd..bb4036b06e13b 100644 --- a/src/test/run-make-fulldeps/lto-smoke-c/bar.c +++ b/src/test/run-make-fulldeps/lto-smoke-c/bar.c @@ -1,4 +1,3 @@ -// ignore-license void foo(); int main() { diff --git a/src/test/run-make-fulldeps/manual-link/bar.c b/src/test/run-make-fulldeps/manual-link/bar.c index 3c167b45af98d..e42599986781f 100644 --- a/src/test/run-make-fulldeps/manual-link/bar.c +++ b/src/test/run-make-fulldeps/manual-link/bar.c @@ -1,2 +1 @@ -// ignore-license void bar() {} diff --git a/src/test/run-make-fulldeps/manual-link/foo.c b/src/test/run-make-fulldeps/manual-link/foo.c index 3c167b45af98d..e42599986781f 100644 --- a/src/test/run-make-fulldeps/manual-link/foo.c +++ b/src/test/run-make-fulldeps/manual-link/foo.c @@ -1,2 +1 @@ -// ignore-license void bar() {} diff --git a/src/test/run-make-fulldeps/sanitizer-staticlib-link/program.c b/src/test/run-make-fulldeps/sanitizer-staticlib-link/program.c index a6d3bcdc5ac9d..735e2b147fd9e 100644 --- a/src/test/run-make-fulldeps/sanitizer-staticlib-link/program.c +++ b/src/test/run-make-fulldeps/sanitizer-staticlib-link/program.c @@ -1,4 +1,3 @@ -// ignore-license void overflow(); int main() { diff --git a/src/test/ui/attr-shebang.rs b/src/test/ui/attr-shebang.rs index cce31c9bb7b6b..3b0dc096f58fb 100644 --- a/src/test/ui/attr-shebang.rs +++ b/src/test/ui/attr-shebang.rs @@ -3,4 +3,3 @@ #![allow(stable_features)] #![feature(rust1)] pub fn main() { } -// ignore-license diff --git a/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs b/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs index ada253aacfb90..802be7f5afb57 100644 --- a/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs +++ b/src/test/ui/lexer-crlf-line-endings-string-literal-doc-comment.rs @@ -1,11 +1,8 @@ // run-pass -// ignore-tidy-cr ignore-license +// ignore-tidy-cr // ignore-tidy-cr (repeated again because of tidy bug) // license is ignored because tidy can't handle the CRLF here properly. -// http://rust-lang.org/COPYRIGHT. -// - // N.B., this file needs CRLF line endings. The .gitattributes file in // this directory should enforce it.