Skip to content

Commit 1f8e117

Browse files
joshtriplettmark-i-m
authored andcommitted
Update copyright guidance to omit notices for new files.
Previously approved in rust-lang/rust#43498 ; update the guide to match.
1 parent 6568317 commit 1f8e117

File tree

3 files changed

+5
-32
lines changed

3 files changed

+5
-32
lines changed

src/compiletest.md

-10
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,6 @@ header command and the argument list (if present) are typically separated by a
6363
colon:
6464

6565
```rust,ignore
66-
// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
67-
// file at the top-level directory of this distribution and at
68-
// http://rust-lang.org/COPYRIGHT.
69-
//
70-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
71-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
72-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
73-
// option. This file may not be copied, modified, or distributed
74-
// except according to those terms.
75-
7666
// must-compile-successfully
7767
// failure-status: 1
7868

src/conventions.md

+5-18
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,11 @@ in isolation with `./x.py test src/tools/tidy`.
2020

2121
### Copyright notice
2222

23-
All files must begin with the following copyright notice:
24-
25-
```rust
26-
// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
27-
// file at the top-level directory of this distribution and at
28-
// http://rust-lang.org/COPYRIGHT.
29-
//
30-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
31-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
32-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
33-
// option. This file may not be copied, modified, or distributed
34-
// except according to those terms.
35-
```
36-
37-
The year at the top is not meaningful: copyright protections are in
38-
fact automatic from the moment of authorship. We do not typically edit
39-
the years on existing files. When creating a new file, you can use the
40-
current year if you like, but you don't have to.
23+
Some existing files begin with a copyright and license notice. Please omit this
24+
notice for new files licensed under the standard terms (dual MIT/Apache-2.0).
25+
For existing files, the year at the top is not meaningful: copyright
26+
protections are in fact automatic from the moment of authorship. We do not
27+
typically edit the years on existing files.
4128

4229
## Line length
4330

src/tests/adding.md

-4
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ this test. For example, this test uses the `// compile-flags` command
101101
to specify a custom flag to give to rustc when the test is compiled:
102102

103103
```rust,ignore
104-
// Copyright 2017 The Rust Project Developers. blah blah blah.
105-
// ...
106-
// except according to those terms.
107-
108104
// Test the behavior of `0 - 1` when overflow checks are disabled.
109105
110106
// compile-flags: -Coverflow-checks=off

0 commit comments

Comments
 (0)