mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[RFC 3127 - Trim Paths]: Fix building tools (rustdoc, clippy, ...)

Browse Source
This commit is contained in:
Urgau 2023-08-23 17:58:21 +02:00
parent eccc9e6628
commit dcde31ad1e
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librustdoc/html/sources.rs
View File

@ -225,7 +225,8 @@ fn emit_source(
cur.push(&fname); cur.push(&fname);
let title = format!("{} - source", src_fname.to_string_lossy()); let title = format!("{} - source", src_fname.to_string_lossy());
let desc = format!("Source of the Rust file `{}`.", filename.prefer_remapped()); let desc =
format!("Source of the Rust file `{}`.", filename.prefer_remapped_unconditionaly());
let page = layout::Page { let page = layout::Page {
title: &title, title: &title,
css_class: "src", css_class: "src",

2
src/tools/clippy/clippy_lints/src/utils/internal_lints/metadata_collector.rs
View File

@ -494,7 +494,7 @@ fn from_span(cx: &LateContext<'_>, span: Span) -> Self {
let loc: Loc = cx.sess().source_map().lookup_char_pos(span.lo()); let loc: Loc = cx.sess().source_map().lookup_char_pos(span.lo());
Self { Self {
path: format!("{}", loc.file.name.prefer_remapped()), path: format!("{}", loc.file.name.prefer_remapped_unconditionaly()),
line: loc.line, line: loc.line,
} }
} }

2
src/tools/miri/src/shims/backtrace.rs
View File

@ -135,7 +135,7 @@ fn resolve_frame_pointer(
this.tcx.sess.source_map().lookup_char_pos(BytePos(offset.bytes().try_into().unwrap())); this.tcx.sess.source_map().lookup_char_pos(BytePos(offset.bytes().try_into().unwrap()));
let name = fn_instance.to_string(); let name = fn_instance.to_string();
let filename = lo.file.name.prefer_remapped().to_string(); let filename = lo.file.name.prefer_remapped_unconditionaly().to_string();
Ok((fn_instance, lo, name, filename)) Ok((fn_instance, lo, name, filename))
} }