about summary refs log tree commit diff
path: root/src/test/incremental/thinlto
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-08-23 20:10:29 +0000
committerbors <bors@rust-lang.org>2021-08-23 20:10:29 +0000
commita49e38e672c60da788360e088f00ad12353e3913 (patch)
tree4fa9f598720e53ebe4efbe6499c6d61dcf120326 /src/test/incremental/thinlto
parent9583fd1bdd0127328e25e5b8c24dff575ec2c86b (diff)
parente7101326160ebf6642339a5099d22f6502bf2ae4 (diff)
downloadrust-a49e38e672c60da788360e088f00ad12353e3913.tar.gz
rust-a49e38e672c60da788360e088f00ad12353e3913.zip
Auto merge of #88265 - m-ou-se:rollup-soymv20, r=m-ou-se
Rollup of 6 pull requests

Successful merges:

 - #87976 (Account for tabs when highlighting multiline code suggestions)
 - #88174 (Clarify some wording in Rust 2021 lint docs)
 - #88188 (Greatly improve limitation handling on parallel rustdoc GUI test run)
 - #88230 (Fix typos “a”→“an”)
 - #88232 (Add notes to macro-not-found diagnostics to point out how things with the same name were not a match.)
 - #88259 (Do not mark `-Z thir-unsafeck` as unsound anymore)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/test/incremental/thinlto')
-rw-r--r--src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs b/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs
index 1214e37f982..fc53acf75cb 100644
--- a/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs
+++ b/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs
@@ -8,7 +8,7 @@
 // functions and the modules are enclosed in `[]`)
 //
 // In our specific instance, the earlier compilations were inlining the call
-// to`B` into `A`; thus `A` ended up with a external reference to the symbol `D`
+// to`B` into `A`; thus `A` ended up with an external reference to the symbol `D`
 // in its object code, to be resolved at subsequent link time. The LTO import
 // information provided by LLVM for those runs reflected that information: it
 // explicitly says during those runs, `B` definition and `D` declaration were