Skip to content

Commit 44cb86b

Browse files
CentrilCentril
authored
Rollup merge of #61003 - nnethercote:rm-InternedString-PartialEq-impls, r=petrochenkov
Remove impls for `InternedString`/string equality. `Symbol` received the same treatment in #60630. Also, we can derive `PartialEq` for `InternedString`. r? @petrochenkov
2 parents 9817209 + b557567 commit 44cb86b

File tree

12 files changed

+34
-66
lines changed

12 files changed

+34
-66
lines changed

Diff for: ‎src/librustc/middle/intrinsicck.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use crate::ty::query::Providers;
66

77
use rustc_target::spec::abi::Abi::RustIntrinsic;
88
use rustc_data_structures::indexed_vec::Idx;
9-
use syntax_pos::Span;
9+
use syntax_pos::{Span, sym};
1010
use crate::hir::intravisit::{self, Visitor, NestedVisitorMap};
1111
use crate::hir;
1212

@@ -69,7 +69,7 @@ fn unpack_option_like<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
6969
impl<'a, 'tcx> ExprVisitor<'a, 'tcx> {
7070
fn def_id_is_transmute(&self, def_id: DefId) -> bool {
7171
self.tcx.fn_sig(def_id).abi() == RustIntrinsic &&
72-
self.tcx.item_name(def_id) == "transmute"
72+
self.tcx.item_name(def_id) == sym::transmute
7373
}
7474

7575
fn check_transmute(&self, span: Span, from: Ty<'tcx>, to: Ty<'tcx>) {

Diff for: ‎src/librustc/traits/on_unimplemented.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -243,15 +243,15 @@ impl<'a, 'gcx, 'tcx> OnUnimplementedFormatString {
243243
// `{Self}` is allowed
244244
Position::ArgumentNamed(s) if s == "Self" => (),
245245
// `{ThisTraitsName}` is allowed
246-
Position::ArgumentNamed(s) if s == name => (),
246+
Position::ArgumentNamed(s) if s == name.as_str() => (),
247247
// `{from_method}` is allowed
248248
Position::ArgumentNamed(s) if s == "from_method" => (),
249249
// `{from_desugaring}` is allowed
250250
Position::ArgumentNamed(s) if s == "from_desugaring" => (),
251251
// So is `{A}` if A is a type parameter
252-
Position::ArgumentNamed(s) => match generics.params.iter().find(|param|
253-
param.name == s
254-
) {
252+
Position::ArgumentNamed(s) => match generics.params.iter().find(|param| {
253+
param.name.as_str() == s
254+
}) {
255255
Some(_) => (),
256256
None => {
257257
span_err!(tcx.sess, span, E0230,
@@ -301,7 +301,7 @@ impl<'a, 'gcx, 'tcx> OnUnimplementedFormatString {
301301
Piece::NextArgument(a) => match a.position {
302302
Position::ArgumentNamed(s) => match generic_map.get(s) {
303303
Some(val) => val,
304-
None if s == name => {
304+
None if s == name.as_str() => {
305305
&trait_str
306306
}
307307
None => {

Diff for: ‎src/librustc/ty/mod.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -2981,9 +2981,9 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
29812981
}
29822982
}
29832983

2984-
pub fn item_name(self, id: DefId) -> InternedString {
2984+
pub fn item_name(self, id: DefId) -> Symbol {
29852985
if id.index == CRATE_DEF_INDEX {
2986-
self.original_crate_name(id.krate).as_interned_str()
2986+
self.original_crate_name(id.krate)
29872987
} else {
29882988
let def_key = self.def_key(id);
29892989
match def_key.disambiguated_data.data {
@@ -2995,7 +2995,7 @@ impl<'a, 'gcx, 'tcx> TyCtxt<'a, 'gcx, 'tcx> {
29952995
}),
29962996
_ => def_key.disambiguated_data.data.get_opt_name().unwrap_or_else(|| {
29972997
bug!("item_name: no name for {:?}", self.def_path(id));
2998-
}),
2998+
}).as_symbol(),
29992999
}
30003000
}
30013001
}

Diff for: ‎src/librustc/ty/print/pretty.rs

+7-4
Original file line numberDiff line numberDiff line change
@@ -1140,14 +1140,16 @@ impl<F: fmt::Write> PrettyPrinter<'gcx, 'tcx> for FmtPrinter<'_, 'gcx, 'tcx, F>
11401140

11411141
match *region {
11421142
ty::ReEarlyBound(ref data) => {
1143-
data.name != "" && data.name != "'_"
1143+
data.name.as_symbol() != keywords::Invalid.name() &&
1144+
data.name.as_symbol() != keywords::UnderscoreLifetime.name()
11441145
}
11451146

11461147
ty::ReLateBound(_, br) |
11471148
ty::ReFree(ty::FreeRegion { bound_region: br, .. }) |
11481149
ty::RePlaceholder(ty::Placeholder { name: br, .. }) => {
11491150
if let ty::BrNamed(_, name) = br {
1150-
if name != "" && name != "'_" {
1151+
if name.as_symbol() != keywords::Invalid.name() &&
1152+
name.as_symbol() != keywords::UnderscoreLifetime.name() {
11511153
return true;
11521154
}
11531155
}
@@ -1203,7 +1205,7 @@ impl<F: fmt::Write> FmtPrinter<'_, '_, '_, F> {
12031205
// `explain_region()` or `note_and_explain_region()`.
12041206
match *region {
12051207
ty::ReEarlyBound(ref data) => {
1206-
if data.name != "" {
1208+
if data.name.as_symbol() != keywords::Invalid.name() {
12071209
p!(write("{}", data.name));
12081210
return Ok(self);
12091211
}
@@ -1212,7 +1214,8 @@ impl<F: fmt::Write> FmtPrinter<'_, '_, '_, F> {
12121214
ty::ReFree(ty::FreeRegion { bound_region: br, .. }) |
12131215
ty::RePlaceholder(ty::Placeholder { name: br, .. }) => {
12141216
if let ty::BrNamed(_, name) = br {
1215-
if name != "" && name != "'_" {
1217+
if name.as_symbol() != keywords::Invalid.name() &&
1218+
name.as_symbol() != keywords::UnderscoreLifetime.name() {
12161219
p!(write("{}", name));
12171220
return Ok(self);
12181221
}

Diff for: ‎src/librustc_codegen_utils/symbol_names.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ fn compute_symbol_name(tcx: TyCtxt<'_, 'tcx, 'tcx>, instance: Instance<'tcx>) ->
264264
return name.as_interned_str();
265265
}
266266
// Don't mangle foreign items.
267-
return tcx.item_name(def_id);
267+
return tcx.item_name(def_id).as_interned_str();
268268
}
269269

270270
if let Some(name) = &attrs.export_name {
@@ -274,7 +274,7 @@ fn compute_symbol_name(tcx: TyCtxt<'_, 'tcx, 'tcx>, instance: Instance<'tcx>) ->
274274

275275
if attrs.flags.contains(CodegenFnAttrFlags::NO_MANGLE) {
276276
// Don't mangle
277-
return tcx.item_name(def_id);
277+
return tcx.item_name(def_id).as_interned_str();
278278
}
279279

280280
// We want to compute the "type" of this item. Unfortunately, some

Diff for: ‎src/librustc_lint/builtin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -929,7 +929,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MutableTransmutes {
929929

930930
fn def_id_is_transmute(cx: &LateContext<'_, '_>, def_id: DefId) -> bool {
931931
cx.tcx.fn_sig(def_id).abi() == RustIntrinsic &&
932-
cx.tcx.item_name(def_id) == "transmute"
932+
cx.tcx.item_name(def_id) == sym::transmute
933933
}
934934
}
935935
}

Diff for: ‎src/librustc_metadata/cstore_impl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ impl cstore::CStore {
432432
let data = self.get_crate_data(id.krate);
433433
if let Some(ref proc_macros) = data.proc_macros {
434434
return LoadedMacro::ProcMacro(proc_macros[id.index.to_proc_macro_index()].1.clone());
435-
} else if data.name == sym::proc_macro && data.item_name(id.index) == "quote" {
435+
} else if data.name == sym::proc_macro && data.item_name(id.index) == sym::quote {
436436
use syntax::ext::base::SyntaxExtension;
437437
use syntax_ext::proc_macro_impl::BangProcMacro;
438438

Diff for: ‎src/librustc_metadata/decoder.rs

+7-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ use rustc_serialize::{Decodable, Decoder, SpecializedDecoder, opaque};
2929
use syntax::attr;
3030
use syntax::ast::{self, Ident};
3131
use syntax::source_map;
32-
use syntax::symbol::{InternedString, sym};
32+
use syntax::symbol::{Symbol, sym};
3333
use syntax::ext::base::{MacroKind, SyntaxExtension};
3434
use syntax::ext::hygiene::Mark;
3535
use syntax_pos::{self, Span, BytePos, Pos, DUMMY_SP, NO_EXPANSION};
@@ -497,12 +497,13 @@ impl<'a, 'tcx> CrateMetadata {
497497
}
498498
}
499499

500-
pub fn item_name(&self, item_index: DefIndex) -> InternedString {
500+
pub fn item_name(&self, item_index: DefIndex) -> Symbol {
501501
self.def_key(item_index)
502502
.disambiguated_data
503503
.data
504504
.get_opt_name()
505505
.expect("no name in item_name")
506+
.as_symbol()
506507
}
507508

508509
pub fn def_kind(&self, index: DefIndex) -> Option<DefKind> {
@@ -568,15 +569,15 @@ impl<'a, 'tcx> CrateMetadata {
568569

569570
ty::VariantDef::new(
570571
tcx,
571-
Ident::from_interned_str(self.item_name(index)),
572+
Ident::with_empty_ctxt(self.item_name(index)),
572573
variant_did,
573574
ctor_did,
574575
data.discr,
575576
item.children.decode(self).map(|index| {
576577
let f = self.entry(index);
577578
ty::FieldDef {
578579
did: self.local_def_id(index),
579-
ident: Ident::from_interned_str(self.item_name(index)),
580+
ident: Ident::with_empty_ctxt(self.item_name(index)),
580581
vis: f.visibility.decode(self)
581582
}
582583
}).collect(),
@@ -787,7 +788,7 @@ impl<'a, 'tcx> CrateMetadata {
787788
if let Some(kind) = self.def_kind(child_index) {
788789
callback(def::Export {
789790
res: Res::Def(kind, self.local_def_id(child_index)),
790-
ident: Ident::from_interned_str(self.item_name(child_index)),
791+
ident: Ident::with_empty_ctxt(self.item_name(child_index)),
791792
vis: self.get_visibility(child_index),
792793
span: self.entry(child_index).span.decode((self, sess)),
793794
});
@@ -982,7 +983,7 @@ impl<'a, 'tcx> CrateMetadata {
982983
self.entry(id)
983984
.children
984985
.decode(self)
985-
.map(|index| self.item_name(index).as_symbol())
986+
.map(|index| self.item_name(index))
986987
.collect()
987988
}
988989

Diff for: ‎src/librustc_mir/shim.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use rustc::ty::query::Providers;
1010
use rustc_data_structures::indexed_vec::{IndexVec, Idx};
1111

1212
use rustc_target::spec::abi::Abi;
13-
use syntax_pos::Span;
13+
use syntax_pos::{Span, sym};
1414

1515
use std::fmt;
1616
use std::iter;
@@ -100,9 +100,9 @@ fn make_shim<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
100100
}
101101
ty::InstanceDef::CloneShim(def_id, ty) => {
102102
let name = tcx.item_name(def_id);
103-
if name == "clone" {
103+
if name == sym::clone {
104104
build_clone_shim(tcx, def_id, ty)
105-
} else if name == "clone_from" {
105+
} else if name == sym::clone_from {
106106
debug!("make_shim({:?}: using default trait implementation", instance);
107107
return tcx.optimized_mir(def_id);
108108
} else {

Diff for: ‎src/librustc_mir/transform/rustc_peek.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ fn is_rustc_peek<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
223223
if let ty::FnDef(def_id, _) = func.ty.sty {
224224
let abi = tcx.fn_sig(def_id).abi();
225225
let name = tcx.item_name(def_id);
226-
if abi == Abi::RustIntrinsic && name == "rustc_peek" {
226+
if abi == Abi::RustIntrinsic && name == sym::rustc_peek {
227227
return Some((args, source_info.span));
228228
}
229229
}

Diff for: ‎src/librustdoc/clean/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1702,7 +1702,7 @@ impl<'a, 'tcx> Clean<Generics> for (&'a ty::Generics,
17021702
let stripped_typarams = gens.params.iter().filter_map(|param| match param.kind {
17031703
ty::GenericParamDefKind::Lifetime => None,
17041704
ty::GenericParamDefKind::Type { .. } => {
1705-
if param.name == keywords::SelfUpper.name().as_str() {
1705+
if param.name.as_symbol() == keywords::SelfUpper.name() {
17061706
assert_eq!(param.index, 0);
17071707
return None;
17081708
}

Diff for: ‎src/libsyntax_pos/symbol.rs

+1-37
Original file line numberDiff line numberDiff line change
@@ -1147,7 +1147,7 @@ impl Encodable for LocalInternedString {
11471147
/// assert_ne!(Symbol::gensym("x"), Symbol::gensym("x"))
11481148
/// assert_eq!(Symbol::gensym("x").as_interned_str(), Symbol::gensym("x").as_interned_str())
11491149
/// ```
1150-
#[derive(Clone, Copy, Eq)]
1150+
#[derive(Clone, Copy, PartialEq, Eq)]
11511151
pub struct InternedString {
11521152
symbol: Symbol,
11531153
}
@@ -1212,42 +1212,6 @@ impl Ord for InternedString {
12121212
}
12131213
}
12141214

1215-
impl<T: std::ops::Deref<Target = str>> PartialEq<T> for InternedString {
1216-
fn eq(&self, other: &T) -> bool {
1217-
self.with(|string| string == other.deref())
1218-
}
1219-
}
1220-
1221-
impl PartialEq<InternedString> for InternedString {
1222-
fn eq(&self, other: &InternedString) -> bool {
1223-
self.symbol == other.symbol
1224-
}
1225-
}
1226-
1227-
impl PartialEq<InternedString> for str {
1228-
fn eq(&self, other: &InternedString) -> bool {
1229-
other.with(|string| self == string)
1230-
}
1231-
}
1232-
1233-
impl<'a> PartialEq<InternedString> for &'a str {
1234-
fn eq(&self, other: &InternedString) -> bool {
1235-
other.with(|string| *self == string)
1236-
}
1237-
}
1238-
1239-
impl PartialEq<InternedString> for String {
1240-
fn eq(&self, other: &InternedString) -> bool {
1241-
other.with(|string| self == string)
1242-
}
1243-
}
1244-
1245-
impl<'a> PartialEq<InternedString> for &'a String {
1246-
fn eq(&self, other: &InternedString) -> bool {
1247-
other.with(|string| *self == string)
1248-
}
1249-
}
1250-
12511215
impl fmt::Debug for InternedString {
12521216
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
12531217
self.with(|str| fmt::Debug::fmt(&str, f))

0 commit comments

Comments
 (0)