diff options
| author | Mara Bos <m-ou.se@m-ou.se> | 2021-06-17 23:41:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-17 23:41:01 +0200 |
| commit | 3d7437fa214d56df7878db9bd9479c75798df8bf (patch) | |
| tree | 2b9ac6ab5214641418d0e18013c93c557d0eb6e4 | |
| parent | a5dce6c99a65195bd5d945563b51d4ec12dc692d (diff) | |
| parent | 34f38bf76006b0dfdc2784d76e3e1775cee024a4 (diff) | |
| download | rust-3d7437fa214d56df7878db9bd9479c75798df8bf.tar.gz rust-3d7437fa214d56df7878db9bd9479c75798df8bf.zip | |
Rollup merge of #86388 - JohnTitor:static-symbol-s, r=LeSeulArtichaut
Make `s` pre-interned Now we should be able to pre-intern `s` as the test `ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.rs` no longer fails.
| -rw-r--r-- | compiler/rustc_builtin_macros/src/deriving/encodable.rs | 7 | ||||
| -rw-r--r-- | compiler/rustc_span/src/symbol.rs | 1 |
2 files changed, 2 insertions, 6 deletions
diff --git a/compiler/rustc_builtin_macros/src/deriving/encodable.rs b/compiler/rustc_builtin_macros/src/deriving/encodable.rs index 01a57bea14e..c5f3a9d3379 100644 --- a/compiler/rustc_builtin_macros/src/deriving/encodable.rs +++ b/compiler/rustc_builtin_macros/src/deriving/encodable.rs @@ -124,12 +124,7 @@ pub fn expand_deriving_rustc_encodable( explicit_self: borrowed_explicit_self(), args: vec![( Ptr(Box::new(Literal(Path::new_local(typaram))), Borrowed(None, Mutability::Mut)), - // FIXME: we could use `sym::s` here, but making `s` a static - // symbol changes the symbol index ordering in a way that makes - // ui/lint/rfc-2457-non-ascii-idents/lint-confusable-idents.rs - // fail. The linting code should be fixed so that its output - // does not depend on the symbol index ordering. - Symbol::intern("s"), + sym::s, )], ret_ty: Literal(Path::new_( pathvec_std!(result::Result), diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs index a96d37c652d..862bde3f6a3 100644 --- a/compiler/rustc_span/src/symbol.rs +++ b/compiler/rustc_span/src/symbol.rs @@ -1062,6 +1062,7 @@ symbols! { rustdoc, rustfmt, rvalue_static_promotion, + s, sanitize, sanitizer_runtime, saturating_add, |