Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 67a8c64

Browse files
borsbors
committed
Auto merge of rust-lang#133236 - dtolnay:unicodelicense, r=Mark-Simulacrum
Synchronize Unicode license text from unicode.org The text of <https://unicode.org/license.txt> was swapped out from "UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE" to "UNICODE LICENSE V3" between the dates of [2023.06.03](https://web.archive.org/web/20230603182532/https://www.unicode.org/license.txt) and [2023.09.11](https://web.archive.org/web/20230911222703/https://www.unicode.org/license.txt), which means between Unicode 15.0.0 ([2022.09.13](https://unicode.org/versions/Unicode15.0.0/)) and Unicode 15.1.0 ([2023.09.12](https://unicode.org/versions/Unicode15.1.0/)). A license wording change is not mentioned in the 15.1.0 [release summary](https://www.unicode.org/versions/Unicode15.1.0/) or [announcement post](http://blog.unicode.org/2023/09/announcing-unicode-standard-version-151.html). But I guess we are intended to infer that data files from Unicode 15.1.0 should be specified as licensed [Unicode-3.0](https://spdx.org/licenses/Unicode-3.0.html) as opposed to [Unicode-DFS-2016](https://spdx.org/licenses/Unicode-DFS-2016.html). The Rust standard library has been using Unicode 15.1.0+ since rust-lang#120777.
2 parents 28fc2ba + 6d2a3e9 commit 67a8c64

File tree

4 files changed

+77
-67
lines changed

4 files changed

+77
-67
lines changed

‎COPYRIGHT‎

Lines changed: 36 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -343,49 +343,42 @@ their own copyright notices and license terms:
343343
* Portions of internationalization code use code or data from Unicode, which
344344
carry the following license:
345345

346-
UNICODE, INC. LICENSE AGREEMENT - DATA FILES AND SOFTWARE
347-
348-
See Terms of Use <https://www.unicode.org/copyright.html>
349-
for definitions of Unicode Inc.’s Data Files and Software.
350-
351-
NOTICE TO USER: Carefully read the following legal agreement.
352-
BY DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING UNICODE INC.'S
353-
DATA FILES ("DATA FILES"), AND/OR SOFTWARE ("SOFTWARE"),
354-
YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
355-
TERMS AND CONDITIONS OF THIS AGREEMENT.
356-
IF YOU DO NOT AGREE, DO NOT DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE
357-
THE DATA FILES OR SOFTWARE.
346+
UNICODE LICENSE V3
358347

359348
COPYRIGHT AND PERMISSION NOTICE
360349

361-
Copyright © 1991-2022 Unicode, Inc. All rights reserved.
362-
Distributed under the Terms of Use in https://www.unicode.org/copyright.html.
363-
364-
Permission is hereby granted, free of charge, to any person obtaining
365-
a copy of the Unicode data files and any associated documentation
366-
(the "Data Files") or Unicode software and any associated documentation
367-
(the "Software") to deal in the Data Files or Software
368-
without restriction, including without limitation the rights to use,
369-
copy, modify, merge, publish, distribute, and/or sell copies of
370-
the Data Files or Software, and to permit persons to whom the Data Files
371-
or Software are furnished to do so, provided that either
372-
(a) this copyright and permission notice appear with all copies
373-
of the Data Files or Software, or
374-
(b) this copyright and permission notice appear in associated
375-
Documentation.
376-
377-
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF
378-
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
379-
WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
380-
NONINFRINGEMENT OF THIRD PARTY RIGHTS.
381-
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
382-
NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
383-
DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
384-
DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
385-
TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
386-
PERFORMANCE OF THE DATA FILES OR SOFTWARE.
387-
388-
Except as contained in this notice, the name of a copyright holder
389-
shall not be used in advertising or otherwise to promote the sale,
390-
use or other dealings in these Data Files or Software without prior
391-
written authorization of the copyright holder.
350+
Copyright © 1991-2024 Unicode, Inc.
351+
352+
NOTICE TO USER: Carefully read the following legal agreement. BY
353+
DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
354+
SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
355+
TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
356+
DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
357+
358+
Permission is hereby granted, free of charge, to any person obtaining a
359+
copy of data files and any associated documentation (the "Data Files") or
360+
software and any associated documentation (the "Software") to deal in the
361+
Data Files or Software without restriction, including without limitation
362+
the rights to use, copy, modify, merge, publish, distribute, and/or sell
363+
copies of the Data Files or Software, and to permit persons to whom the
364+
Data Files or Software are furnished to do so, provided that either (a)
365+
this copyright and permission notice appear with all copies of the Data
366+
Files or Software, or (b) this copyright and permission notice appear in
367+
associated Documentation.
368+
369+
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
370+
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
371+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
372+
THIRD PARTY RIGHTS.
373+
374+
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
375+
BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
376+
OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
377+
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
378+
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
379+
FILES OR SOFTWARE.
380+
381+
Except as contained in this notice, the name of a copyright holder shall
382+
not be used in advertising or otherwise to promote the sale, use or other
383+
dealings in these Data Files or Software without prior written
384+
authorization of the copyright holder.

