Skip to content

Commit 247aece

Browse files
Fix tidy errors
1 parent 88d45d0 commit 247aece

File tree

3 files changed

+20
-111
lines changed

3 files changed

+20
-111
lines changed

REUSE.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ SPDX-FileCopyrightText = "2015 Anders Kaseorg <[email protected]>"
9292
SPDX-License-Identifier = "MIT"
9393

9494
[[annotations]]
95-
path = "src/librustdoc/html/static/fonts/FiraSans**"
95+
path = "src/librustdoc/html/static/fonts/Fira**"
9696
precedence = "override"
9797
SPDX-FileCopyrightText = ["2014, Mozilla Foundation", "2014, Telefonica S.A."]
9898
SPDX-License-Identifier = "OFL-1.1"

license-metadata.json

+18-109
Original file line numberDiff line numberDiff line change
@@ -3,68 +3,6 @@
33
"children": [
44
{
55
"children": [
6-
{
7-
"children": [
8-
{
9-
"children": [
10-
{
11-
"children": [
12-
{
13-
"directories": [],
14-
"files": [
15-
"analyzer-decls.h",
16-
"malloc-macro.h"
17-
],
18-
"license": {
19-
"copyright": [
20-
"2000-2024 Free Software Foundation, Inc"
21-
],
22-
"spdx": "GPL-2.0-only"
23-
},
24-
"type": "group"
25-
}
26-
],
27-
"license": {
28-
"copyright": [
29-
"2007-2011 Atheros Communications Inc",
30-
"2011-2012,2017 Qualcomm Atheros, Inc",
31-
"2016-2017 Erik Stromdahl <[email protected]>"
32-
],
33-
"spdx": "ISC"
34-
},
35-
"name": "c-c++-common/analyzer",
36-
"type": "directory"
37-
}
38-
],
39-
"license": {
40-
"copyright": [
41-
"2000-2024 Free Software Foundation, Inc"
42-
],
43-
"spdx": "GPL-2.0-only"
44-
},
45-
"name": "gcc/testsuite",
46-
"type": "directory"
47-
},
48-
{
49-
"license": {
50-
"copyright": [
51-
"2000-2024 Free Software Foundation, Inc"
52-
],
53-
"spdx": "GCC-exception-3.1"
54-
},
55-
"name": "libstdc++-v3/config/os/aix/os_defines.h",
56-
"type": "file"
57-
}
58-
],
59-
"license": {
60-
"copyright": [
61-
"1997-2024 Free Software Foundation, Inc"
62-
],
63-
"spdx": "GPL-3.0-or-later"
64-
},
65-
"name": "src/gcc",
66-
"type": "directory"
67-
},
686
{
697
"children": [
708
{
@@ -113,6 +51,8 @@
11351
{
11452
"directories": [],
11553
"files": [
54+
"FiraMono-Medium.woff2",
55+
"FiraMono-Regular.woff2",
11656
"FiraSans-LICENSE.txt",
11757
"FiraSans-Medium.woff2",
11858
"FiraSans-Regular.woff2"
@@ -150,6 +90,22 @@
15090
"name": "src/librustdoc/html/static/fonts",
15191
"type": "directory"
15292
},
93+
{
94+
"directories": [],
95+
"files": [
96+
"bar.rs",
97+
"bla.rs",
98+
"boo.rs",
99+
"foo.rs"
100+
],
101+
"license": {
102+
"copyright": [
103+
"NONE"
104+
],
105+
"spdx": "NONE"
106+
},
107+
"type": "group"
108+
},
153109
{
154110
"license": {
155111
"copyright": [
@@ -205,53 +161,6 @@
205161
},
206162
"name": "library/std/src/sys/sync/mutex/fuchsia.rs",
207163
"type": "file"
208-
},
209-
{
210-
"children": [],
211-
"license": {
212-
"copyright": [
213-
"Rust on Embedded Devices Working Group",
214-
"The Rust Project Developers (see https://thanks.rust-lang.org)"
215-
],
216-
"spdx": "Apache-2.0 OR CC-BY-SA-4.0 OR MIT"
217-
},
218-
"name": "src/doc/embedded-book",
219-
"type": "directory"
220-
},
221-
{
222-
"children": [],
223-
"license": {
224-
"copyright": [
225-
"2014 Jorge Aparicio",
226-
"The Rust Project Developers (see https://thanks.rust-lang.org)"
227-
],
228-
"spdx": "Apache-2.0 OR MIT"
229-
},
230-
"name": "src/doc/rust-by-example",
231-
"type": "directory"
232-
},
233-
{
234-
"license": {
235-
"copyright": [
236-
"2014-2021 Knut Sveidqvist"
237-
],
238-
"spdx": "MIT"
239-
},
240-
"name": "src/doc/rustc-dev-guide/mermaid.min.js",
241-
"type": "file"
242-
},
243-
{
244-
"children": [],
245-
"license": {
246-
"copyright": [
247-
"2003-2019 University of Illinois at Urbana-Champaign",
248-
"2003-2019 by the contributors listed in CREDITS.TXT (https://github.com/rust-lang/llvm-project/blob/7738295178045041669876bf32b0543ec8319a5c/llvm/CREDITS.TXT)",
249-
"2010 Apple Inc"
250-
],
251-
"spdx": "Apache-2.0 WITH LLVM-exception AND NCSA"
252-
},
253-
"name": "src/llvm-project",
254-
"type": "directory"
255164
}
256165
],
257166
"license": {

src/tools/tidy/src/bins.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ mod os_impl {
134134
&mut |entry| {
135135
let file = entry.path();
136136
let extension = file.extension();
137-
let scripts = ["py", "sh", "ps1"];
137+
let scripts = ["py", "sh", "ps1", "woff2"];
138138
if scripts.into_iter().any(|e| extension == Some(OsStr::new(e))) {
139139
return;
140140
}

0 commit comments

Comments
 (0)