diff options
| author | bors <bors@rust-lang.org> | 2020-03-08 05:27:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-08 05:27:21 +0000 |
| commit | f943349eafaa75a60c05b0c84dcdb771d0eae8c9 (patch) | |
| tree | 9e2d6e08dc1aff13d98144034e7db7080e6eb872 /src/test/incremental/thinlto | |
| parent | 823ff8cf1397a5772b1f6954b60576202bf91836 (diff) | |
| parent | 8ee7278fca2cb137c81c8a12ca46c5df1838c2f3 (diff) | |
| download | rust-f943349eafaa75a60c05b0c84dcdb771d0eae8c9.tar.gz rust-f943349eafaa75a60c05b0c84dcdb771d0eae8c9.zip | |
Auto merge of #69804 - Centril:rollup-u86dc1g, r=Centril
Rollup of 8 pull requests Successful merges: - #69667 (Remove the `no_debug` feature) - #69687 (resolve, inconsistent binding mode: tweak wording) - #69708 (On mismatched delimiters, only point at empty blocks that are in the same line) - #69765 (reduce test size for Miri) - #69773 (fix various typos) - #69787 (mir::Local is Copy we can pass it by value in these cases) - #69794 (Add `Layout::dangling()` to return a well-aligned `NonNull<u8>`) - #69797 (Correct version that relaxed orphan rules) Failed merges: r? @ghost
Diffstat (limited to 'src/test/incremental/thinlto')
| -rw-r--r-- | src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs | 2 | ||||
| -rw-r--r-- | src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs b/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs index 42168dd273e..9c17c8745f8 100644 --- a/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs +++ b/src/test/incremental/thinlto/cgu_invalidated_when_import_added.rs @@ -4,7 +4,7 @@ // rust-lang/rust#59535: // -// This is analgous to cgu_invalidated_when_import_removed.rs, but it covers +// This is analogous to cgu_invalidated_when_import_removed.rs, but it covers // the other direction: // // We start with a call-graph like `[A] -> [B -> D] [C]` (where the letters are 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 19ce7b3e148..1214e37f982 100644 --- a/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs +++ b/src/test/incremental/thinlto/cgu_invalidated_when_import_removed.rs @@ -41,7 +41,7 @@ mod foo { // In cfail2, ThinLTO decides that foo() does not get inlined into main, and // instead bar() gets inlined into foo(). But faulty logic in our incr. // ThinLTO implementation thought that `main()` is unchanged and thus reused - // the object file still containing a call to the now non-existant bar(). + // the object file still containing a call to the now non-existent bar(). pub fn foo(){ bar() } |
