Skip to content

Commit 9606412

Browse files
borsbors
committed
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank
Liveness: Cache the set of string constants for suggestions. Even on a slow diagnostic path, listing all the constants in MIR can be expensive, so cache it.
2 parents 0bbef55 + 727da8c commit 9606412

1 file changed

Lines changed: 40 additions & 41 deletions

File tree

‎compiler/rustc_mir_transform/src/liveness.rs‎

Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,45 +164,6 @@ fn is_capture(place: PlaceRef<'_>) -> bool {
164164
}
165165
}
166166

167-
/// Give a diagnostic when any of the string constants look like a naked format string that would
168-
/// interpolate our dead local.
169-
fnmaybe_suggest_literal_matching_name(
170-
body:&Body<'_>,
171-
name:Symbol,
172-
) -> Vec<errors::UnusedVariableStringInterp>{
173-
structLiteralFinder<'body,'tcx>{
174-
body:&'bodyBody<'tcx>,
175-
name:String,
176-
name_colon:String,
177-
found:Vec<errors::UnusedVariableStringInterp>,
178-
}
179-
180-
impl<'tcx>Visitor<'tcx>forLiteralFinder<'_,'tcx>{
181-
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>,loc:Location){
182-
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
183-
&& ref_ty.kind() == &ty::Str
184-
{
185-
let rendered_constant = constant.const_.to_string();
186-
if rendered_constant.contains(&self.name)
187-
|| rendered_constant.contains(&self.name_colon)
188-
{
189-
let lit = self.body.source_info(loc).span;
190-
self.found.push(errors::UnusedVariableStringInterp{ lit });
191-
}
192-
}
193-
}
194-
}
195-
196-
letmut finder = LiteralFinder{
197-
body,
198-
name:format!("{{{name}}}"),
199-
name_colon:format!("{{{name}:"),
200-
found:vec![],
201-
};
202-
finder.visit_body(body);
203-
finder.found
204-
}
205-
206167
/// Give a diagnostic when an unused variable may be a typo of a unit variant or a struct.
207168
fnmaybe_suggest_unit_pattern_typo<'tcx>(
208169
tcx:TyCtxt<'tcx>,
@@ -879,6 +840,44 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
879840
fnreport_fully_unused(&mutself){
880841
let tcx = self.tcx;
881842

843+
// Give a diagnostic when any of the string constants look like a naked format string that
844+
// would interpolate our dead local.
845+
letmut string_constants_in_body = None;
846+
letmut maybe_suggest_literal_matching_name = |name:Symbol| {
847+
// Visiting MIR to enumerate string constants can be expensive, so cache the result.
848+
let string_constants_in_body = string_constants_in_body.get_or_insert_with(|| {
849+
structLiteralFinder{
850+
found:Vec<(Span,String)>,
851+
}
852+
853+
impl<'tcx>Visitor<'tcx>forLiteralFinder{
854+
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>, _:Location){
855+
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
856+
&& ref_ty.kind() == &ty::Str
857+
{
858+
let rendered_constant = constant.const_.to_string();
859+
self.found.push((constant.span, rendered_constant));
860+
}
861+
}
862+
}
863+
864+
letmut finder = LiteralFinder{found:vec![]};
865+
finder.visit_body(self.body);
866+
finder.found
867+
});
868+
869+
let brace_name = format!("{{{name}");
870+
string_constants_in_body
871+
.iter()
872+
.filter(|(_, rendered_constant)| {
873+
rendered_constant
874+
.split(&brace_name)
875+
.any(|c| matches!(c.chars().next(),Some('}' | ':')))
876+
})
877+
.map(|&(lit, _)| errors::UnusedVariableStringInterp{ lit })
878+
.collect::<Vec<_>>()
879+
};
880+
882881
// First, report fully unused locals.
883882
for(index, place)inself.checked_places.iter(){
884883
ifself.ever_live.contains(index){
@@ -940,7 +939,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
940939
def_span,
941940
errors::UnusedVariable{
942941
name,
943-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
942+
string_interp:maybe_suggest_literal_matching_name(name),
944943
sugg,
945944
},
946945
);
@@ -1030,7 +1029,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
10301029
spans,
10311030
errors::UnusedVariable{
10321031
name,
1033-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
1032+
string_interp:maybe_suggest_literal_matching_name(name),
10341033
sugg,
10351034
},
10361035
);

