Skip to content

Commit

Permalink
Fix compilation error after rebase.
Browse files Browse the repository at this point in the history
  • Loading branch information
crlf0710 committed Oct 7, 2019
1 parent dda10f2 commit 2dab187
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/librustc_typeck/collect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2769,7 +2769,7 @@ fn check_link_ordinal(tcx: TyCtxt<'_>, attr: &ast::Attribute) -> Option<usize> {
Some([item]) => item.literal(),
_ => None,
};
if let Some(Lit { node: LitKind::Int(ordinal, LitIntType::Unsuffixed), .. }) = sole_meta_list {
if let Some(Lit { kind: LitKind::Int(ordinal, LitIntType::Unsuffixed), .. }) = sole_meta_list {
if *ordinal <= std::usize::MAX as u128 {
Some(*ordinal as usize)
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/libsyntax/feature_gate/active.rs
Original file line number Diff line number Diff line change
Expand Up @@ -523,7 +523,7 @@ declare_features! (
(active, const_extern_fn, "1.40.0", Some(64926), None),

// Allows the use of raw-dylibs (RFC 2627).
(active, raw_dylib, "1.39.0", Some(58713), None),
(active, raw_dylib, "1.40.0", Some(58713), None),

// -------------------------------------------------------------------------
// feature-group-end: actual feature gates
Expand Down

0 comments on commit 2dab187

Please sign in to comment.