Skip to content

Commit edec96b

Browse files
committed
Relicense shootout-fasta.rs ti the shootout license.
Everyone agreed. Fix #17072
1 parent a182f13 commit edec96b

File tree

2 files changed

+40
-14
lines changed

2 files changed

+40
-14
lines changed

src/etc/licenseck.py

+1
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
"test/bench/shootout-binarytrees.rs", # BSD
4646
"test/bench/shootout-chameneos-redux.rs", # BSD
4747
"test/bench/shootout-fannkuch-redux.rs", # BSD
48+
"test/bench/shootout-fasta.rs", # BSD
4849
"test/bench/shootout-k-nucleotide.rs", # BSD
4950
"test/bench/shootout-mandelbrot.rs", # BSD
5051
"test/bench/shootout-meteor.rs", # BSD

src/test/bench/shootout-fasta.rs

+39-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,42 @@
1-
// Copyright 2012-2013 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
105

11-
/* -*- mode: rust; indent-tabs-mode: nil -*-
12-
* Implementation of 'fasta' benchmark from
13-
* Computer Language Benchmarks Game
14-
* http://shootout.alioth.debian.org/
15-
*/
6+
// Copyright (c) 2012-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.
1640

1741
use std::io;
1842
use std::io::{BufferedWriter, File};
@@ -36,7 +60,8 @@ impl MyRandom {
3660

3761
struct AAGen<'a> {
3862
rng: &'a mut MyRandom,
39-
data: Vec<(u32, u8)> }
63+
data: Vec<(u32, u8)>
64+
}
4065
impl<'a> AAGen<'a> {
4166
fn new<'b>(rng: &'b mut MyRandom, aa: &[(char, f32)]) -> AAGen<'b> {
4267
let mut cum = 0.;

0 commit comments

Comments
 (0)