0 commit comments

Comments
 (0)
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank · rust-lang/rust@9606412 · GitHub
Skip to content
Commit 9606412
Browse files
borsbors
committed
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank
Liveness: Cache the set of string constants for suggestions.
Even on a slow diagnostic path, listing all the constants in MIR can be expensive, so cache it.
2 parents 0bbef55 + 727da8c commit 9606412
1 file changed
Lines changed: 40 additions & 41 deletions
File tree
‎compiler/rustc_mir_transform/src/liveness.rs‎
Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,45 +164,6 @@ fn is_capture(place: PlaceRef<'_>) -> bool {
164164
}
165165
}
166166

167-
/// Give a diagnostic when any of the string constants look like a naked format string that would
168-
/// interpolate our dead local.
169-
fnmaybe_suggest_literal_matching_name(
170-
body:&Body<'_>,
171-
name:Symbol,
172-
) -> Vec<errors::UnusedVariableStringInterp>{
173-
structLiteralFinder<'body,'tcx>{
174-
body:&'bodyBody<'tcx>,
175-
name:String,
176-
name_colon:String,
177-
found:Vec<errors::UnusedVariableStringInterp>,
178-
}
179-
180-
impl<'tcx>Visitor<'tcx>forLiteralFinder<'_,'tcx>{
181-
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>,loc:Location){
182-
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
183-
 && ref_ty.kind() == &ty::Str
184-
{
185-
let rendered_constant = constant.const_.to_string();
186-
if rendered_constant.contains(&self.name)
187-
 || rendered_constant.contains(&self.name_colon)
188-
{
189-
let lit = self.body.source_info(loc).span;
190-
self.found.push(errors::UnusedVariableStringInterp{ lit });
191-
}
192-
}
193-
}
194-
}
195-
196-
letmut finder = LiteralFinder{
197-
 body,
198-
name:format!("{{{name}}}"),
199-
name_colon:format!("{{{name}:"),
200-
found:vec![],
201-
};
202-
 finder.visit_body(body);
203-
 finder.found
