From ec8ef0d24d5d38dd4c841d06ee2c72b7c64e5a6f Mon Sep 17 00:00:00 2001 From: Guillaume Pinot Date: Thu, 5 Jun 2014 09:55:49 +0200 Subject: [PATCH] relicense shootout-meteor.rs part of #14248, fix #14420 Removed @richo's contribution (outdated comment) Quoting @brson: let's move forward with this one. The only statement I'm missing is @richo's and it sounds like his was a minor patch. --- src/etc/licenseck.py | 1 + src/test/bench/shootout-meteor.rs | 50 ++++++++++++++++++++++++------- 2 files changed, 41 insertions(+), 10 deletions(-) diff --git a/src/etc/licenseck.py b/src/etc/licenseck.py index 3287aae80e3..1122fc96d24 100644 --- a/src/etc/licenseck.py +++ b/src/etc/licenseck.py @@ -42,6 +42,7 @@ exceptions = [ "libstd/sync/spsc_queue.rs", # BSD "libstd/sync/mpmc_bounded_queue.rs", # BSD "libsync/mpsc_intrusive.rs", # BSD + "test/bench/shootout-meteor.rs", # BSD ] def check_license(name, contents): diff --git a/src/test/bench/shootout-meteor.rs b/src/test/bench/shootout-meteor.rs index ab3f6892bb8..6f4aef27b63 100644 --- a/src/test/bench/shootout-meteor.rs +++ b/src/test/bench/shootout-meteor.rs @@ -1,12 +1,42 @@ -// Copyright 2013-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 or the MIT license -// , 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) 2013-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. #![feature(phase)] #[phase(syntax)] extern crate green; @@ -184,7 +214,7 @@ fn get_id(m: u64) -> u8 { fail!("{:016x} does not have a valid identifier", m); } -// Converts a list of mask to a String. +// Converts a list of mask to a Vec. fn to_vec(raw_sol: &List) -> Vec { let mut sol = Vec::from_elem(50, '.' as u8); for &m in raw_sol.iter() { @@ -198,7 +228,7 @@ fn to_vec(raw_sol: &List) -> Vec { sol } -// Prints a solution in String form. +// Prints a solution in Vec form. fn print_sol(sol: &Vec) { for (i, c) in sol.iter().enumerate() { if (i) % 5 == 0 { println!(""); }