diff options
| author | Jonathan Pallant (Ferrous Systems) <jonathan.pallant@ferrous-systems.com> | 2023-11-22 18:07:14 +0000 |
|---|---|---|
| committer | Jonathan Pallant (Ferrous Systems) <jonathan.pallant@ferrous-systems.com> | 2023-11-27 11:03:53 +0000 |
| commit | 2d1cd458758176b9ad8fb15ae9b94821002b7bd0 (patch) | |
| tree | 7914913a49ec950ba0a28bd013fd824204df2b69 /src/tools/generate-copyright | |
| parent | daf6121001af46859cf2328f157a8366b971988f (diff) | |
| download | rust-2d1cd458758176b9ad8fb15ae9b94821002b7bd0.tar.gz rust-2d1cd458758176b9ad8fb15ae9b94821002b7bd0.zip | |
Fix generate-copyright tool.
LLVM copyrights are now condensed to those reported in the .reuse/dep5 file.
Diffstat (limited to 'src/tools/generate-copyright')
| -rw-r--r-- | src/tools/generate-copyright/src/main.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/generate-copyright/src/main.rs b/src/tools/generate-copyright/src/main.rs index 38f5ac91033..558e87290b0 100644 --- a/src/tools/generate-copyright/src/main.rs +++ b/src/tools/generate-copyright/src/main.rs @@ -27,7 +27,7 @@ fn render_recursive(node: &Node, buffer: &mut Vec<u8>, depth: usize) -> Result<( } } Node::Directory { name, children, license } => { - render_license(&prefix, std::iter::once(name), std::iter::once(license), buffer)?; + render_license(&prefix, std::iter::once(name), license.iter(), buffer)?; if !children.is_empty() { writeln!(buffer, "{prefix}")?; writeln!(buffer, "{prefix}*Exceptions:*")?; @@ -94,7 +94,7 @@ struct Metadata { #[serde(rename_all = "kebab-case", tag = "type")] pub(crate) enum Node { Root { children: Vec<Node> }, - Directory { name: String, children: Vec<Node>, license: License }, + Directory { name: String, children: Vec<Node>, license: Option<License> }, CondensedDirectory { name: String, licenses: Vec<License> }, File { name: String, license: License }, Group { files: Vec<String>, directories: Vec<String>, license: License }, |
