From 137e1e1277754b34d4aff3854fbc9e7424e8e371 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 23 May 2024 16:36:36 -0400 Subject: [PATCH 1/4] Replace deprecated LGPL-3.0 SPDX identifier with LGPL-3.0-or-later MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Using LGPL-3.0-or-later instead of LGPL-3.0-only is based on the “any later version” language in the source-file headers, although in #23, contributors were asked about “LGPL 3” but not about later versions. --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b020298..cad962f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ documentation = "https://docs.rs/priority-queue" readme = "README.md" keywords = ["priority", "queue", "heap"] categories = ["data-structures", "algorithms"] -license = "LGPL-3.0 OR MPL-2.0" +license = "LGPL-3.0-or-later OR MPL-2.0" edition = "2021" [build-dependencies] From e2f90b0811c252f80165bbdb19233464289e428f Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 23 May 2024 16:46:57 -0400 Subject: [PATCH 2/4] =?UTF-8?q?Add=20MPL-2.0=20=E2=80=9CExhibit=20A?= =?UTF-8?q?=E2=80=9D=20text=20to=20source=20file=20headers?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- benches/priority_queue.rs | 8 ++++++++ src/core_iterators.rs | 8 ++++++++ src/double_priority_queue/iterators.rs | 8 ++++++++ src/double_priority_queue/mod.rs | 8 ++++++++ src/lib.rs | 8 ++++++++ src/priority_queue/iterators.rs | 8 ++++++++ src/priority_queue/mod.rs | 8 ++++++++ src/store.rs | 8 ++++++++ tests/double_priority_queue.rs | 8 ++++++++ tests/priority_queue.rs | 8 ++++++++ 10 files changed, 80 insertions(+) diff --git a/benches/priority_queue.rs b/benches/priority_queue.rs index 20f6bcc..da3d9a9 100644 --- a/benches/priority_queue.rs +++ b/benches/priority_queue.rs @@ -8,6 +8,8 @@ * (at your option) any later version, or (at your opinion) under the terms * of the Mozilla Public License version 2.0. * + * ---- + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -16,6 +18,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . * + * ---- + * + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. + * */ #![cfg_attr(feature = "benchmarks", feature(test))] diff --git a/src/core_iterators.rs b/src/core_iterators.rs index 31fac00..5e5535e 100644 --- a/src/core_iterators.rs +++ b/src/core_iterators.rs @@ -8,6 +8,8 @@ * (at your option) any later version, or (at your opinion) under the terms * of the Mozilla Public License version 2.0. * + * ---- + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -16,6 +18,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . * + * ---- + * + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. + * */ //! This module defines iterator types that are used with //! both the [`PriorityQueue`](super::PriorityQueue) and the [`DoublePriorityQueue`](super::DoublePriorityQueue) diff --git a/src/double_priority_queue/iterators.rs b/src/double_priority_queue/iterators.rs index e10c511..6cd5f51 100644 --- a/src/double_priority_queue/iterators.rs +++ b/src/double_priority_queue/iterators.rs @@ -8,6 +8,8 @@ * (at your option) any later version, or (at your opinion) under the terms * of the Mozilla Public License version 2.0. * + * ---- + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -16,6 +18,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . * + * ---- + * + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. + * */ //! This module defines iterator types that are used only with the [`DoublePriorityQueue`] //! diff --git a/src/double_priority_queue/mod.rs b/src/double_priority_queue/mod.rs index c9ff33d..a6393e5 100644 --- a/src/double_priority_queue/mod.rs +++ b/src/double_priority_queue/mod.rs @@ -8,6 +8,8 @@ * (at your option) any later version, or (at your opinion) under the terms * of the Mozilla Public License version 2.0. * + * ---- + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -16,6 +18,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . * + * ---- + * + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. + * */ //! This module contains the [`DoublePriorityQueue`] type and the related iterators. //! diff --git a/src/lib.rs b/src/lib.rs index 6729819..9cf8517 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,6 +8,8 @@ * (at your option) any later version, or (at your opinion) under the terms * of the Mozilla Public License version 2.0. * + * ---- + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -16,6 +18,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . * + * ---- + * + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. + * */ //! This crate provides 2 main data structures: diff --git a/src/priority_queue/iterators.rs b/src/priority_queue/iterators.rs index 58e7f82..dd8a7ec 100644 --- a/src/priority_queue/iterators.rs +++ b/src/priority_queue/iterators.rs @@ -8,6 +8,8 @@ * (at your option) any later version, or (at your opinion) under the terms * of the Mozilla Public License version 2.0. * + * ---- + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -16,6 +18,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . * + * ---- + * + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. + * */ //! This module defines iterator types that are used only with the [`PriorityQueue`]. //! diff --git a/src/priority_queue/mod.rs b/src/priority_queue/mod.rs index 99bdef2..4c6b9e6 100644 --- a/src/priority_queue/mod.rs +++ b/src/priority_queue/mod.rs @@ -8,6 +8,8 @@ * (at your option) any later version, or (at your opinion) under the terms * of the Mozilla Public License version 2.0. * + * ---- + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -16,6 +18,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . * + * ---- + * + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. + * */ //! This module contains the [`PriorityQueue`] type and the related iterators. diff --git a/src/store.rs b/src/store.rs index 967a5b3..f6d1bb3 100644 --- a/src/store.rs +++ b/src/store.rs @@ -8,6 +8,8 @@ * (at your option) any later version, or (at your opinion) under the terms * of the Mozilla Public License version 2.0. * + * ---- + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -16,6 +18,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . * + * ---- + * + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. + * */ #[cfg(not(feature = "std"))] use std::vec::Vec; diff --git a/tests/double_priority_queue.rs b/tests/double_priority_queue.rs index cd6de8b..fdb4a77 100644 --- a/tests/double_priority_queue.rs +++ b/tests/double_priority_queue.rs @@ -8,6 +8,8 @@ * (at your option) any later version, or (at your opinion) under the terms * of the Mozilla Public License version 2.0. * + * ---- + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -16,6 +18,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . * + * ---- + * + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. + * */ #[cfg(test)] diff --git a/tests/priority_queue.rs b/tests/priority_queue.rs index ca0b70a..7810261 100644 --- a/tests/priority_queue.rs +++ b/tests/priority_queue.rs @@ -8,6 +8,8 @@ * (at your option) any later version, or (at your opinion) under the terms * of the Mozilla Public License version 2.0. * + * ---- + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -16,6 +18,12 @@ * You should have received a copy of the GNU Lesser General Public License * along with this program. If not, see . * + * ---- + * + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. + * */ #[cfg(test)] From 85e4fb6a23fb96ecc5b60a11b251e0d6cc164e82 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 23 May 2024 16:48:32 -0400 Subject: [PATCH 3/4] Fix a minor typo in license/copyright headers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace “at your opinion” with “at your option” --- benches/priority_queue.rs | 2 +- src/core_iterators.rs | 2 +- src/double_priority_queue/iterators.rs | 2 +- src/double_priority_queue/mod.rs | 2 +- src/lib.rs | 2 +- src/priority_queue/iterators.rs | 2 +- src/priority_queue/mod.rs | 2 +- src/store.rs | 2 +- tests/double_priority_queue.rs | 2 +- tests/priority_queue.rs | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/benches/priority_queue.rs b/benches/priority_queue.rs index da3d9a9..4a195ae 100644 --- a/benches/priority_queue.rs +++ b/benches/priority_queue.rs @@ -5,7 +5,7 @@ * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version, or (at your opinion) under the terms + * (at your option) any later version, or (at your option) under the terms * of the Mozilla Public License version 2.0. * * ---- diff --git a/src/core_iterators.rs b/src/core_iterators.rs index 5e5535e..be9a68d 100644 --- a/src/core_iterators.rs +++ b/src/core_iterators.rs @@ -5,7 +5,7 @@ * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version, or (at your opinion) under the terms + * (at your option) any later version, or (at your option) under the terms * of the Mozilla Public License version 2.0. * * ---- diff --git a/src/double_priority_queue/iterators.rs b/src/double_priority_queue/iterators.rs index 6cd5f51..d27e577 100644 --- a/src/double_priority_queue/iterators.rs +++ b/src/double_priority_queue/iterators.rs @@ -5,7 +5,7 @@ * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version, or (at your opinion) under the terms + * (at your option) any later version, or (at your option) under the terms * of the Mozilla Public License version 2.0. * * ---- diff --git a/src/double_priority_queue/mod.rs b/src/double_priority_queue/mod.rs index a6393e5..dd09f91 100644 --- a/src/double_priority_queue/mod.rs +++ b/src/double_priority_queue/mod.rs @@ -5,7 +5,7 @@ * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version, or (at your opinion) under the terms + * (at your option) any later version, or (at your option) under the terms * of the Mozilla Public License version 2.0. * * ---- diff --git a/src/lib.rs b/src/lib.rs index 9cf8517..69151fa 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -5,7 +5,7 @@ * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version, or (at your opinion) under the terms + * (at your option) any later version, or (at your option) under the terms * of the Mozilla Public License version 2.0. * * ---- diff --git a/src/priority_queue/iterators.rs b/src/priority_queue/iterators.rs index dd8a7ec..e2d1c0b 100644 --- a/src/priority_queue/iterators.rs +++ b/src/priority_queue/iterators.rs @@ -5,7 +5,7 @@ * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version, or (at your opinion) under the terms + * (at your option) any later version, or (at your option) under the terms * of the Mozilla Public License version 2.0. * * ---- diff --git a/src/priority_queue/mod.rs b/src/priority_queue/mod.rs index 4c6b9e6..70ac22c 100644 --- a/src/priority_queue/mod.rs +++ b/src/priority_queue/mod.rs @@ -5,7 +5,7 @@ * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version, or (at your opinion) under the terms + * (at your option) any later version, or (at your option) under the terms * of the Mozilla Public License version 2.0. * * ---- diff --git a/src/store.rs b/src/store.rs index f6d1bb3..9b6ae5a 100644 --- a/src/store.rs +++ b/src/store.rs @@ -5,7 +5,7 @@ * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version, or (at your opinion) under the terms + * (at your option) any later version, or (at your option) under the terms * of the Mozilla Public License version 2.0. * * ---- diff --git a/tests/double_priority_queue.rs b/tests/double_priority_queue.rs index fdb4a77..4d3b280 100644 --- a/tests/double_priority_queue.rs +++ b/tests/double_priority_queue.rs @@ -5,7 +5,7 @@ * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version, or (at your opinion) under the terms + * (at your option) any later version, or (at your option) under the terms * of the Mozilla Public License version 2.0. * * ---- diff --git a/tests/priority_queue.rs b/tests/priority_queue.rs index 7810261..9acf62d 100644 --- a/tests/priority_queue.rs +++ b/tests/priority_queue.rs @@ -5,7 +5,7 @@ * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Lesser General Public License as published by * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version, or (at your opinion) under the terms + * (at your option) any later version, or (at your option) under the terms * of the Mozilla Public License version 2.0. * * ---- From b36ab6a4296002cf752c4d92c6da5e997dfb1589 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 23 May 2024 16:49:19 -0400 Subject: [PATCH 4/4] Add the standard license/copyright comment to test-nostd/src/lib.rs --- test-nostd/src/lib.rs | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/test-nostd/src/lib.rs b/test-nostd/src/lib.rs index 59dfd46..d71d16d 100644 --- a/test-nostd/src/lib.rs +++ b/test-nostd/src/lib.rs @@ -1,3 +1,31 @@ +/* + * Copyright 2017 Gianmarco Garrisi and contributors + * + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version, or (at your option) under the terms + * of the Mozilla Public License version 2.0. + * + * ---- + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * ---- + * + * This Source Code Form is subject to the terms of the Mozilla Public License, + * v. 2.0. If a copy of the MPL was not distributed with this file, You can + * obtain one at http://mozilla.org/MPL/2.0/. + * + */ + #![no_std] use core::hash::BuildHasherDefault;