user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compilation error after rebase.

Browse source
This commit is contained in:
Charles Lew 2019-10-07 06:52:35 +08:00
parent dda10f2a2a
commit 2dab187024
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/librustc_typeck/collect.rs
View file

@ -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 {

2
src/libsyntax/feature_gate/active.rs
View file

@ -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