Skip to content

Commit 4b92682

Browse files
committed
Add warn(unreachable_pub) to rustc_macros.
1 parent 6cf068d commit 4b92682

File tree

8 files changed

+17
-16
lines changed

8 files changed

+17
-16
lines changed

compiler/rustc_macros/src/diagnostics/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ use synstructure::Structure;
5555
///
5656
/// See rustc dev guide for more examples on using the `#[derive(Diagnostic)]`:
5757
/// <https://rustc-dev-guide.rust-lang.org/diagnostics/diagnostic-structs.html>
58-
pub fn diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
58+
pub(super) fn diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
5959
s.underscore_const(true);
6060
DiagnosticDerive::new(s).into_tokens()
6161
}
@@ -102,7 +102,7 @@ pub fn diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
102102
///
103103
/// See rustc dev guide for more examples on using the `#[derive(LintDiagnostic)]`:
104104
/// <https://rustc-dev-guide.rust-lang.org/diagnostics/diagnostic-structs.html#reference>
105-
pub fn lint_diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
105+
pub(super) fn lint_diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
106106
s.underscore_const(true);
107107
LintDiagnosticDerive::new(s).into_tokens()
108108
}
@@ -153,7 +153,7 @@ pub fn lint_diagnostic_derive(mut s: Structure<'_>) -> TokenStream {
153153
///
154154
/// diag.subdiagnostic(RawIdentifierSuggestion { span, applicability, ident });
155155
/// ```
156-
pub fn subdiagnostic_derive(mut s: Structure<'_>) -> TokenStream {
156+
pub(super) fn subdiagnostic_derive(mut s: Structure<'_>) -> TokenStream {
157157
s.underscore_const(true);
158158
SubdiagnosticDerive::new().into_tokens(s)
159159
}

compiler/rustc_macros/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#![feature(proc_macro_diagnostic)]
77
#![feature(proc_macro_span)]
88
#![feature(proc_macro_tracked_env)]
9+
#![warn(unreachable_pub)]
910
// tidy-alphabetical-end
1011

1112
use proc_macro::TokenStream;

compiler/rustc_macros/src/lift.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use quote::quote;
22
use syn::parse_quote;
33

4-
pub fn lift_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
4+
pub(super) fn lift_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
55
s.add_bounds(synstructure::AddBounds::Generics);
66
s.bind_with(|_| synstructure::BindStyle::Move);
77
s.underscore_const(true);

compiler/rustc_macros/src/query.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ fn add_query_desc_cached_impl(
307307
});
308308
}
309309

310-
pub fn rustc_queries(input: TokenStream) -> TokenStream {
310+
pub(super) fn rustc_queries(input: TokenStream) -> TokenStream {
311311
let queries = parse_macro_input!(input as List<Query>);
312312

313313
let mut query_stream = quote! {};

compiler/rustc_macros/src/serialize.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use quote::{quote, quote_spanned};
33
use syn::parse_quote;
44
use syn::spanned::Spanned;
55

6-
pub fn type_decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
6+
pub(super) fn type_decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
77
let decoder_ty = quote! { __D };
88
let bound = if s.ast().generics.lifetimes().any(|lt| lt.lifetime.ident == "tcx") {
99
quote! { <I = ::rustc_middle::ty::TyCtxt<'tcx>> }
@@ -20,7 +20,7 @@ pub fn type_decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2:
2020
decodable_body(s, decoder_ty)
2121
}
2222

23-
pub fn meta_decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
23+
pub(super) fn meta_decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
2424
if !s.ast().generics.lifetimes().any(|lt| lt.lifetime.ident == "tcx") {
2525
s.add_impl_generic(parse_quote! { 'tcx });
2626
}
@@ -32,7 +32,7 @@ pub fn meta_decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2:
3232
decodable_body(s, decoder_ty)
3333
}
3434

35-
pub fn decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
35+
pub(super) fn decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
3636
let decoder_ty = quote! { __D };
3737
s.add_impl_generic(parse_quote! { #decoder_ty: ::rustc_span::SpanDecoder });
3838
s.add_bounds(synstructure::AddBounds::Generics);
@@ -41,7 +41,7 @@ pub fn decodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::Toke
4141
decodable_body(s, decoder_ty)
4242
}
4343

44-
pub fn decodable_generic_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
44+
pub(super) fn decodable_generic_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
4545
let decoder_ty = quote! { __D };
4646
s.add_impl_generic(parse_quote! { #decoder_ty: ::rustc_serialize::Decoder });
4747
s.add_bounds(synstructure::AddBounds::Generics);
@@ -123,7 +123,7 @@ fn decode_field(field: &syn::Field) -> proc_macro2::TokenStream {
123123
quote_spanned! { field_span=> #decode_inner_method(#__decoder) }
124124
}
125125

126-
pub fn type_encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
126+
pub(super) fn type_encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
127127
let bound = if s.ast().generics.lifetimes().any(|lt| lt.lifetime.ident == "tcx") {
128128
quote! { <I = ::rustc_middle::ty::TyCtxt<'tcx>> }
129129
} else if s.ast().generics.type_params().any(|ty| ty.ident == "I") {
@@ -140,7 +140,7 @@ pub fn type_encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2:
140140
encodable_body(s, encoder_ty, false)
141141
}
142142

143-
pub fn meta_encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
143+
pub(super) fn meta_encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
144144
if !s.ast().generics.lifetimes().any(|lt| lt.lifetime.ident == "tcx") {
145145
s.add_impl_generic(parse_quote! { 'tcx });
146146
}
@@ -152,7 +152,7 @@ pub fn meta_encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2:
152152
encodable_body(s, encoder_ty, true)
153153
}
154154

155-
pub fn encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
155+
pub(super) fn encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
156156
let encoder_ty = quote! { __E };
157157
s.add_impl_generic(parse_quote! { #encoder_ty: ::rustc_span::SpanEncoder });
158158
s.add_bounds(synstructure::AddBounds::Generics);
@@ -161,7 +161,7 @@ pub fn encodable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::Toke
161161
encodable_body(s, encoder_ty, false)
162162
}
163163

164-
pub fn encodable_generic_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
164+
pub(super) fn encodable_generic_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
165165
let encoder_ty = quote! { __E };
166166
s.add_impl_generic(parse_quote! { #encoder_ty: ::rustc_serialize::Encoder });
167167
s.add_bounds(synstructure::AddBounds::Generics);

compiler/rustc_macros/src/symbols.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl Errors {
131131
}
132132
}
133133

134-
pub fn symbols(input: TokenStream) -> TokenStream {
134+
pub(super) fn symbols(input: TokenStream) -> TokenStream {
135135
let (mut output, errors) = symbols_with_errors(input);
136136

137137
// If we generated any errors, then report them as compiler_error!() macro calls.

compiler/rustc_macros/src/type_foldable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use quote::{quote, ToTokens};
22
use syn::parse_quote;
33

4-
pub fn type_foldable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
4+
pub(super) fn type_foldable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
55
if let syn::Data::Union(_) = s.ast().data {
66
panic!("cannot derive on union")
77
}

compiler/rustc_macros/src/type_visitable.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use quote::quote;
22
use syn::parse_quote;
33

4-
pub fn type_visitable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
4+
pub(super) fn type_visitable_derive(mut s: synstructure::Structure<'_>) -> proc_macro2::TokenStream {
55
if let syn::Data::Union(_) = s.ast().data {
66
panic!("cannot derive on union")
77
}

0 commit comments

Comments
 (0)