Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Relicense all shootout benchmarks to use their preferred license #14248

Closed
10 tasks done
brson opened this issue May 16, 2014 · 18 comments
Closed
10 tasks done

Relicense all shootout benchmarks to use their preferred license #14248

brson opened this issue May 16, 2014 · 18 comments
Labels
E-easy Call for participation: Easy difficulty. Experience needed to fix: Not much. Good first issue.

Comments

@brson
Copy link
Contributor

brson commented May 16, 2014

The shootout will only accept code that is under a particular variation of the BSD license. We are the authoritative source for this code at the moment, but it's under the Rust license. We can't participate in the shootout on an equal footing without using the proper license.

For each benchmark, either contact all the authors and get written permission to relicense, or just rewrite it; put the correct license on the files and add them as exceptions to licenseck.py.

Have statements from

  • alexcrichton
  • SimonSapin
  • pcwalton
  • edwardw
  • kimundi
  • TeXitoi
  • erickt
  • Thiez
  • Kevin Butler
  • BurntSushi (Andrew Gallant)
@thestinger
Copy link
Contributor

Here's the specific license: http://benchmarksgame.alioth.debian.org/license.php

It actually looks like a three-clause BSD license with the advertising/promotion clause included.

@brson
Copy link
Contributor Author

brson commented May 16, 2014

Ah, yeah, not two-clause BSD.

@brson brson added the E-easy label May 22, 2014
@brson brson changed the title Relicense all shootout benchmarks as two-clause BSD Relicense all shootout benchmarks to use their preferred license May 22, 2014
@brson
Copy link
Contributor Author

brson commented May 22, 2014

Updated OP to reflect that this is not "two-clause" BSD.

@Thiez
Copy link
Contributor

Thiez commented May 22, 2014

I've touched some of that code a long time ago, not sure if I changed enough to qualify as 'author', but if I have, I hereby grant permission to relicense my stuff to whatever is the required version of the BSD-license.

@TeXitoi
Copy link
Contributor

TeXitoi commented May 25, 2014

I rewrited or modified almost every benchmark. I grant permission to relicense my contributions to the shootout license. (Even under the WTFPLv2 if anyone want)

@brson
Copy link
Contributor Author

brson commented May 29, 2014

I've updated the op with the list of people from whom I have statements on file.

@brson
Copy link
Contributor Author

brson commented May 29, 2014

For those interested in helping with this, this is the statement I've asked the stragglers in #14420 to email me:


I agree to relicense any previous contributions to http://github.com/mozilla/rust according to the following terms:

// The Computer Language Benchmarks Game
// http://benchmarksgame.alioth.debian.org/
// 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.

TeXitoi added a commit to TeXitoi/rust that referenced this issue Jun 5, 2014
part of rust-lang#14248, fix rust-lang#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.
bors added a commit that referenced this issue Jun 6, 2014
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.
@BurntSushi
Copy link
Member

I agree to re-license my contributions under the license above.

I sent mail to @brson a couple days ago. My name (Andrew Gallant) appears in the first comment. :)

TeXitoi added a commit to TeXitoi/rust that referenced this issue Jun 7, 2014
Part of rust-lang#14248

The authors are @pcwalton and @BurntSushi, and we have their agreement.
bors added a commit that referenced this issue Jun 8, 2014
…rson

Part of #14248

The authors are @pcwalton and @BurntSushi, and we have their agreement.

@brson OK?
TeXitoi added a commit to TeXitoi/rust that referenced this issue Jun 8, 2014
Part of rust-lang#14248

Main contributors are @pcwalton, @alexcrichton and me.  Only
@dguenther appear in git blame as a minor contribution, but it is
only adding the rust license, so removed by this relicensing.
bors added a commit that referenced this issue Jun 8, 2014
…, r=brson

Part of #14248

Main contributors are @pcwalton, @alexcrichton and me.  Only
@dguenther appear in git blame as a minor contribution, but it is
only adding the rust license, so removed by this relicensing.

@brson OK?
mcpherrinm pushed a commit to mcpherrinm/rust that referenced this issue Jun 10, 2014
part of rust-lang#14248, fix rust-lang#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.
mcpherrinm pushed a commit to mcpherrinm/rust that referenced this issue Jun 10, 2014
Part of rust-lang#14248

The authors are @pcwalton and @BurntSushi, and we have their agreement.
mcpherrinm pushed a commit to mcpherrinm/rust that referenced this issue Jun 10, 2014
Part of rust-lang#14248

