From f21b8dc936c5dda551eb77b4594f784d60b056d0 Mon Sep 17 00:00:00 2001 From: edef Date: Sat, 20 Aug 2016 23:45:01 +0200 Subject: [PATCH] Update the license headers for MIT/Apache --- benches/generator.rs | 5 ++++- benches/syscall.rs | 5 ++++- src/arch/mod.rs | 5 ++++- src/arch/or1k.rs | 5 ++++- src/arch/x86.rs | 5 ++++- src/arch/x86_64.rs | 5 ++++- src/context.rs | 5 ++++- src/debug/mod.rs | 5 ++++- src/debug/valgrind.rs | 5 ++++- src/generator.rs | 5 ++++- src/lib.rs | 5 ++++- src/os/mod.rs | 5 ++++- src/os/sys.rs | 5 ++++- src/stack.rs | 5 ++++- tests/fpe.rs | 5 ++++- tests/generator.rs | 5 ++++- tests/iterator.rs | 5 ++++- tests/stack.rs | 5 ++++- 18 files changed, 72 insertions(+), 18 deletions(-) diff --git a/benches/generator.rs b/benches/generator.rs index 17d9e15..802bc77 100644 --- a/benches/generator.rs +++ b/benches/generator.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) whitequark -// See the LICENSE file included in this distribution. +// 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. #![feature(test)] extern crate test; extern crate fringe; diff --git a/benches/syscall.rs b/benches/syscall.rs index 3275b80..94d721f 100644 --- a/benches/syscall.rs +++ b/benches/syscall.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef -// See the LICENSE file included in this distribution. +// 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. #![cfg(target_os = "linux")] #![feature(asm, test)] extern crate test; diff --git a/src/arch/mod.rs b/src/arch/mod.rs index 61919db..06a5afb 100644 --- a/src/arch/mod.rs +++ b/src/arch/mod.rs @@ -1,7 +1,10 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef , // whitequark -// See the LICENSE file included in this distribution. +// 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. pub use self::imp::*; diff --git a/src/arch/or1k.rs b/src/arch/or1k.rs index 0b92b7b..863b373 100644 --- a/src/arch/or1k.rs +++ b/src/arch/or1k.rs @@ -1,7 +1,10 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef , // whitequark -// See the LICENSE file included in this distribution. +// 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. // To understand the machine code in this file, keep in mind these facts: // * OR1K C ABI has a "red zone": 128 bytes under the top of the stack diff --git a/src/arch/x86.rs b/src/arch/x86.rs index 730d87b..4954ede 100644 --- a/src/arch/x86.rs +++ b/src/arch/x86.rs @@ -1,7 +1,10 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef , // whitequark -// See the LICENSE file included in this distribution. +// 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. // To understand the machine code in this file, keep in mind these facts: // * i686 SysV C ABI requires the stack to be aligned at function entry, diff --git a/src/arch/x86_64.rs b/src/arch/x86_64.rs index 47e490f..5cd668a 100644 --- a/src/arch/x86_64.rs +++ b/src/arch/x86_64.rs @@ -1,7 +1,10 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef , // whitequark -// See the LICENSE file included in this distribution. +// 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. // To understand the code in this file, keep in mind these two facts: // * x86_64 SysV C ABI has a "red zone": 128 bytes under the top of the stack diff --git a/src/context.rs b/src/context.rs index 6e864fd..8129c74 100644 --- a/src/context.rs +++ b/src/context.rs @@ -1,7 +1,10 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef , // whitequark -// See the LICENSE file included in this distribution. +// 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. use stack; use debug; use arch; diff --git a/src/debug/mod.rs b/src/debug/mod.rs index 4fe48d7..06e0241 100644 --- a/src/debug/mod.rs +++ b/src/debug/mod.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef -// See the LICENSE file included in this distribution. +// 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. pub use self::imp::*; #[cfg(feature = "valgrind")] diff --git a/src/debug/valgrind.rs b/src/debug/valgrind.rs index 9979cb9..07eac7a 100644 --- a/src/debug/valgrind.rs +++ b/src/debug/valgrind.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef -// See the LICENSE file included in this distribution. +// 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. extern crate valgrind; use stack; diff --git a/src/generator.rs b/src/generator.rs index c181df0..f2d665a 100644 --- a/src/generator.rs +++ b/src/generator.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) whitequark -// See the LICENSE file included in this distribution. +// 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. //! Generators. //! diff --git a/src/lib.rs b/src/lib.rs index aa98ab7..3650583 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef -// See the LICENSE file included in this distribution. +// 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. #![feature(asm, naked_functions)] #![cfg_attr(test, feature(test, thread_local, const_fn))] #![no_std] diff --git a/src/os/mod.rs b/src/os/mod.rs index fc93def..4fd624e 100644 --- a/src/os/mod.rs +++ b/src/os/mod.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef -// See the LICENSE file included in this distribution. +// 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. extern crate std; use self::std::io::Error as IoError; use stack; diff --git a/src/os/sys.rs b/src/os/sys.rs index ca25c35..748da41 100644 --- a/src/os/sys.rs +++ b/src/os/sys.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef -// See the LICENSE file included in this distribution. +// 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. extern crate std; extern crate libc; diff --git a/src/stack.rs b/src/stack.rs index f95c02d..62014cb 100644 --- a/src/stack.rs +++ b/src/stack.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) edef -// See the LICENSE file included in this distribution. +// 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. /// A trait for objects that hold ownership of a stack. pub trait Stack { diff --git a/tests/fpe.rs b/tests/fpe.rs index e140d52..6f0bb30 100644 --- a/tests/fpe.rs +++ b/tests/fpe.rs @@ -1,7 +1,10 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) Ben Segall // Copyright (c) edef -// See the LICENSE file included in this distribution. +// 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. #![cfg(target_os = "linux")] #![feature(test)] #![feature(thread_local)] diff --git a/tests/generator.rs b/tests/generator.rs index 650fe88..6f78ed6 100644 --- a/tests/generator.rs +++ b/tests/generator.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) whitequark -// See the LICENSE file included in this distribution. +// 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. extern crate fringe; use fringe::{OsStack, SliceStack}; diff --git a/tests/iterator.rs b/tests/iterator.rs index 53620d4..c5b8d51 100644 --- a/tests/iterator.rs +++ b/tests/iterator.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) whitequark -// See the LICENSE file included in this distribution. +// 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. extern crate fringe; use fringe::OsStack; diff --git a/tests/stack.rs b/tests/stack.rs index 6d6755b..9c87d65 100644 --- a/tests/stack.rs +++ b/tests/stack.rs @@ -1,6 +1,9 @@ // This file is part of libfringe, a low-level green threading library. // Copyright (c) whitequark -// See the LICENSE file included in this distribution. +// 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. extern crate fringe; use fringe::{Stack, SliceStack, OsStack};