Skip to content

Update substring match for substitutions #148061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −1
Draft

Update substring match for substitutions #148061

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion compiler/rustc_errors/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pub use rustc_span::fatal_error::{FatalError, FatalErrorMarker};
use rustc_span::source_map::SourceMap;
use rustc_span::{BytePos, DUMMY_SP, Loc, Span};
pub use snippet::Style;
use tracing::debug;
use tracing::{debug, instrument};

use crate::emitter::TimingEvent;
use crate::registry::Registry;
Expand Down Expand Up @@ -245,6 +245,7 @@ pub(crate) struct SubstitutionHighlight {
impl SubstitutionPart {
/// Try to turn a replacement into an addition when the span that is being
/// overwritten matches either the prefix or suffix of the replacement.
#[instrument(level = "debug", skip(self, sm))]
fn trim_trivial_replacements(self, sm: &SourceMap) -> TrimmedSubstitutionPart {
let mut trimmed_part = TrimmedSubstitutionPart {
original_span: self.span,
Expand Down Expand Up @@ -306,6 +307,16 @@ impl TrimmedSubstitutionPart {
/// `BB` is. Return the length of the prefix, the "trimmed" suggestion, and the length
/// of the suffix.
fn as_substr<'a>(original: &'a str, suggestion: &'a str) -> Option<(usize, &'a str, usize)> {
if suggestion.contains("::")
&& suggestion.ends_with(original)
&& suggestion.len() > original.len()
{
let prefix = &suggestion[..suggestion.len() - original.len()];
if prefix.ends_with("::") && suggestion.chars().next() == original.chars().next() {
return Some((0, prefix, original.len()));
}
}

let common_prefix = original
.chars()
.zip(suggestion.chars())
Expand Down
Loading