diff options
| author | bors <bors@rust-lang.org> | 2020-05-25 13:40:42 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-05-25 13:40:42 +0000 |
| commit | a0f06d11ae7fe29c8e263e2a5d8cd41b372f0283 (patch) | |
| tree | 4da6563fcbf2c1a0732880efa7e49b5f7d4ab52b /src | |
| parent | ee6c0dae394f67b5286909704f8f0a608696c96c (diff) | |
| parent | 2bf6833d37ddf043c68c9234a787a7455ee56ab5 (diff) | |
| download | rust-a0f06d11ae7fe29c8e263e2a5d8cd41b372f0283.tar.gz rust-a0f06d11ae7fe29c8e263e2a5d8cd41b372f0283.zip | |
Auto merge of #72354 - tamird:remove-copyright, r=Mark-Simulacrum
Remove dangling COPYRIGHT references Missed in 2a663555ddf36f6b041445894a8c175cd1bc718c. r? @Mark-Simulacrum
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/ui/issues/issue-49851/compiler-builtins-error.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/ui-testing-optout.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/ui-testing-optout.stderr | 16 | ||||
| -rw-r--r-- | src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr | 2 |
5 files changed, 9 insertions, 18 deletions
diff --git a/src/test/ui/issues/issue-49851/compiler-builtins-error.rs b/src/test/ui/issues/issue-49851/compiler-builtins-error.rs index 3484ff3b874..9449376513f 100644 --- a/src/test/ui/issues/issue-49851/compiler-builtins-error.rs +++ b/src/test/ui/issues/issue-49851/compiler-builtins-error.rs @@ -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)] diff --git a/src/test/ui/ui-testing-optout.rs b/src/test/ui/ui-testing-optout.rs index 901263c5bf8..88e81158316 100644 --- a/src/test/ui/ui-testing-optout.rs +++ b/src/test/ui/ui-testing-optout.rs @@ -3,9 +3,6 @@ // Line number < 10 type A = B; //~ ERROR -// http://rust-lang.org/COPYRIGHT. -// - // Line number >=10, <100 type C = D; //~ ERROR diff --git a/src/test/ui/ui-testing-optout.stderr b/src/test/ui/ui-testing-optout.stderr index ff5bf6238e2..f562bb74c11 100644 --- a/src/test/ui/ui-testing-optout.stderr +++ b/src/test/ui/ui-testing-optout.stderr @@ -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 diff --git a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs b/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs index 64bdca52457..91264e790c8 100644 --- a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs +++ b/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.rs @@ -1,7 +1,3 @@ -// http://rust-lang.org/COPYRIGHT. -// - - fn f(p: *mut u8) { *p = 0; //~ ERROR dereference of raw pointer is unsafe return; diff --git a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr b/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr index 8f621d6ed11..28db83db92a 100644 --- a/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr +++ b/src/test/ui/unsafe/unsafe-fn-assign-deref-ptr.stderr @@ -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 |
