Skip to content

Commit a0f06d1

Browse files
committed
Auto merge of #72354 - tamird:remove-copyright, r=Mark-Simulacrum
Remove dangling COPYRIGHT references Missed in 2a66355. r? @Mark-Simulacrum
2 parents ee6c0da + 2bf6833 commit a0f06d1

File tree

5 files changed

+9
-18
lines changed

5 files changed

+9
-18
lines changed

src/test/ui/issues/issue-49851/compiler-builtins-error.rs

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
//~ ERROR 1:1: 1:1: can't find crate for `core` [E0463]
2-
// http://rust-lang.org/COPYRIGHT.
3-
//
42

53
// compile-flags: --target thumbv7em-none-eabihf
64
#![deny(unsafe_code)]

src/test/ui/ui-testing-optout.rs

-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@
33
// Line number < 10
44
type A = B; //~ ERROR
55

6-
// http://rust-lang.org/COPYRIGHT.
7-
//
8-
96
// Line number >=10, <100
107
type C = D; //~ ERROR
118

src/test/ui/ui-testing-optout.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ error[E0412]: cannot find type `B` in this scope
88
| similarly named type alias `A` defined here
99

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

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

2828
error: aborting due to 3 previous errors

src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
// http://rust-lang.org/COPYRIGHT.
2-
//
3-
4-
51
fn f(p: *mut u8) {
62
*p = 0; //~ ERROR dereference of raw pointer is unsafe
73
return;

src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0133]: dereference of raw pointer is unsafe and requires unsafe function or block
2-
--> $DIR/unsafe-fn-assign-deref-ptr.rs:6:5
2+
--> $DIR/unsafe-fn-assign-deref-ptr.rs:2:5
33
|
44
LL | *p = 0;
55
| ^^^^^^ dereference of raw pointer

0 commit comments

Comments
 (0)