Skip to content

Commit 010d96e

Browse files
committed
auto merge of #14728 : TeXitoi/rust/relicense-shootout-regex-dna, r=brson
Part of #14248 The authors are @pcwalton and @BurntSushi, and we have their agreement. @brson OK?
2 parents 7580ef9 + fe7fc4a commit 010d96e

File tree

2 files changed

+39
-8
lines changed

2 files changed

+39
-8
lines changed

src/etc/licenseck.py

+1
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
"libstd/sync/mpmc_bounded_queue.rs", # BSD
4444
"libsync/mpsc_intrusive.rs", # BSD
4545
"test/bench/shootout-meteor.rs", # BSD
46+
"test/bench/shootout-regex-dna.rs", # BSD
4647
]
4748

4849
def check_license(name, contents):

src/test/bench/shootout-regex-dna.rs

+38-8
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,42 @@
1-
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2-
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/COPYRIGHT.
1+
// The Computer Language Benchmarks Game
2+
// http://benchmarksgame.alioth.debian.org/
43
//
5-
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6-
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7-
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8-
// option. This file may not be copied, modified, or distributed
9-
// except according to those terms.
4+
// contributed by the Rust Project Developers
5+
6+
// Copyright (c) 2014 The Rust Project Developers
7+
//
8+
// All rights reserved.
9+
//
10+
// Redistribution and use in source and binary forms, with or without
11+
// modification, are permitted provided that the following conditions
12+
// are met:
13+
//
14+
// - Redistributions of source code must retain the above copyright
15+
// notice, this list of conditions and the following disclaimer.
16+
//
17+
// - Redistributions in binary form must reproduce the above copyright
18+
// notice, this list of conditions and the following disclaimer in
19+
// the documentation and/or other materials provided with the
20+
// distribution.
21+
//
22+
// - Neither the name of "The Computer Language Benchmarks Game" nor
23+
// the name of "The Computer Language Shootout Benchmarks" nor the
24+
// names of its contributors may be used to endorse or promote
25+
// products derived from this software without specific prior
26+
// written permission.
27+
//
28+
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
29+
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
30+
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
31+
// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
32+
// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
33+
// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
34+
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
35+
// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
36+
// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
37+
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
38+
// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
39+
// OF THE POSSIBILITY OF SUCH DAMAGE.
1040

1141
// FIXME(#13725) windows needs fixing.
1242
// ignore-win32

0 commit comments

Comments
 (0)