diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-10-15 13:27:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-15 13:27:29 +0200 |
| commit | bc3e97a277778b37d28dbdf45ae5589b95586971 (patch) | |
| tree | ce2a5b9a0ea9cba57b6a1e032436cd88b4d71bf7 /src/libsyntax | |
| parent | d24c66fba39fe88ffc2a1755188a50c6781499f7 (diff) | |
| parent | 57d33b155f31ca8c9d17371416d085c66ab4e61c (diff) | |
| download | rust-bc3e97a277778b37d28dbdf45ae5589b95586971.tar.gz rust-bc3e97a277778b37d28dbdf45ae5589b95586971.zip | |
Rollup merge of #65426 - nnethercote:rm-custom-LocalInternedString-PartialEq-impls, r=petrochenkov
Remove custom `PartialEq` impls for `LocalInternedString`. This is on-trend with the recent changes simplifying `LocalInternedString` and reducing its use. r? @petrochenkov
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate/check.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/literal.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/feature_gate/check.rs b/src/libsyntax/feature_gate/check.rs index 700ce26171a..c07b6050afe 100644 --- a/src/libsyntax/feature_gate/check.rs +++ b/src/libsyntax/feature_gate/check.rs @@ -814,7 +814,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()).is_none() { + if allowed.iter().find(|&f| f == &name.as_str() as &str).is_none() { span_err!(span_handler, mi.span(), E0725, "the feature `{}` is not in the list of allowed features", name); diff --git a/src/libsyntax/parse/literal.rs b/src/libsyntax/parse/literal.rs index fbd409b0de4..14e1696610a 100644 --- a/src/libsyntax/parse/literal.rs +++ b/src/libsyntax/parse/literal.rs @@ -134,7 +134,7 @@ impl LitKind { let (kind, symbol, suffix) = match *self { LitKind::Str(symbol, ast::StrStyle::Cooked) => { // Don't re-intern unless the escaped string is different. - let s = &symbol.as_str(); + let s: &str = &symbol.as_str(); let escaped = s.escape_default().to_string(); let symbol = if escaped == *s { symbol } else { Symbol::intern(&escaped) }; (token::Str, symbol, None) |
