Skip to content

Commit

Permalink
Rollup merge of rust-lang#68511 - tmiasko:ignore-license, r=alexcrichton
Browse files Browse the repository at this point in the history
Remove unused ignore-license directives

The tidy check was removed in rust-lang#53617
  • Loading branch information
JohnTitor authored Jan 24, 2020
2 parents e22ae2c + 2fd6c4a commit b9c86a3
Show file tree
Hide file tree
Showing 28 changed files with 1 addition and 38 deletions.
3 changes: 0 additions & 3 deletions src/libstd/sys/cloudabi/abi/bitflags.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
1 change: 0 additions & 1 deletion src/libstd/sys/cloudabi/abi/cloudabi.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions src/test/pretty/top-level-doc-comments.rs
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/c-dynamic-dylib/cfoo.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
#ifdef _WIN32
__declspec(dllexport)
#endif
Expand Down
2 changes: 0 additions & 2 deletions src/test/run-make-fulldeps/c-dynamic-rlib/cfoo.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// ignore-license

#ifdef _WIN32
__declspec(dllexport)
#endif
Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/c-link-to-rust-dylib/bar.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
void foo();

int main() {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/c-link-to-rust-staticlib/bar.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
void foo();

int main() {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/c-static-dylib/cfoo.c
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
// ignore-license
int foo() { return 0; }
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/c-static-rlib/cfoo.c
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
// ignore-license
int foo() { return 0; }
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
extern "C" void foo() {
int *a = new int(3);
delete a;
Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/extern-fn-generic/test.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
#include <stdint.h>

typedef struct TestStruct {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/extern-fn-mangle/test.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
#include <stdint.h>

uint32_t foo();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
#include <stdio.h>
#include <stdint.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -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 <assert.h>
Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/extern-fn-with-union/ctest.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
#include <stdio.h>
#include <stdint.h>

Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/glibc-staticlib-args/program.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
void args_check();

int main() {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
void foo();

void bar() { foo(); }
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
// ignore-license
void foo() {}
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/issue-25581/test.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
#include <stddef.h>
#include <stdint.h>

Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/link-path-order/correct.c
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
// ignore-license
int should_return_one() { return 1; }
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/link-path-order/wrong.c
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
// ignore-license
int should_return_one() { return 0; }
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/linkage-attr-on-static/foo.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
#include <stdint.h>

extern int32_t BAZ;
Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/lto-smoke-c/bar.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
void foo();

int main() {
Expand Down
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/manual-link/bar.c
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
// ignore-license
void bar() {}
1 change: 0 additions & 1 deletion src/test/run-make-fulldeps/manual-link/foo.c
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
// ignore-license
void bar() {}
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
// ignore-license
void overflow();

int main() {
Expand Down
1 change: 0 additions & 1 deletion src/test/ui/attr-shebang.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
#![allow(stable_features)]
#![feature(rust1)]
pub fn main() { }
// ignore-license
Original file line number Diff line number Diff line change
@@ -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.

Expand Down

0 comments on commit b9c86a3

Please sign in to comment.