204-
}
205-
206167
/// Give a diagnostic when an unused variable may be a typo of a unit variant or a struct.
207168
fnmaybe_suggest_unit_pattern_typo<'tcx>(
208169
tcx:TyCtxt<'tcx>,
@@ -879,6 +840,44 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
879840
fnreport_fully_unused(&mutself){
880841
let tcx = self.tcx;
881842

843+
// Give a diagnostic when any of the string constants look like a naked format string that
844+
// would interpolate our dead local.
845+
letmut string_constants_in_body = None;
846+
letmut maybe_suggest_literal_matching_name = |name:Symbol| {
847+
// Visiting MIR to enumerate string constants can be expensive, so cache the result.
848+
let string_constants_in_body = string_constants_in_body.get_or_insert_with(|| {
849+
structLiteralFinder{
850+
found:Vec<(Span,String)>,
851+
}
852+
853+
impl<'tcx>Visitor<'tcx>forLiteralFinder{
854+
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>, _:Location){
855+
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
856+
 && ref_ty.kind() == &ty::Str
857+
{
858+
let rendered_constant = constant.const_.to_string();
859+
self.found.push((constant.span, rendered_constant));
860+
}
861+
}
862+
}
863+
864+
letmut finder = LiteralFinder{found:vec![]};
865+
 finder.visit_body(self.body);
866+
 finder.found
867+
});
868+
869+
let brace_name = format!("{{{name}");
870+
 string_constants_in_body
871+
.iter()
872+
.filter(|(_, rendered_constant)| {
873+
 rendered_constant
874+
.split(&brace_name)
875+
.any(|c| matches!(c.chars().next(),Some('}' | ':')))
876+
})
877+
.map(|&(lit, _)| errors::UnusedVariableStringInterp{ lit })
878+
.collect::<Vec<_>>()
879+
};
880+
882881
// First, report fully unused locals.
883882
for(index, place)inself.checked_places.iter(){
884883
ifself.ever_live.contains(index){
@@ -940,7 +939,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
940939
 def_span,
941940
 errors::UnusedVariable{
942941
 name,
943-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
942+
string_interp:maybe_suggest_literal_matching_name(name),
944943
 sugg,
945944
},
946945
);
@@ -1030,7 +1029,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
10301029
 spans,
10311030
 errors::UnusedVariable{
10321031
 name,
1033-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
1032+
string_interp:maybe_suggest_literal_matching_name(name),
10341033
 sugg,
10351034
},
10361035
);
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank · rust-lang/rust@9606412 · GitHub
Skip to content
Commit 9606412
Browse files
borsbors
committed
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank
Liveness: Cache the set of string constants for suggestions.
Even on a slow diagnostic path, listing all the constants in MIR can be expensive, so cache it.
2 parents 0bbef55 + 727da8c commit 9606412
1 file changed
Lines changed: 40 additions & 41 deletions
File tree
‎compiler/rustc_mir_transform/src/liveness.rs‎
Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,45 +164,6 @@ fn is_capture(place: PlaceRef<'_>) -> bool {
164164
}
165165
}
166166

167-
/// Give a diagnostic when any of the string constants look like a naked format string that would
168-
/// interpolate our dead local.
169-
fnmaybe_suggest_literal_matching_name(
170-
body:&Body<'_>,
171-
name:Symbol,
172-
) -> Vec<errors::UnusedVariableStringInterp>{
173-
structLiteralFinder<'body,'tcx>{
174-
body:&'bodyBody<'tcx>,
175-
name:String,
176-
name_colon:String,
177-
found:Vec<errors::UnusedVariableStringInterp>,
178-
}
179-
180-
impl<'tcx>Visitor<'tcx>forLiteralFinder<'_,'tcx>{
181-
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>,loc:Location){
182-
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
183-
 && ref_ty.kind() == &ty::Str
184-
{
185-
let rendered_constant = constant.const_.to_string();
186-
if rendered_constant.contains(&self.name)
187-
 || rendered_constant.contains(&self.name_colon)
188-
{
189-
let lit = self.body.source_info(loc).span;
190-
self.found.push(errors::UnusedVariableStringInterp{ lit });
191-
}
192-
}
193-
}
194-
}
195-
196-
letmut finder = LiteralFinder{
197-
 body,
198-
name:format!("{{{name}}}"),
199-
name_colon:format!("{{{name}:"),
200-
found:vec![],
201-
};
202-
 finder.visit_body(body);
203-
 finder.found
