nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused from_method symbol

Browse Source
This commit is contained in:
Santiago Pastorino 2023-07-07 15:57:30 -03:00
parent fd68a6ded9
commit 3aec8d4227
No known key found for this signature in database
GPG Key ID: 8131A24E0C79EFAF
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler/rustc_span/src/symbol.rs
View File

@ -759,7 +759,6 @@ symbols! {
from_desugaring, from_desugaring,
from_fn, from_fn,
from_iter, from_iter,
from_method,
from_output, from_output,
from_residual, from_residual,
from_size_align_unchecked, from_size_align_unchecked,

20
compiler/rustc_trait_selection/src/traits/error_reporting/on_unimplemented.rs
View File

@ -41,7 +41,6 @@ pub trait TypeErrCtxtExt<'tcx> {
static ALLOWED_FORMAT_SYMBOLS: &[Symbol] = &[ static ALLOWED_FORMAT_SYMBOLS: &[Symbol] = &[
kw::SelfUpper, kw::SelfUpper,
sym::ItemContext, sym::ItemContext,
sym::from_method,
sym::from_desugaring, sym::from_desugaring,
sym::direct, sym::direct,
sym::cause, sym::cause,
@ -172,23 +171,6 @@ impl<'tcx> TypeErrCtxtExt<'tcx> for TypeErrCtxt<'_, 'tcx> {
} }
} }
if let ObligationCauseCode::ItemObligation(item)
| ObligationCauseCode::BindingObligation(item, _)
| ObligationCauseCode::ExprItemObligation(item, ..)
| ObligationCauseCode::ExprBindingObligation(item, ..) = *obligation.cause.code()
{
// FIXME: maybe also have some way of handling methods
// from other traits? That would require name resolution,
// which we might want to be some sort of hygienic.
//
// Currently I'm leaving it for what I need for `try`.
if self.tcx.trait_of_item(item) == Some(trait_ref.def_id) {
let method = self.tcx.item_name(item);
flags.push((sym::from_method, None));
flags.push((sym::from_method, Some(method.to_string())));
}
}
if let Some(k) = obligation.cause.span.desugaring_kind() { if let Some(k) = obligation.cause.span.desugaring_kind() {
flags.push((sym::from_desugaring, None)); flags.push((sym::from_desugaring, None));
flags.push((sym::from_desugaring, Some(format!("{:?}", k)))); flags.push((sym::from_desugaring, Some(format!("{:?}", k))));
@ -672,7 +654,7 @@ impl<'tcx> OnUnimplementedFormatString {
None => { None => {
if let Some(val) = options.get(&s) { if let Some(val) = options.get(&s) {
val val
} else if s == sym::from_desugaring || s == sym::from_method { } else if s == sym::from_desugaring {
// don't break messages using these two arguments incorrectly // don't break messages using these two arguments incorrectly
&empty_string &empty_string
} else if s == sym::ItemContext { } else if s == sym::ItemContext {