Skip to content

Commit

Permalink
Auto merge of #72354 - tamird:remove-copyright, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Remove dangling COPYRIGHT references

Missed in 2a66355.

r? @Mark-Simulacrum
  • Loading branch information
bors committed May 25, 2020
2 parents ee6c0da + 2bf6833 commit a0f06d1
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 18 deletions.
2 changes: 0 additions & 2 deletions src/test/ui/issues/issue-49851/compiler-builtins-error.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
//~ ERROR 1:1: 1:1: can't find crate for `core` [E0463]
// http://rust-lang.org/COPYRIGHT.
//

// compile-flags: --target thumbv7em-none-eabihf
#![deny(unsafe_code)]
Expand Down
3 changes: 0 additions & 3 deletions src/test/ui/ui-testing-optout.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
// Line number < 10
type A = B; //~ ERROR

// http://rust-lang.org/COPYRIGHT.
//

// Line number >=10, <100
type C = D; //~ ERROR

Expand Down
16 changes: 8 additions & 8 deletions src/test/ui/ui-testing-optout.stderr
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,21 @@ error[E0412]: cannot find type `B` in this scope
| similarly named type alias `A` defined here

error[E0412]: cannot find type `D` in this scope
--> $DIR/ui-testing-optout.rs:10:10
|
4 | type A = B;
| ----------- similarly named type alias `A` defined here
--> $DIR/ui-testing-optout.rs:7:10
|
4 | type A = B;
| ----------- similarly named type alias `A` defined here
...
10 | type C = D;
| ^ help: a type alias with a similar name exists: `A`
7 | type C = D;
| ^ help: a type alias with a similar name exists: `A`

error[E0412]: cannot find type `F` in this scope
--> $DIR/ui-testing-optout.rs:95:10
--> $DIR/ui-testing-optout.rs:92:10
|
4 | type A = B;
| ----------- similarly named type alias `A` defined here
...
95 | type E = F;
92 | type E = F;
| ^ help: a type alias with a similar name exists: `A`

error: aborting due to 3 previous errors
Expand Down
4 changes: 0 additions & 4 deletions src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// http://rust-lang.org/COPYRIGHT.
//


fn f(p: *mut u8) {
*p = 0; //~ ERROR dereference of raw pointer is unsafe
return;
Expand Down
2 changes: 1 addition & 1 deletion src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block
--> $DIR/unsafe-fn-assign-deref-ptr.rs:6:5
--> $DIR/unsafe-fn-assign-deref-ptr.rs:2:5
|
LL | *p = 0;
| ^^^^^^ dereference of raw pointer
Expand Down

0 comments on commit a0f06d1

Please sign in to comment.