204-
}
205-
206167
/// Give a diagnostic when an unused variable may be a typo of a unit variant or a struct.
207168
fnmaybe_suggest_unit_pattern_typo<'tcx>(
208169
tcx:TyCtxt<'tcx>,
@@ -879,6 +840,44 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
879840
fnreport_fully_unused(&mutself){
880841
let tcx = self.tcx;
881842

843+
// Give a diagnostic when any of the string constants look like a naked format string that
844+
// would interpolate our dead local.
845+
letmut string_constants_in_body = None;
846+
letmut maybe_suggest_literal_matching_name = |name:Symbol| {
847+
// Visiting MIR to enumerate string constants can be expensive, so cache the result.
848+
let string_constants_in_body = string_constants_in_body.get_or_insert_with(|| {
849+
structLiteralFinder{
850+
found:Vec<(Span,String)>,
851+
}
852+
853+
impl<'tcx>Visitor<'tcx>forLiteralFinder{
854+
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>, _:Location){
855+
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
856+
 && ref_ty.kind() == &ty::Str
857+
{
858+
let rendered_constant = constant.const_.to_string();
859+
self.found.push((constant.span, rendered_constant));
860+
}
861+
}
862+
}
863+
864+
letmut finder = LiteralFinder{found:vec![]};
865+
 finder.visit_body(self.body);
866+
 finder.found
867+
});
868+
869+
let brace_name = format!("{{{name}");
870+
 string_constants_in_body
871+
.iter()
872+
.filter(|(_, rendered_constant)| {
873+
 rendered_constant
874+
.split(&brace_name)
875+
.any(|c| matches!(c.chars().next(),Some('}' | ':')))
876+
})
877+
.map(|&(lit, _)| errors::UnusedVariableStringInterp{ lit })
878+
.collect::<Vec<_>>()
879+
};
880+
882881
// First, report fully unused locals.
883882
for(index, place)inself.checked_places.iter(){
884883
ifself.ever_live.contains(index){
@@ -940,7 +939,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
940939
 def_span,
941940
 errors::UnusedVariable{
942941
 name,
943-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
942+
string_interp:maybe_suggest_literal_matching_name(name),
944943
 sugg,
945944
},
946945
);
@@ -1030,7 +1029,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
10301029
 spans,
10311030
 errors::UnusedVariable{
10321031
 name,
1033-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
1032+
string_interp:maybe_suggest_literal_matching_name(name),
10341033
 sugg,
10351034
},
10361035
);
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank · rust-lang/rust@9606412 · GitHub
Skip to content
Commit 9606412
Browse files
borsbors
committed
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank
Liveness: Cache the set of string constants for suggestions.
Even on a slow diagnostic path, listing all the constants in MIR can be expensive, so cache it.
2 parents 0bbef55 + 727da8c commit 9606412
1 file changed
Lines changed: 40 additions & 41 deletions
File tree
‎compiler/rustc_mir_transform/src/liveness.rs‎
Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,45 +164,6 @@ fn is_capture(place: PlaceRef<'_>) -> bool {
164164
}
165165
}
166166

167-
/// Give a diagnostic when any of the string constants look like a naked format string that would
168-
/// interpolate our dead local.
169-
fnmaybe_suggest_literal_matching_name(
170-
body:&Body<'_>,
171-
name:Symbol,
172-
) -> Vec<errors::UnusedVariableStringInterp>{
173-
structLiteralFinder<'body,'tcx>{
174-
body:&'bodyBody<'tcx>,
175-
name:String,
176-
name_colon:String,
177-
found:Vec<errors::UnusedVariableStringInterp>,
178-
}
179-
180-
impl<'tcx>Visitor<'tcx>forLiteralFinder<'_,'tcx>{
181-
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>,loc:Location){
182-
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
183-
 && ref_ty.kind() == &ty::Str
184-
{
185-
let rendered_constant = constant.const_.to_string();
186-
if rendered_constant.contains(&self.name)
187-
 || rendered_constant.contains(&self.name_colon)
188-
{
189-
let lit = self.body.source_info(loc).span;
190-
self.found.push(errors::UnusedVariableStringInterp{ lit });
191-
}
192-
}
193-
}
194-
}
195-
196-
letmut finder = LiteralFinder{
197-
 body,
198-
name:format!("{{{name}}}"),
199-
name_colon:format!("{{{name}:"),
200-
found:vec![],
201-
};
202-
 finder.visit_body(body);
203-
 finder.found