‎LICENSES/Unicode-3.0.txt‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
UNICODE LICENSE V3
2+
3+
COPYRIGHT AND PERMISSION NOTICE
4+
5+
Copyright © 1991-2024 Unicode, Inc.
6+
7+
NOTICE TO USER: Carefully read the following legal agreement. BY
8+
DOWNLOADING, INSTALLING, COPYING OR OTHERWISE USING DATA FILES, AND/OR
9+
SOFTWARE, YOU UNEQUIVOCALLY ACCEPT, AND AGREE TO BE BOUND BY, ALL OF THE
10+
TERMS AND CONDITIONS OF THIS AGREEMENT. IF YOU DO NOT AGREE, DO NOT
11+
DOWNLOAD, INSTALL, COPY, DISTRIBUTE OR USE THE DATA FILES OR SOFTWARE.
12+
13+
Permission is hereby granted, free of charge, to any person obtaining a
14+
copy of data files and any associated documentation (the "Data Files") or
15+
software and any associated documentation (the "Software") to deal in the
16+
Data Files or Software without restriction, including without limitation
17+
the rights to use, copy, modify, merge, publish, distribute, and/or sell
18+
copies of the Data Files or Software, and to permit persons to whom the
19+
Data Files or Software are furnished to do so, provided that either (a)
20+
this copyright and permission notice appear with all copies of the Data
21+
Files or Software, or (b) this copyright and permission notice appear in
22+
associated Documentation.
23+
24+
THE DATA FILES AND SOFTWARE ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
25+
KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
26+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
27+
THIRD PARTY RIGHTS.
28+
29+
IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS NOTICE
30+
BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL DAMAGES,
31+
OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
32+
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
33+
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THE DATA
34+
FILES OR SOFTWARE.
35+
36+
Except as contained in this notice, the name of a copyright holder shall
37+
not be used in advertising or otherwise to promote the sale, use or other
38+
dealings in these Data Files or Software without prior written
39+
authorization of the copyright holder.

‎LICENSES/Unicode-DFS-2016.txt‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎REUSE.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ SPDX-License-Identifier = "Apache-2.0 WITH LLVM-exception AND (Apache-2.0 OR MIT
6363
[[annotations]]
6464
path = "library/core/src/unicode/unicode_data.rs"
6565
precedence = "override"
66-
SPDX-FileCopyrightText = "1991-2022 Unicode, Inc. All rights reserved."
67-
SPDX-License-Identifier = "Unicode-DFS-2016"
66+
SPDX-FileCopyrightText = "1991-2024 Unicode, Inc."
67+
SPDX-License-Identifier = "Unicode-3.0"
6868

6969
[[annotations]]
7070
path = "library/std/src/sync/mpmc/**"

0 commit comments

Comments
 (0)