Main contributors are @pcwalton, @alexcrichton and me.  Only
@dguenther appear in git blame as a minor contribution, but it is
only adding the rust license, so removed by this relicensing.
TeXitoi added a commit to TeXitoi/rust that referenced this issue Jun 12, 2014
@kud1ing
Copy link

kud1ing commented Jul 3, 2014

http://benchmarksgame.alioth.debian.org/u64q/rust.php seem to have switched to Rust 0.11 but do not show results yet. Do they need to be pinged about the license changes or does it just take time?

@TeXitoi
Copy link
Contributor

TeXitoi commented Jul 3, 2014

@kud1ing I think I've seen somewhere that they want we propose our programs using the official procedure.

@kud1ing
Copy link

kud1ing commented Jul 4, 2014

I've opened #15408 for this.

@tedhorst
Copy link
Contributor

tedhorst commented Jul 4, 2014

I agree to relicense any previous contributions to http://github.com/mozilla/rust according to the term of the Computer Language Benchmarks Game license (http://benchmarksgame.alioth.debian.org/license.php)

TeXitoi added a commit to TeXitoi/rust that referenced this issue Jul 4, 2014
bors added a commit that referenced this issue Jul 24, 2014
TeXitoi added a commit to TeXitoi/rust that referenced this issue Jul 26, 2014
Everyone agreed except @thestinger. As @thestinger contribution on this file is trivial,
we can relicense it.

Related to rust-lang#14248, close rust-lang#15330
@killerswan
Copy link
Contributor

I'm not on your list above, but since I wrote the first versions of a couple of these benchmarks, I, too, agree to relicense my contributions to the benchmarks under src/test/bench/ according to the term of the Computer Language Benchmarks Game license (http://benchmarksgame.alioth.debian.org/license.php).

bors added a commit that referenced this issue Jul 27, 2014
…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?
bors added a commit that referenced this issue Sep 27, 2014
…=brson

Everyone agreed.

Fix #17078 

#14248 seems completed, as every src/test/bench/shootout-*.rs are relicensed after acceptation of this PR except:
- shootout-ackermann.rs: obsolete shootout bench
- shootout-fibo.rs:  obsolete shootout bench
- shootout-k-nucleotide-pipes.rs: slower that shootout-k-nucleotide-pipes.rs (and not so interesting as a benchmark)
- shootout-pfib.rs: does not seems related to the shootout

@brson OK?
@TeXitoi
Copy link
Contributor

TeXitoi commented Sep 28, 2014

This issue seems completed, as every src/test/bench/shootout-*.rs are relicensed except:

  • shootout-ackermann.rs: obsolete shootout bench
  • shootout-fibo.rs: obsolete shootout bench
  • shootout-k-nucleotide-pipes.rs: slower that shootout-k-nucleotide.rs (and not so interesting as a benchmark)
  • shootout-pfib.rs: does not seems related to the shootout

OK to close?

@huonw
Copy link
Member

huonw commented Sep 28, 2014

shootout-k-nucleotide-pipes.rs: slower that shootout-k-nucleotide-pipes.rs (and not so interesting as a benchmark)

Is one of these meant to be shootout-k-nucleotide.rs?

@TeXitoi
Copy link
Contributor

TeXitoi commented Sep 28, 2014

oups, typo, corrected in the comment. shootout-k-nucleotide-pipe.rs is supposed to do the same thing as shootout-k-nucleotide.rs, with a task for each k, copying strings readed on stdin. Thus, it is extremelly inefficient.

@alexcrichton
Copy link
Member

Awesome work, thanks for taking the charge on this @TeXitoi!

@killerswan
Copy link
Contributor

@TeXitoi I wrote shootout-k-nucleotide.rs, and then somebody ported it to the pipes interface which I'm not sure the status of anymore. At one point I believe the pipes version was actually faster, but no idea now.

lnicola pushed a commit to lnicola/rust that referenced this issue Mar 13, 2023
…Veykril

fix: show diagnostic for } token followed by else in let else statement

fix rust-lang#14221

My thinking is to check if the `expr` after `=` is block like when parse `let ... lese` , and if so, emit error.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
E-easy Call for participation: Easy difficulty. Experience needed to fix: Not much. Good first issue.
Projects
None yet
Development

No branches or pull requests

10 participants