204-
}
205-
206167
/// Give a diagnostic when an unused variable may be a typo of a unit variant or a struct.
207168
fnmaybe_suggest_unit_pattern_typo<'tcx>(
208169
tcx:TyCtxt<'tcx>,
@@ -879,6 +840,44 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
879840
fnreport_fully_unused(&mutself){
880841
let tcx = self.tcx;
881842

843+
// Give a diagnostic when any of the string constants look like a naked format string that
844+
// would interpolate our dead local.
845+
letmut string_constants_in_body = None;
846+
letmut maybe_suggest_literal_matching_name = |name:Symbol| {
847+
// Visiting MIR to enumerate string constants can be expensive, so cache the result.
848+
let string_constants_in_body = string_constants_in_body.get_or_insert_with(|| {
849+
structLiteralFinder{
850+
found:Vec<(Span,String)>,
851+
}
852+
853+
impl<'tcx>Visitor<'tcx>forLiteralFinder{
854+
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>, _:Location){
855+
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
856+
 && ref_ty.kind() == &ty::Str
857+
{
858+
let rendered_constant = constant.const_.to_string();
859+
self.found.push((constant.span, rendered_constant));
860+
}
861+
}
862+
}
863+
864+
letmut finder = LiteralFinder{found:vec![]};
865+
 finder.visit_body(self.body);
866+
 finder.found
867+
});
868+
869+
let brace_name = format!("{{{name}");
870+
 string_constants_in_body
871+
.iter()
872+
.filter(|(_, rendered_constant)| {
873+
 rendered_constant
874+
.split(&brace_name)
875+
.any(|c| matches!(c.chars().next(),Some('}' | ':')))
876+
})
877+
.map(|&(lit, _)| errors::UnusedVariableStringInterp{ lit })
878+
.collect::<Vec<_>>()
879+
};
880+
882881
// First, report fully unused locals.
883882
for(index, place)inself.checked_places.iter(){
884883
ifself.ever_live.contains(index){
@@ -940,7 +939,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
940939
 def_span,
941940
 errors::UnusedVariable{
942941
 name,
943-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
942+
string_interp:maybe_suggest_literal_matching_name(name),
944943
 sugg,
945944
},
946945
);
@@ -1030,7 +1029,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
10301029
 spans,
10311030
 errors::UnusedVariable{
10321031
 name,
1033-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
1032+
string_interp:maybe_suggest_literal_matching_name(name),
10341033
 sugg,
10351034
},
10361035
);
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank · rust-lang/rust@9606412 · GitHub
Skip to content
Commit 9606412
Browse files
borsbors
committed
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank
Liveness: Cache the set of string constants for suggestions.
Even on a slow diagnostic path, listing all the constants in MIR can be expensive, so cache it.
2 parents 0bbef55 + 727da8c commit 9606412
1 file changed
Lines changed: 40 additions & 41 deletions
File tree
‎compiler/rustc_mir_transform/src/liveness.rs‎
Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,45 +164,6 @@ fn is_capture(place: PlaceRef<'_>) -> bool {
164164
}
165165
}
166166

167-
/// Give a diagnostic when any of the string constants look like a naked format string that would
168-
/// interpolate our dead local.
169-
fnmaybe_suggest_literal_matching_name(
170-
body:&Body<'_>,
171-
name:Symbol,
172-
) -> Vec<errors::UnusedVariableStringInterp>{
173-
structLiteralFinder<'body,'tcx>{
174-
body:&'bodyBody<'tcx>,
175-
name:String,
176-
name_colon:String,
177-
found:Vec<errors::UnusedVariableStringInterp>,
178-
}
179-
180-
impl<'tcx>Visitor<'tcx>forLiteralFinder<'_,'tcx>{
181-
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>,loc:Location){
182-
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
183-
 && ref_ty.kind() == &ty::Str
184-
{
185-
let rendered_constant = constant.const_.to_string();
186-
if rendered_constant.contains(&self.name)
187-
 || rendered_constant.contains(&self.name_colon)
188-
{
189-
let lit = self.body.source_info(loc).span;
190-
self.found.push(errors::UnusedVariableStringInterp{ lit });
191-
}
192-
}
193-
}
194-
}
195-
196-
letmut finder = LiteralFinder{
197-
 body,
198-
name:format!("{{{name}}}"),
199-
name_colon:format!("{{{name}:"),
200-
found:vec![],
201-
};
202-
 finder.visit_body(body);
203-
 finder.found
