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

Commit b685242

Browse files
committedDec 6, 2022
Auto merge of rust-lang#105365 - matthiaskrgr:rollup-g0mrrt7, r=matthiaskrgr
Rollup of 11 pull requests Successful merges: - rust-lang#104439 (Add prototype to generate `COPYRIGHT` from REUSE metadata) - rust-lang#105005 (On E0195 point at where clause lifetime bounds) - rust-lang#105098 (propagate the error from parsing enum variant to the parser and emit out) - rust-lang#105243 (remove no-op 'let _ = ') - rust-lang#105254 (Recurse into nested impl-trait when computing variance.) - rust-lang#105287 (Synthesize substitutions for bad auto traits in dyn types) - rust-lang#105310 (Be more careful about unresolved exprs in suggestion) - rust-lang#105318 (Make `get_impl_future_output_ty` work with AFIT) - rust-lang#105339 (support `ConstKind::Expr` in `is_const_evaluatable` and `WfPredicates::compute`) - rust-lang#105340 (Avoid ICE by accounting for missing type) - rust-lang#105342 (Make `note_obligation_cause_code` take a `impl ToPredicate` for predicate) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 9db224f + a9ffe7c commit b685242

File tree

59 files changed

+1404
-122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+1404
-122
lines changed
 

‎Cargo.lock

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -581,6 +581,7 @@ dependencies = [
581581
"libc",
582582
"num-integer",
583583
"num-traits",
584+
"serde",
584585
"time",
585586
"winapi",
586587
]
@@ -730,6 +731,16 @@ dependencies = [
730731
"rustc-semver",
731732
]
732733

734+
[[package]]
735+
name = "collect-license-metadata"
736+
version = "0.1.0"
737+
dependencies = [
738+
"anyhow",
739+
"serde",
740+
"serde_json",
741+
"spdx-rs",
742+
]
743+
733744
[[package]]
734745
name = "color-eyre"
735746
version = "0.6.2"
@@ -1552,6 +1563,15 @@ dependencies = [
15521563
"termcolor",
15531564
]
15541565

1566+
[[package]]
1567+
name = "generate-copyright"
1568+
version = "0.1.0"
1569+
dependencies = [
1570+
"anyhow",
1571+
"serde",
1572+
"serde_json",
1573+
]
1574+
15551575
[[package]]
15561576
name = "generic-array"
15571577
version = "0.14.4"
@@ -4864,6 +4884,35 @@ dependencies = [
48644884
"winapi",
48654885
]
48664886

4887+
[[package]]
4888+
name = "spdx-expression"
4889+
version = "0.5.2"
4890+
source = "registry+https://github.com/rust-lang/crates.io-index"
4891+
checksum = "53d7ac03c67c572d85049d6db815e20a4a19b41b3d5cca732ac582342021ad77"
4892+
dependencies = [
4893+
"nom",
4894+
"serde",
4895+
"thiserror",
4896+
"tracing",
4897+
]
4898+
4899+
[[package]]
4900+
name = "spdx-rs"
4901+
version = "0.5.1"
4902+
source = "registry+https://github.com/rust-lang/crates.io-index"
4903+
checksum = "b3c02f6eb7e7b4100c272f685a9ccaccaab302324e8c7ec3e2ee72340fb29ff3"
4904+
dependencies = [
4905+
"chrono",
4906+
"log",
4907+
"nom",
4908+
"serde",
4909+
"spdx-expression",
4910+
"strum",
4911+
"strum_macros",
4912+
"thiserror",
4913+
"uuid",
4914+
]
4915+
48674916
[[package]]
48684917
name = "stable_deref_trait"
48694918
version = "1.2.0"
@@ -4967,6 +5016,25 @@ version = "0.10.0"
49675016
source = "registry+https://github.com/rust-lang/crates.io-index"
49685017
checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
49695018

5019+
[[package]]
5020+
name = "strum"
5021+
version = "0.24.1"
5022+
source = "registry+https://github.com/rust-lang/crates.io-index"
5023+
checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
5024+
5025+
[[package]]
5026+
name = "strum_macros"
5027+
version = "0.24.3"
5028+
source = "registry+https://github.com/rust-lang/crates.io-index"
5029+
checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
5030+
dependencies = [
5031+
"heck",
5032+
"proc-macro2",
5033+
"quote",
5034+
"rustversion",
5035+
"syn",
5036+
]
5037+
49705038
[[package]]
49715039
name = "syn"
49725040
version = "1.0.102"
@@ -5596,6 +5664,15 @@ version = "0.1.1"
55965664
source = "registry+https://github.com/rust-lang/crates.io-index"
55975665
checksum = "8772a4ccbb4e89959023bc5b7cb8623a795caa7092d99f3aa9501b9484d4557d"
55985666

5667+
[[package]]
5668+
name = "uuid"
5669+
version = "0.8.2"
5670+
source = "registry+https://github.com/rust-lang/crates.io-index"
5671+
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
5672+
dependencies = [
5673+
"getrandom 0.2.0",
5674+
]
5675+
55995676
[[package]]
56005677
name = "valuable"
56015678
version = "0.1.0"

‎Cargo.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ members = [
3939
"src/tools/bump-stage0",
4040
"src/tools/replace-version-placeholder",
4141
"src/tools/lld-wrapper",
42+
"src/tools/collect-license-metadata",
43+
"src/tools/generate-copyright",
4244
]
4345

4446
exclude = [

0 commit comments

Comments
 (0)