Skip to content

Commit ff0e046

Browse files
committed
Don't reallocate the crate name when running doctests
1 parent 1c557da commit ff0e046

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/librustdoc/doctest.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet};
33
use rustc_data_structures::sync::Lrc;
44
use rustc_errors::{ColorConfig, ErrorReported};
55
use rustc_hir as hir;
6-
use rustc_hir::intravisit;
76
use rustc_hir::def_id::LOCAL_CRATE;
7+
use rustc_hir::intravisit;
88
use rustc_hir::{HirId, CRATE_HIR_ID};
99
use rustc_interface::interface;
1010
use rustc_middle::hir::map::Map;
@@ -14,6 +14,7 @@ use rustc_session::{lint, DiagnosticOutput, Session};
1414
use rustc_span::edition::Edition;
1515
use rustc_span::source_map::SourceMap;
1616
use rustc_span::symbol::sym;
17+
use rustc_span::Symbol;
1718
use rustc_span::{BytePos, FileName, Pos, Span, DUMMY_SP};
1819
use rustc_target::spec::TargetTriple;
1920
use tempfile::Builder as TempFileBuilder;
@@ -122,7 +123,7 @@ crate fn run(options: Options) -> Result<(), ErrorReported> {
122123
opts.display_warnings |= options.display_warnings;
123124
let enable_per_target_ignores = options.enable_per_target_ignores;
124125
let mut collector = Collector::new(
125-
tcx.crate_name(LOCAL_CRATE).to_string(),
126+
tcx.crate_name(LOCAL_CRATE),
126127
options,
127128
false,
128129
opts,
@@ -796,7 +797,7 @@ crate struct Collector {
796797
options: Options,
797798
use_headers: bool,
798799
enable_per_target_ignores: bool,
799-
crate_name: String,
800+
crate_name: Symbol,
800801
opts: TestOptions,
801802
position: Span,
802803
source_map: Option<Lrc<SourceMap>>,
@@ -808,7 +809,7 @@ crate struct Collector {
808809

809810
impl Collector {
810811
crate fn new(
811-
crate_name: String,
812+
crate_name: Symbol,
812813
options: Options,
813814
use_headers: bool,
814815
opts: TestOptions,

src/librustdoc/markdown.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use std::path::Path;
44

55
use rustc_span::edition::Edition;
66
use rustc_span::source_map::DUMMY_SP;
7+
use rustc_span::Symbol;
78

89
use crate::config::{Options, RenderOptions};
910
use crate::doctest::{Collector, TestOptions};
@@ -121,7 +122,7 @@ crate fn test(mut options: Options) -> Result<(), String> {
121122
opts.no_crate_inject = true;
122123
opts.display_warnings = options.display_warnings;
123124
let mut collector = Collector::new(
124-
options.input.display().to_string(),
125+
Symbol::intern(&options.input.display().to_string()),
125126
options.clone(),
126127
true,
127128
opts,

0 commit comments

Comments
 (0)