204-
}
205-
206167
/// Give a diagnostic when an unused variable may be a typo of a unit variant or a struct.
207168
fnmaybe_suggest_unit_pattern_typo<'tcx>(
208169
tcx:TyCtxt<'tcx>,
@@ -879,6 +840,44 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
879840
fnreport_fully_unused(&mutself){
880841
let tcx = self.tcx;
881842

843+
// Give a diagnostic when any of the string constants look like a naked format string that
844+
// would interpolate our dead local.
845+
letmut string_constants_in_body = None;
846+
letmut maybe_suggest_literal_matching_name = |name:Symbol| {
847+
// Visiting MIR to enumerate string constants can be expensive, so cache the result.
848+
let string_constants_in_body = string_constants_in_body.get_or_insert_with(|| {
849+
structLiteralFinder{
850+
found:Vec<(Span,String)>,
851+
}
852+
853+
impl<'tcx>Visitor<'tcx>forLiteralFinder{
854+
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>, _:Location){
855+
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
856+
 && ref_ty.kind() == &ty::Str
857+
{
858+
let rendered_constant = constant.const_.to_string();
859+
self.found.push((constant.span, rendered_constant));
860+
}
861+
}
862+
}
863+
864+
letmut finder = LiteralFinder{found:vec![]};
865+
 finder.visit_body(self.body);
866+
 finder.found
867+
});
868+
869+
let brace_name = format!("{{{name}");
870+
 string_constants_in_body
871+
.iter()
872+
.filter(|(_, rendered_constant)| {
873+
 rendered_constant
874+
.split(&brace_name)
875+
.any(|c| matches!(c.chars().next(),Some('}' | ':')))
876+
})
877+
.map(|&(lit, _)| errors::UnusedVariableStringInterp{ lit })
878+
.collect::<Vec<_>>()
879+
};
880+
882881
// First, report fully unused locals.
883882
for(index, place)inself.checked_places.iter(){
884883
ifself.ever_live.contains(index){
@@ -940,7 +939,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
940939
 def_span,
941940
 errors::UnusedVariable{
942941
 name,
943-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
942+
string_interp:maybe_suggest_literal_matching_name(name),
944943
 sugg,
945944
},
946945
);
@@ -1030,7 +1029,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
10301029
 spans,
10311030
 errors::UnusedVariable{
10321031
 name,
1033-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
1032+
string_interp:maybe_suggest_literal_matching_name(name),
10341033
 sugg,
10351034
},
10361035
);
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank · rust-lang/rust@9606412 · GitHub
Skip to content
Commit 9606412
Browse files
borsbors
committed
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank
Liveness: Cache the set of string constants for suggestions.
Even on a slow diagnostic path, listing all the constants in MIR can be expensive, so cache it.
2 parents 0bbef55 + 727da8c commit 9606412
1 file changed
Lines changed: 40 additions & 41 deletions
File tree
‎compiler/rustc_mir_transform/src/liveness.rs‎
Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,45 +164,6 @@ fn is_capture(place: PlaceRef<'_>) -> bool {
164164
}
165165
}
166166

167-
/// Give a diagnostic when any of the string constants look like a naked format string that would
168-
/// interpolate our dead local.
169-
fnmaybe_suggest_literal_matching_name(
170-
body:&Body<'_>,
171-
name:Symbol,
172-
) -> Vec<errors::UnusedVariableStringInterp>{
173-
structLiteralFinder<'body,'tcx>{
174-
body:&'bodyBody<'tcx>,
175-
name:String,
176-
name_colon:String,
177-
found:Vec<errors::UnusedVariableStringInterp>,
178-
}
179-
180-
impl<'tcx>Visitor<'tcx>forLiteralFinder<'_,'tcx>{
181-
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>,loc:Location){
182-
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
183-
 && ref_ty.kind() == &ty::Str
184-
{
185-
let rendered_constant = constant.const_.to_string();
186-
if rendered_constant.contains(&self.name)
187-
 || rendered_constant.contains(&self.name_colon)
188-
{
189-
let lit = self.body.source_info(loc).span;
190-
self.found.push(errors::UnusedVariableStringInterp{ lit });
191-
}
192-
}
193-
}
194-
}
195-
196-
letmut finder = LiteralFinder{
197-
 body,
198-
name:format!("{{{name}}}"),
199-
name_colon:format!("{{{name}:"),
200-
found:vec![],
201-
};
202-
 finder.visit_body(body);
