diff options
| author | bors <bors@rust-lang.org> | 2020-01-30 02:25:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-01-30 02:25:56 +0000 |
| commit | 3024c4e7396106eacedd7eb94d7b681b3e82f78a (patch) | |
| tree | b714bdf1ab25a8c68bdf5ba4a26ab93e792b1da0 /src/test | |
| parent | dc92dfc50725f21f775c059413e1d06d725daacf (diff) | |
| parent | 9f497f93aa47f69626b9892747c6374349d5b989 (diff) | |
Auto merge of #68659 - Dylan-DPC:rollup-zo7zi9f, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #66648 (Implement clone_from for BTreeMap and BTreeSet) - #68468 (BTreeMap: tag and explain unsafe internal functions or assert preconditions) - #68626 (Use termize instead of term_size) - #68640 (Document remaining undocumented `From` implementations for IPs) - #68651 (Document `From` implementation for NonZero nums) - #68655 (Fix revision annotations in borrowck-feature-nll-overrides-migrate) Failed merges: r? @ghost
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs index a6f3905bebd..51f2ff75da8 100644 --- a/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs +++ b/src/test/ui/borrowck/borrowck-feature-nll-overrides-migrate.rs @@ -9,8 +9,8 @@ // borrowck=migrate`. // revisions: zflag edition -// [zflag]compile-flags: -Z borrowck=migrate -// [edition]edition:2018 +//[zflag]compile-flags: -Z borrowck=migrate +//[edition]edition:2018 #![feature(nll)] |