diff options
| author | bors <bors@rust-lang.org> | 2014-07-27 00:31:13 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-07-27 00:31:13 +0000 |
| commit | 3d7a7f645f91371a7fbaf9d8b31e33d89a045aa4 (patch) | |
| tree | a33ae97b120e2f0fe06059ace9233218fddcf802 /src | |
| parent | 32e521ffab81572fc8c9b0b3c7537a092f058371 (diff) | |
| parent | 92792248c1a90151ad3f5cd2bed60d4fec495d0f (diff) | |
| download | rust-3d7a7f645f91371a7fbaf9d8b31e33d89a045aa4.tar.gz rust-3d7a7f645f91371a7fbaf9d8b31e33d89a045aa4.zip | |
auto merge of #16006 : TeXitoi/rust/relicense-shootout-k-nucleotide, r=brson
Everyone agreed except @thestinger. As @thestinger contribution on this file is trivial, we can relicense it. Related to #14248, close #15330 @brson OK?
Diffstat (limited to 'src')
| -rw-r--r-- | src/etc/licenseck.py | 1 | ||||
| -rw-r--r-- | src/test/bench/shootout-k-nucleotide.rs | 46 |
2 files changed, 39 insertions, 8 deletions
diff --git a/src/etc/licenseck.py b/src/etc/licenseck.py index 6fb4131cf71..de0d5c18766 100644 --- a/src/etc/licenseck.py +++ b/src/etc/licenseck.py @@ -44,6 +44,7 @@ exceptions = [ "libsync/mpsc_intrusive.rs", # BSD "test/bench/shootout-binarytrees.rs", # BSD "test/bench/shootout-fannkuch-redux.rs", # BSD + "test/bench/shootout-k-nucleotide.rs", # BSD "test/bench/shootout-mandelbrot.rs", # BSD "test/bench/shootout-meteor.rs", # BSD "test/bench/shootout-pidigits.rs", # BSD diff --git a/src/test/bench/shootout-k-nucleotide.rs b/src/test/bench/shootout-k-nucleotide.rs index b31b524cf9b..59cbc6bc004 100644 --- a/src/test/bench/shootout-k-nucleotide.rs +++ b/src/test/bench/shootout-k-nucleotide.rs @@ -1,12 +1,42 @@ -// Copyright 2014 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. +// The Computer Language Benchmarks Game +// http://benchmarksgame.alioth.debian.org/ // -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. +// contributed by the Rust Project Developers + +// Copyright (c) 2014 The Rust Project Developers +// +// All rights reserved. +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions +// are met: +// +// - Redistributions of source code must retain the above copyright +// notice, this list of conditions and the following disclaimer. +// +// - Redistributions in binary form must reproduce the above copyright +// notice, this list of conditions and the following disclaimer in +// the documentation and/or other materials provided with the +// distribution. +// +// - Neither the name of "The Computer Language Benchmarks Game" nor +// the name of "The Computer Language Shootout Benchmarks" nor the +// names of its contributors may be used to endorse or promote +// products derived from this software without specific prior +// written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +// FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +// COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +// INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +// HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, +// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +// ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED +// OF THE POSSIBILITY OF SUCH DAMAGE. // ignore-android see #10393 #13206 |