203-
 finder.found
204-
}
205-
206167
/// Give a diagnostic when an unused variable may be a typo of a unit variant or a struct.
207168
fnmaybe_suggest_unit_pattern_typo<'tcx>(
208169
tcx:TyCtxt<'tcx>,
@@ -879,6 +840,44 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
879840
fnreport_fully_unused(&mutself){
880841
let tcx = self.tcx;
881842

843+
// Give a diagnostic when any of the string constants look like a naked format string that
844+
// would interpolate our dead local.
845+
letmut string_constants_in_body = None;
846+
letmut maybe_suggest_literal_matching_name = |name:Symbol| {
847+
// Visiting MIR to enumerate string constants can be expensive, so cache the result.
848+
let string_constants_in_body = string_constants_in_body.get_or_insert_with(|| {
849+
structLiteralFinder{
850+
found:Vec<(Span,String)>,
851+
}
852+
853+
impl<'tcx>Visitor<'tcx>forLiteralFinder{
854+
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>, _:Location){
855+
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
856+
 && ref_ty.kind() == &ty::Str
857+
{
858+
let rendered_constant = constant.const_.to_string();
859+
self.found.push((constant.span, rendered_constant));
860+
}
861+
}
862+
}
863+
864+
letmut finder = LiteralFinder{found:vec![]};
865+
 finder.visit_body(self.body);
866+
 finder.found
867+
});
868+
869+
let brace_name = format!("{{{name}");
870+
 string_constants_in_body
871+
.iter()
872+
.filter(|(_, rendered_constant)| {
873+
 rendered_constant
874+
.split(&brace_name)
875+
.any(|c| matches!(c.chars().next(),Some('}' | ':')))
876+
})
877+
.map(|&(lit, _)| errors::UnusedVariableStringInterp{ lit })
878+
.collect::<Vec<_>>()
879+
};
880+
882881
// First, report fully unused locals.
883882
for(index, place)inself.checked_places.iter(){
884883
ifself.ever_live.contains(index){
@@ -940,7 +939,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
940939
 def_span,
941940
 errors::UnusedVariable{
942941
 name,
943-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
942+
string_interp:maybe_suggest_literal_matching_name(name),
944943
 sugg,
945944
},
946945
);
@@ -1030,7 +1029,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
10301029
 spans,
10311030
 errors::UnusedVariable{
10321031
 name,
1033-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
1032+
string_interp:maybe_suggest_literal_matching_name(name),
10341033
 sugg,
10351034
},
10361035
);
0 commit comments
Comments
 (0)

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
})();
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank · rust-lang/rust@9606412 · GitHub
Skip to content
Commit 9606412
Browse files
borsbors
committed
Auto merge of #147641 - cjgillot:liveness-cache-strings, r=estebank
Liveness: Cache the set of string constants for suggestions.
Even on a slow diagnostic path, listing all the constants in MIR can be expensive, so cache it.
2 parents 0bbef55 + 727da8c commit 9606412
1 file changed
Lines changed: 40 additions & 41 deletions
File tree
‎compiler/rustc_mir_transform/src/liveness.rs‎
Lines changed: 40 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -164,45 +164,6 @@ fn is_capture(place: PlaceRef<'_>) -> bool {
164164
}
165165
}
166166

