Remove mentions of the old tilde owned pointer syntax #25085

carols10cents · 2015-05-04T00:33:13Z

There were still some mentions of ~[T] and ~T, mostly in comments and debugging statements. I tried to do my best to preserve meaning, but I might have gotten some wrong-- I'm happy to fix anything :)

Also remove comments that reference the unique_type_id HEAP_VEC_BOX metadata, which was removed in 3e62637 and the unique_type_id GC_BOX metadata, which was removed in 8a91d33.

rust-highfive · 2015-05-04T00:33:24Z

r? @Aatch

(rust_highfive has picked a reviewer for you, use r? to override)

Aatch · 2015-05-04T00:38:11Z

src/librustc/middle/expr_use_visitor.rs

@@ -1125,7 +1125,7 @@ impl<'d,'t,'tcx,TYPER:mc::Typer<'tcx>> ExprUseVisitor<'d,'t,'tcx,TYPER> {
                        // that case we can adjust the length of the
                        // original vec accordingly, but we'd have to
                        // make trans do the right thing, and it would
-                        // only work for `~` vectors. It seems simpler
+                        // only work for `Vec`s. It seems simpler


Technically this would be refererring to Box<[T]> types, as Vec isn't a built-in type that the compiler should know about.

Aatch · 2015-05-04T00:51:35Z

Seems ok to me, other than those small things I mentioned. Though I'm not sure about some of the other places where the choice of ~[T] seems arbitrary. It's possible that the new coherence and impl rules make the original choice of ~[T] irrelevant.

Techncially, the closest equivalent to ~[T] is Box<[T]> not Vec<T>, even though user code suggests the opposite.

oli-obk · 2015-05-04T07:05:47Z

src/librustc_trans/trans/debuginfo/metadata.rs

@@ -202,7 +200,7 @@ impl<'tcx> TypeMap<'tcx> {
                }
            },
            ty::ty_uniq(inner_type) => {
-                unique_type_id.push('~');
+                unique_type_id.push_str("Box ");


wouldn't the lowercase version for the box syntax make more sense here?

I have no idea, sounds plausible to me! Change incoming.

carols10cents · 2015-05-05T01:46:02Z

Thank you @Aatch and @oli-obk! I've added new commits to address your comments-- I'm happy to squash these commits if these changes are good or remove them if they aren't or make additional changes if necessary.

steveklabnik · 2015-05-10T18:52:50Z

@bors: r+ rollup

bors · 2015-05-10T18:52:50Z

📌 Commit abc0017 has been approved by steveklabnik

steveklabnik · 2015-05-10T18:53:09Z

@bors: -rollup

steveklabnik · 2015-05-10T18:53:25Z

let's keep this on its own since it modifies tests and the queue isn't very full

…teveklabnik There were still some mentions of `~[T]` and `~T`, mostly in comments and debugging statements. I tried to do my best to preserve meaning, but I might have gotten some wrong-- I'm happy to fix anything :)

- Successful merges: #24948, #25085, #25158, #25188, #25239, #25240, #25241, #25255, #25257, #25263, #25271 - Failed merges:

steveklabnik · 2015-05-10T20:44:14Z

@bors: rollup-

…teveklabnik There were still some mentions of `~[T]` and `~T`, mostly in comments and debugging statements. I tried to do my best to preserve meaning, but I might have gotten some wrong-- I'm happy to fix anything :)

bors · 2015-05-11T04:46:42Z

⌛ Testing commit abc0017 with merge 7334518...

There were still some mentions of `~[T]` and `~T`, mostly in comments and debugging statements. I tried to do my best to preserve meaning, but I might have gotten some wrong-- I'm happy to fix anything :)

bors · 2015-05-11T06:42:23Z

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt

carols10cents added 3 commits May 3, 2015 20:16

Update old uses of ~ in comments and debugging statements

7ec8172

Update debuginfo metadata to use Box instead of ~

232b202

Also remove comments that reference the unique_type_id HEAP_VEC_BOX metadata, which was removed in 3e62637 and the unique_type_id GC_BOX metadata, which was removed in 8a91d33.

Update tests to not use old ~ syntax

d366774

rust-highfive assigned Aatch May 4, 2015

Aatch reviewed May 4, 2015
View reviewed changes

oli-obk reviewed May 4, 2015
View reviewed changes

carols10cents added 3 commits May 4, 2015 21:33

Changing Vec to Box<[T]>

55e7f9b

Use the lowercase version of the box syntax

77acf7b

Remove an obsolete example in a comment

abc0017

steveklabnik mentioned this pull request May 10, 2015

Rollup of 11 pull requests #25275

Closed

bors added a commit that referenced this pull request May 10, 2015

Auto merge of #25275 - steveklabnik:rollup, r=steveklabnik

d9ec142

- Successful merges: #24948, #25085, #25158, #25188, #25239, #25240, #25241, #25255, #25257, #25263, #25271 - Failed merges:

Manishearth mentioned this pull request May 11, 2015

Rollup of 9 pull requests #25298

Closed

bors merged commit abc0017 into rust-lang:master May 11, 2015

carols10cents deleted the remove-old-tilde branch May 11, 2015 22:20

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove mentions of the old tilde owned pointer syntax #25085

Remove mentions of the old tilde owned pointer syntax #25085

carols10cents commented May 4, 2015

rust-highfive commented May 4, 2015

Aatch May 4, 2015

Aatch commented May 4, 2015

oli-obk May 4, 2015

carols10cents May 5, 2015

carols10cents commented May 5, 2015

steveklabnik commented May 10, 2015

bors commented May 10, 2015

steveklabnik commented May 10, 2015

steveklabnik commented May 10, 2015

steveklabnik commented May 10, 2015

bors commented May 11, 2015

bors commented May 11, 2015

Remove mentions of the old tilde owned pointer syntax #25085

Remove mentions of the old tilde owned pointer syntax #25085

Conversation

carols10cents commented May 4, 2015

rust-highfive commented May 4, 2015

Aatch May 4, 2015

Choose a reason for hiding this comment

Aatch commented May 4, 2015

oli-obk May 4, 2015

Choose a reason for hiding this comment

carols10cents May 5, 2015

Choose a reason for hiding this comment

carols10cents commented May 5, 2015

steveklabnik commented May 10, 2015

bors commented May 10, 2015

steveklabnik commented May 10, 2015

steveklabnik commented May 10, 2015

steveklabnik commented May 10, 2015

bors commented May 11, 2015

bors commented May 11, 2015