Skip to content

Commit a577ab0

Browse files
garro95garro95
authored
Merge pull request #54 from musicinmybrain/license-things
Some licensing-related housekeeping
2 parents efe31e8 + b36ab6a commit a577ab0

File tree

12 files changed

+119
-11
lines changed

12 files changed

+119
-11
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ documentation = "https://docs.rs/priority-queue"
88
readme = "README.md"
99
keywords = ["priority", "queue", "heap"]
1010
categories = ["data-structures", "algorithms"]
11-
license = "LGPL-3.0 OR MPL-2.0"
11+
license = "LGPL-3.0-or-later OR MPL-2.0"
1212
edition = "2021"
1313

1414
[build-dependencies]

‎benches/priority_queue.rs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
77
* the Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version, or (at your opinion) under the terms
8+
* (at your option) any later version, or (at your option) under the terms
99
* of the Mozilla Public License version 2.0.
1010
*
11+
* ----
12+
*
1113
* This program is distributed in the hope that it will be useful,
1214
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1315
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,6 +18,12 @@
1618
* You should have received a copy of the GNU Lesser General Public License
1719
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1820
*
21+
* ----
22+
*
23+
* This Source Code Form is subject to the terms of the Mozilla Public License,
24+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
25+
* obtain one at http://mozilla.org/MPL/2.0/.
26+
*
1927
*/
2028

2129
#![cfg_attr(feature = "benchmarks", feature(test))]

‎src/core_iterators.rs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
77
* the Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version, or (at your opinion) under the terms
8+
* (at your option) any later version, or (at your option) under the terms
99
* of the Mozilla Public License version 2.0.
1010
*
11+
* ----
12+
*
1113
* This program is distributed in the hope that it will be useful,
1214
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1315
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,6 +18,12 @@
1618
* You should have received a copy of the GNU Lesser General Public License
1719
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1820
*
21+
* ----
22+
*
23+
* This Source Code Form is subject to the terms of the Mozilla Public License,
24+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
25+
* obtain one at http://mozilla.org/MPL/2.0/.
26+
*
1927
*/
2028
//! This module defines iterator types that are used with
2129
//! both the [`PriorityQueue`](super::PriorityQueue) and the [`DoublePriorityQueue`](super::DoublePriorityQueue)

‎src/double_priority_queue/iterators.rs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
77
* the Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version, or (at your opinion) under the terms
8+
* (at your option) any later version, or (at your option) under the terms
99
* of the Mozilla Public License version 2.0.
1010
*
11+
* ----
12+
*
1113
* This program is distributed in the hope that it will be useful,
1214
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1315
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,6 +18,12 @@
1618
* You should have received a copy of the GNU Lesser General Public License
1719
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1820
*
21+
* ----
22+
*
23+
* This Source Code Form is subject to the terms of the Mozilla Public License,
24+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
25+
* obtain one at http://mozilla.org/MPL/2.0/.
26+
*
1927
*/
2028
//! This module defines iterator types that are used only with the [`DoublePriorityQueue`]
2129
//!

‎src/double_priority_queue/mod.rs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
77
* the Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version, or (at your opinion) under the terms
8+
* (at your option) any later version, or (at your option) under the terms
99
* of the Mozilla Public License version 2.0.
1010
*
11+
* ----
12+
*
1113
* This program is distributed in the hope that it will be useful,
1214
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1315
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,6 +18,12 @@
1618
* You should have received a copy of the GNU Lesser General Public License
1719
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1820
*
21+
* ----
22+
*
23+
* This Source Code Form is subject to the terms of the Mozilla Public License,
24+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
25+
* obtain one at http://mozilla.org/MPL/2.0/.
26+
*
1927
*/
2028
//! This module contains the [`DoublePriorityQueue`] type and the related iterators.
2129
//!