167-
/// Give a diagnostic when any of the string constants look like a naked format string that would
168-
/// interpolate our dead local.
169-
fnmaybe_suggest_literal_matching_name(
170-
body:&Body<'_>,
171-
name:Symbol,
172-
) -> Vec<errors::UnusedVariableStringInterp>{
173-
structLiteralFinder<'body,'tcx>{
174-
body:&'bodyBody<'tcx>,
175-
name:String,
176-
name_colon:String,
177-
found:Vec<errors::UnusedVariableStringInterp>,
178-
}
179-
180-
impl<'tcx>Visitor<'tcx>forLiteralFinder<'_,'tcx>{
181-
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>,loc:Location){
182-
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
183-
 && ref_ty.kind() == &ty::Str
184-
{
185-
let rendered_constant = constant.const_.to_string();
186-
if rendered_constant.contains(&self.name)
187-
 || rendered_constant.contains(&self.name_colon)
188-
{
189-
let lit = self.body.source_info(loc).span;
190-
self.found.push(errors::UnusedVariableStringInterp{ lit });
191-
}
192-
}
193-
}
194-
}
195-
196-
letmut finder = LiteralFinder{
197-
 body,
198-
name:format!("{{{name}}}"),
199-
name_colon:format!("{{{name}:"),
200-
found:vec![],
201-
};
202-
 finder.visit_body(body);
203-
 finder.found
204-
}
205-
206167
/// Give a diagnostic when an unused variable may be a typo of a unit variant or a struct.
207168
fnmaybe_suggest_unit_pattern_typo<'tcx>(
208169
tcx:TyCtxt<'tcx>,
@@ -879,6 +840,44 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
879840
fnreport_fully_unused(&mutself){
880841
let tcx = self.tcx;
881842

843+
// Give a diagnostic when any of the string constants look like a naked format string that
844+
// would interpolate our dead local.
845+
letmut string_constants_in_body = None;
846+
letmut maybe_suggest_literal_matching_name = |name:Symbol| {
847+
// Visiting MIR to enumerate string constants can be expensive, so cache the result.
848+
let string_constants_in_body = string_constants_in_body.get_or_insert_with(|| {
849+
structLiteralFinder{
850+
found:Vec<(Span,String)>,
851+
}
852+
853+
impl<'tcx>Visitor<'tcx>forLiteralFinder{
854+
fnvisit_const_operand(&mutself,constant:&ConstOperand<'tcx>, _:Location){
855+
iflet ty::Ref(_, ref_ty, _) = constant.ty().kind()
856+
 && ref_ty.kind() == &ty::Str
857+
{
858+
let rendered_constant = constant.const_.to_string();
859+
self.found.push((constant.span, rendered_constant));
860+
}
861+
}
862+
}
863+
864+
letmut finder = LiteralFinder{found:vec![]};
865+
 finder.visit_body(self.body);
866+
 finder.found
867+
});
868+
869+
let brace_name = format!("{{{name}");
870+
 string_constants_in_body
871+
.iter()
872+
.filter(|(_, rendered_constant)| {
873+
 rendered_constant
874+
.split(&brace_name)
875+
.any(|c| matches!(c.chars().next(),Some('}' | ':')))
876+
})
877+
.map(|&(lit, _)| errors::UnusedVariableStringInterp{ lit })
878+
.collect::<Vec<_>>()
879+
};
880+
882881
// First, report fully unused locals.
883882
for(index, place)inself.checked_places.iter(){
884883
ifself.ever_live.contains(index){
@@ -940,7 +939,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
940939
 def_span,
941940
 errors::UnusedVariable{
942941
 name,
943-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
942+
string_interp:maybe_suggest_literal_matching_name(name),
944943
 sugg,
945944
},
946945
);
@@ -1030,7 +1029,7 @@ impl<'a, 'tcx> AssignmentResult<'a, 'tcx> {
10301029
 spans,
10311030
 errors::UnusedVariable{
10321031
 name,
1033-
string_interp:maybe_suggest_literal_matching_name(self.body,name),
1032+
string_interp:maybe_suggest_literal_matching_name(name),
10341033
 sugg,
10351034
},
10361035
);
0 commit comments
Comments
 (0)