diff options
| author | bors <bors@rust-lang.org> | 2019-11-06 06:14:03 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-06 06:14:03 +0000 |
| commit | e8b190ac4ad79e58d21ee1d573529ff74d8eedaa (patch) | |
| tree | 4d022868d407cf1bed36883037e4e97d1fa5094a /src/libsyntax/feature_gate | |
| parent | e4931eaaa3d95189b30e90d3af9f0db17c41bbb0 (diff) | |
| parent | 4f9651b85409a1e6ad5199211947d124ebbab935 (diff) | |
| download | rust-e8b190ac4ad79e58d21ee1d573529ff74d8eedaa.tar.gz rust-e8b190ac4ad79e58d21ee1d573529ff74d8eedaa.zip | |
Auto merge of #66143 - Centril:rollup-qmzuex0, r=Centril
Rollup of 9 pull requests Successful merges: - #65776 (Rename `LocalInternedString` and more) - #65973 (caller_location: point to macro invocation sites, like file!/line!, and use in core::panic!.) - #66015 (librustc_lexer: Refactor the module) - #66062 (Configure LLVM module PIC level) - #66086 (bump smallvec to 1.0) - #66092 (Use KERN_ARND syscall for random numbers on NetBSD, same as FreeBSD.) - #66103 (Add target thumbv7neon-unknown-linux-musleabihf) - #66133 (Update the bundled `wasi-libc` repository) - #66139 (use American spelling for `pluralize!`) Failed merges: r? @ghost
Diffstat (limited to 'src/libsyntax/feature_gate')
| -rw-r--r-- | src/libsyntax/feature_gate/check.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/feature_gate/check.rs b/src/libsyntax/feature_gate/check.rs index 13a24ca046d..d9cc5f6c169 100644 --- a/src/libsyntax/feature_gate/check.rs +++ b/src/libsyntax/feature_gate/check.rs @@ -823,7 +823,7 @@ pub fn get_features(span_handler: &Handler, krate_attrs: &[ast::Attribute], } if let Some(allowed) = allow_features.as_ref() { - if allowed.iter().find(|&f| f == &name.as_str() as &str).is_none() { + if allowed.iter().find(|&f| name.as_str() == *f).is_none() { span_err!(span_handler, mi.span(), E0725, "the feature `{}` is not in the list of allowed features", name); |