Skip to content

Synchronize Unicode license text from unicode.org #133236

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

dtolnay
Copy link
Member

@dtolnay dtolnay commented Nov 20, 2024

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 and 2023.09.11, which means between Unicode 15.0.0 (2022.09.13) and Unicode 15.1.0 (2023.09.12). A license wording change is not mentioned in the 15.1.0 release summary or announcement post. But I guess we are intended to infer that data files from Unicode 15.1.0 should be specified as licensed Unicode-3.0 as opposed to Unicode-DFS-2016.

The Rust standard library has been using Unicode 15.1.0+ since #120777.

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 and 2023.09.11, which means
between Unicode 15.0.0 (2022.09.13) and Unicode 15.1.0 (2023.09.12).

    https://web.archive.org/web/20230603182532/https://www.unicode.org/license.txt
    https://web.archive.org/web/20230911222703/https://www.unicode.org/license.txt
    https://unicode.org/versions/Unicode15.0.0/
    https://unicode.org/versions/Unicode15.1.0/

A license wording change is not mentioned in the 15.1.0 release
summary or announcement post.

    https://www.unicode.org/versions/Unicode15.1.0/
    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 as opposed to
Unicode-DFS-2016.

    https://spdx.org/licenses/Unicode-3.0.html
    https://spdx.org/licenses/Unicode-DFS-2016.html
@rustbot
Copy link
Collaborator

rustbot commented Nov 20, 2024

r? @Mark-Simulacrum

rustbot has assigned @Mark-Simulacrum.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 20, 2024
@dtolnay dtolnay added the A-licensing Area: Compiler licensing label Nov 20, 2024
@Mark-Simulacrum
Copy link
Member

@bors r+ rollup=iffy

@bors
Copy link
Collaborator

bors commented Nov 24, 2024

📌 Commit 6d2a3e9 has been approved by Mark-Simulacrum

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 24, 2024
@bors
Copy link
Collaborator

bors commented Nov 25, 2024

⌛ Testing commit 6d2a3e9 with merge 67a8c64...

@bors
Copy link
Collaborator

bors commented Nov 25, 2024

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 67a8c64 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 25, 2024
@bors bors merged commit 67a8c64 into rust-lang:master Nov 25, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Nov 25, 2024
@bors bors mentioned this pull request Nov 25, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (67a8c64): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.8% [-1.4%, -0.2%] 2
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary -2.7%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.7% [-3.3%, -2.4%] 3
All ❌✅ (primary) - - 0

Cycles

Results (secondary -3.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.9% [-3.9%, -3.9%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 796.657s -> 795.632s (-0.13%)
Artifact size: 336.31 MiB -> 336.27 MiB (-0.01%)

@dtolnay
Copy link
Member Author

dtolnay commented Nov 26, 2024

FYI @decathorpe. This relates to https://lists.fedoraproject.org/archives/list/legal@lists.fedoraproject.org/thread/CHVW3EPLVQYH6SSVAOLOZJAVBXCGWOR5/.

@dtolnay dtolnay deleted the unicodelicense branch November 26, 2024 21:24
@dtolnay dtolnay removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 14, 2025
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-licensing Area: Compiler licensing A-meta Area: Issues & PRs about the rust-lang/rust repository itself merged-by-bors This PR was explicitly merged by bors.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants