Skip to content

Change generate-copyright to generate HTML, with cargo dependencies included #128353

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 7, 2024
Merged

Change generate-copyright to generate HTML, with cargo dependencies included #128353

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ba0d6c9
Update generate-copyright
jonathanpallant Jul 4, 2024
204e3ea
generate-copyright: Produce HTML, not Markdown
jonathanpallant Jul 29, 2024
56f8479
generate-copyright: Fix typo
jonathanpallant Jul 30, 2024
dbab595
generate-copyright: use cargo-metadata
jonathanpallant Jul 30, 2024
f7e6bf6
generate-copyright: use rinja to format the output
jonathanpallant Jul 30, 2024
37ab090
REUSE.toml: Copyright text isn't parsed as Markdown.
jonathanpallant Jul 30, 2024
30ac7c9
generate-copyright: Render Node with rinja too.
jonathanpallant Jul 31, 2024
5277b67
generate-copyright: gather files inside interesting folders
jonathanpallant Aug 6, 2024
4e24e9b
Update to rinja 0.3
jonathanpallant Aug 6, 2024
99579f3
Apparently library/std is now part of a workspace at library/
jonathanpallant Aug 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update to rinja 0.3
  • Loading branch information
@jonathanpallant
jonathanpallant committed Aug 6, 2024
commit 4e24e9b1adb8ffd57d7315028407922c44069f26
49 changes: 7 additions & 42 deletions Cargo.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1407,7 +1407,7 @@ version = "0.1.0"
dependencies = [
"anyhow",
"cargo_metadata 0.18.1",
"rinja 0.2.0",
"rinja",
"serde",
"serde_json",
"thiserror",
Expand Down Expand Up @@ -3100,43 +3100,17 @@ dependencies = [
"walkdir",
]

[[package]]
name = "rinja"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2d47a46d7729e891c8accf260e9daa02ae6d570aa2a94fb1fb27eb5364a2323"
dependencies = [
"humansize",
"num-traits",
"percent-encoding",
"rinja_derive 0.2.0",
]

[[package]]
name = "rinja"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d3762e3740cdbf2fd2be465cc2c26d643ad17353cc2e0223d211c1b096118bd"
dependencies = [
"humansize",
"itoa",
"rinja_derive 0.3.0",
]

[[package]]
name = "rinja_derive"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44dae9afe59d58ed8d988d67d1945f3638125d2fd2104058399382e11bd3ea2a"
dependencies = [
"basic-toml",
"mime",
"mime_guess",
"once_map",
"proc-macro2",
"quote",
"rinja_parser 0.2.0",
"serde",
"syn 2.0.67",
"num-traits",
"percent-encoding",
"rinja_derive",
]

[[package]]
Expand All @@ -3152,20 +3126,11 @@ dependencies = [
"once_map",
"proc-macro2",
"quote",
"rinja_parser 0.3.0",
"rinja_parser",
"serde",
"syn 2.0.67",
]

[[package]]
name = "rinja_parser"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b1771c78cd5d3b1646ef8d8f2ed100db936e8b291d3cc06e92a339ff346858c"
dependencies = [
"nom",
]

[[package]]
name = "rinja_parser"
version = "0.3.0"
Expand Down Expand Up @@ -4644,7 +4609,7 @@ dependencies = [
"minifier",
"pulldown-cmark 0.9.6",
"regex",
"rinja 0.3.0",
"rinja",
"rustdoc-json-types",
"serde",
"serde_json",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/generate-copyright/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ description = "Produces a manifest of all the copyrighted materials in the Rust
[dependencies]
anyhow = "1.0.65"
cargo_metadata = "0.18.1"
rinja = "0.2.0"
rinja = "0.3.0"
serde = { version = "1.0.147", features = ["derive"] }
serde_json = "1.0.85"
thiserror = "1"
Loading