Skip to content

Commit a90c483

Browse files
committed
Fix rebase error
1 parent 373f6dd commit a90c483

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

compiler/rustc_attr_data_structures/src/encode_cross_crate.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ impl AttributeKind {
3838
PubTransparent(..) => Yes,
3939
SkipDuringMethodDispatch { .. } => No,
4040
TrackCaller(..) => Yes,
41+
UnstableFeatureBound(..) => No,
4142
}
4243
}
4344
}

compiler/rustc_attr_parsing/src/context.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@ use rustc_span::{DUMMY_SP, ErrorGuaranteed, Span, Symbol, sym};
1717
use crate::attributes::allow_unstable::{
1818
AllowConstFnUnstableParser, AllowInternalUnstableParser, UnstableFeatureBoundParser,
1919
};
20-
use crate::attributes::codegen_attrs::{ColdParser, NakedParser, NoMangleParser, OptimizeParser};
20+
use crate::attributes::codegen_attrs::{
21+
ColdParser, ExportNameParser, NakedParser, NoMangleParser, OptimizeParser, TrackCallerParser,
22+
};
2123
use crate::attributes::confusables::ConfusablesParser;
2224
use crate::attributes::deprecation::DeprecationParser;
2325
use crate::attributes::inline::{InlineParser, RustcForceInlineParser};

0 commit comments

Comments
 (0)