diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-10-25 18:33:05 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-10-25 18:33:05 -0700 |
| commit | 49d9135eeaefc5ab267c2ee2bf1c28e245320709 (patch) | |
| tree | d090f7a1efe0ba54eb60f65dbc1fa1be1836d5ad | |
| parent | 5e91ac10b65a4c20915868d3af3c06f1d3d3cada (diff) | |
| download | rust-49d9135eeaefc5ab267c2ee2bf1c28e245320709.tar.gz rust-49d9135eeaefc5ab267c2ee2bf1c28e245320709.zip | |
Tidy
| -rw-r--r-- | src/etc/licenseck.py | 2 | ||||
| -rw-r--r-- | src/libstd/rt/mpmc_bounded_queue.rs | 6 | ||||
| -rw-r--r-- | src/libstd/rt/mpsc_queue.rs | 6 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/etc/licenseck.py b/src/etc/licenseck.py index 1e0c541cd89..91231430d2a 100644 --- a/src/etc/licenseck.py +++ b/src/etc/licenseck.py @@ -76,6 +76,8 @@ exceptions = [ "rt/isaac/randport.cpp", # public domain "rt/isaac/rand.h", # public domain "rt/isaac/standard.h", # public domain + "libstd/rt/mpsc_queue.rs", # BSD + "libstd/rt/mpmc_bounded_queue.rs", # BSD ] def check_license(name, contents): diff --git a/src/libstd/rt/mpmc_bounded_queue.rs b/src/libstd/rt/mpmc_bounded_queue.rs index ea5d1050c18..a8ef5364276 100644 --- a/src/libstd/rt/mpmc_bounded_queue.rs +++ b/src/libstd/rt/mpmc_bounded_queue.rs @@ -2,14 +2,14 @@ * Copyright (c) 2010-2011 Dmitry Vyukov. All rights reserved. * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. 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. - * + * * THIS SOFTWARE IS PROVIDED BY DMITRY VYUKOV "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 diff --git a/src/libstd/rt/mpsc_queue.rs b/src/libstd/rt/mpsc_queue.rs index 93e66838a42..38186aa7e8c 100644 --- a/src/libstd/rt/mpsc_queue.rs +++ b/src/libstd/rt/mpsc_queue.rs @@ -2,14 +2,14 @@ * Copyright (c) 2010-2011 Dmitry Vyukov. All rights reserved. * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: - * + * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. - * + * * 2. 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. - * + * * THIS SOFTWARE IS PROVIDED BY DMITRY VYUKOV "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 |