‎src/lib.rs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
77
* the Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version, or (at your opinion) under the terms
8+
* (at your option) any later version, or (at your option) under the terms
99
* of the Mozilla Public License version 2.0.
1010
*
11+
* ----
12+
*
1113
* This program is distributed in the hope that it will be useful,
1214
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1315
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,6 +18,12 @@
1618
* You should have received a copy of the GNU Lesser General Public License
1719
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1820
*
21+
* ----
22+
*
23+
* This Source Code Form is subject to the terms of the Mozilla Public License,
24+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
25+
* obtain one at http://mozilla.org/MPL/2.0/.
26+
*
1927
*/
2028

2129
//! This crate provides 2 main data structures:

‎src/priority_queue/iterators.rs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
77
* the Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version, or (at your opinion) under the terms
8+
* (at your option) any later version, or (at your option) under the terms
99
* of the Mozilla Public License version 2.0.
1010
*
11+
* ----
12+
*
1113
* This program is distributed in the hope that it will be useful,
1214
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1315
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,6 +18,12 @@
1618
* You should have received a copy of the GNU Lesser General Public License
1719
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1820
*
21+
* ----
22+
*
23+
* This Source Code Form is subject to the terms of the Mozilla Public License,
24+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
25+
* obtain one at http://mozilla.org/MPL/2.0/.
26+
*
1927
*/
2028
//! This module defines iterator types that are used only with the [`PriorityQueue`].
2129
//!

‎src/priority_queue/mod.rs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
77
* the Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version, or (at your opinion) under the terms
8+
* (at your option) any later version, or (at your option) under the terms
99
* of the Mozilla Public License version 2.0.
1010
*
11+
* ----
12+
*
1113
* This program is distributed in the hope that it will be useful,
1214
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1315
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,6 +18,12 @@
1618
* You should have received a copy of the GNU Lesser General Public License
1719
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1820
*
21+
* ----
22+
*
23+
* This Source Code Form is subject to the terms of the Mozilla Public License,
24+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
25+
* obtain one at http://mozilla.org/MPL/2.0/.
26+
*
1927
*/
2028

2129
//! This module contains the [`PriorityQueue`] type and the related iterators.

‎src/store.rs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* This program is free software: you can redistribute it and/or modify
66
* it under the terms of the GNU Lesser General Public License as published by
77
* the Free Software Foundation, either version 3 of the License, or
8-
* (at your option) any later version, or (at your opinion) under the terms
8+
* (at your option) any later version, or (at your option) under the terms
99
* of the Mozilla Public License version 2.0.
1010
*
11+
* ----
12+
*
1113
* This program is distributed in the hope that it will be useful,
1214
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1315
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
@@ -16,6 +18,12 @@
1618
* You should have received a copy of the GNU Lesser General Public License
1719
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1820
*
21+
* ----
22+
*
23+
* This Source Code Form is subject to the terms of the Mozilla Public License,
24+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
25+
* obtain one at http://mozilla.org/MPL/2.0/.
26+
*
1927
*/
2028
#[cfg(not(feature = "std"))]
2129
use std::vec::Vec;

‎test-nostd/src/lib.rs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
/*
2+
* Copyright 2017 Gianmarco Garrisi and contributors
3+
*
4+
*
5+
* This program is free software: you can redistribute it and/or modify
6+
* it under the terms of the GNU Lesser General Public License as published by
7+
* the Free Software Foundation, either version 3 of the License, or
8+
* (at your option) any later version, or (at your option) under the terms
9+
* of the Mozilla Public License version 2.0.
10+
*
11+
* ----
12+
*
13+
* This program is distributed in the hope that it will be useful,
14+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
15+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16+
* GNU Lesser General Public License for more details.
17+
*
18+
* You should have received a copy of the GNU Lesser General Public License
19+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
20+
*
21+
* ----
22+
*
23+
* This Source Code Form is subject to the terms of the Mozilla Public License,
24+
* v. 2.0. If a copy of the MPL was not distributed with this file, You can
25+
* obtain one at http://mozilla.org/MPL/2.0/.
26+
*
27+
*/
28+
129
#![no_std]
230

331
use core::hash::BuildHasherDefault;

0 commit comments

Comments
 (0)