Skip to content
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.

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

Re-export the types crate contents #1674

Merged
merged 1 commit into from Dec 7, 2023
Merged

Re-export the types crate contents #1674

merged 1 commit into from Dec 7, 2023

Conversation

djc
Copy link
Member

@djc djc commented Dec 7, 2023

Fixes #1662. (I think this should be on the list for backporting to 0.22.1.)

@djc djc requested review from cpu and ctz December 7, 2023 08:21
rustls/src/lib.rs Outdated Show resolved Hide resolved
@djc
Copy link
Member Author

djc commented Dec 7, 2023

The "Validate external types appearing in public API" jobs fail on this, even though we specifically have this exception in the crate metadata:

[package.metadata.cargo_check_external_types]
allowed_external_types = [
    "rustls_pki_types::*",
]

Copy link

codecov bot commented Dec 7, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (8a72972) 95.90% compared to head (e99c193) 95.92%.
Report is 15 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1674      +/-   ##
==========================================
+ Coverage   95.90%   95.92%   +0.02%     
==========================================
  Files          78       78              
  Lines       16083    16660     +577     
==========================================
+ Hits        15424    15981     +557     
- Misses        659      679      +20     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@ctz
Copy link
Member

ctz commented Dec 7, 2023

The "Validate external types appearing in public API" jobs fail on this, even though we specifically have this exception in the crate metadata:

[package.metadata.cargo_check_external_types]
allowed_external_types = [
    "rustls_pki_types::*",
]

I think this needs

diff --git a/rustls/Cargo.toml b/rustls/Cargo.toml
index bc8b5e77..46411aff 100644
--- a/rustls/Cargo.toml
+++ b/rustls/Cargo.toml
@@ -62,4 +62,5 @@ rustdoc-args = ["--cfg", "docsrs"]
 [package.metadata.cargo_check_external_types]
 allowed_external_types = [
     "rustls_pki_types::*",
+    "rustls_pki_types",
 ]

(I don't particularly understand the distinction.)

Copy link
Member

@cpu cpu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks

@cpu cpu added this pull request to the merge queue Dec 7, 2023
@cpu
Copy link
Member

cpu commented Dec 7, 2023

I think this should be on the list for backporting to 0.22.1

I can take care of starting that up if nobody else is dying to do it :-)

Merged via the queue into main with commit 3a35efe Dec 7, 2023
42 checks passed
@cpu cpu deleted the export-types branch December 7, 2023 14:45
@cpu cpu mentioned this pull request Dec 7, 2023
@cpu
Copy link
Member

cpu commented Dec 7, 2023

I can take care of starting that up

#1677

@cpu cpu mentioned this pull request Feb 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

discussion: re-exporting rustls-pki-types
3 participants