Remove some feature flag usage from libsyntax #24487

erickt · 2015-04-16T05:24:59Z

This removes the usage of #[feature(into_cow, slice_patterns, box_syntax, box_patterns, quote, unsafe_destructor)] from being used in libsyntax. My main desire for this is that it brings me one step closer to letting syntex compile with stable rust. Hopefully this doesn't inconvenience rust development.

rust-highfive · 2015-04-16T05:25:11Z

r? @alexcrichton

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

Manishearth · 2015-04-16T09:27:29Z

@bors-servo: r+

bors · 2015-04-16T09:27:30Z

📌 Commit c499fee has been approved by Manishearth

erickt · 2015-04-17T03:41:57Z

Fixed the tidy issue and eliminated a few other feature flags.

alexcrichton · 2015-04-17T03:47:23Z

src/libsyntax/print/pp.rs

-pub struct Printer<'a> {
-    pub out: Box<io::Write+'a>,
+pub struct Printer<W> {
+    pub out: W,


In the past we've had some pretty bad code bloat problems by having a totally generic pretty printer, so I'm curious what instigated this change?

I was trying to make it easy to get to the underlying Vec so I could get rid of the reference to TraitObject and the transmute, but I can try a different approach.

erickt · 2015-04-17T05:36:29Z

@alexcrichton: turned out I could have saved myself a bunch of time trying to get rid of TraitObject by just using a scope and a &mut :)

... I think serde might have gotten me addicted to type parameters...

alexcrichton · 2015-04-17T16:44:15Z

@bors: r+ 3721bdf

Thanks!

bors · 2015-04-18T02:58:04Z

☔ The latest upstream changes (presumably #23985) made this pull request unmergeable. Please resolve the merge conflicts.

erickt · 2015-04-19T22:32:06Z

@bors: r=alexcrichton 51a2935

bors · 2015-04-19T23:40:25Z

⌛ Testing commit 51a2935 with merge 7805349...

bors · 2015-04-20T00:40:02Z

💔 Test failed - auto-linux-64-nopt-t

Manishearth · 2015-04-20T09:40:28Z

/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:838:13: 841:53 error: slice pattern syntax is experimental
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:838             [ast::TtToken(_, token::Ident(name_macro_rules, token::Plain)),
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:839              ast::TtToken(_, token::Not),
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:840              ast::TtToken(_, token::Ident(name_zip, token::Plain)),
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:841              ast::TtDelimited(_, ref macro_delimed)]
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:838:13: 841:53 help: add #![feature(slice_patterns)] to the crate attributes to enable
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:845:21: 847:62 error: slice pattern syntax is experimental
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:845                     [ast::TtDelimited(_, ref first_delimed),
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:846                      ast::TtToken(_, token::FatArrow),
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:847                      ast::TtDelimited(_, ref second_delimed)]
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:845:21: 847:62 help: add #![feature(slice_patterns)] to the crate attributes to enable
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:850:29: 851:80 error: slice pattern syntax is experimental
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:850                             [ast::TtToken(_, token::Dollar),
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:851                              ast::TtToken(_, token::Ident(name, token::Plain))]
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:850:29: 851:80 help: add #![feature(slice_patterns)] to the crate attributes to enable
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:857:29: 858:80 error: slice pattern syntax is experimental
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:857                             [ast::TtToken(_, token::Dollar),
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:858                              ast::TtToken(_, token::Ident(name, token::Plain))]
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/parse/mod.rs:857:29: 858:80 help: add #![feature(slice_patterns)] to the crate attributes to enable
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/ext/expand.rs:1966:13: 1966:16 error: slice pattern syntax is experimental
/home/ubuntu/src/rust-buildbot/slave/auto-linux-64-nopt-t/build/src/libsyntax/ext/expand.rs:1966             [b] => b,

Replace Path::exists with stable metadata call.

erickt · 2015-04-21T21:22:50Z

@alexcrichton: I included a few more commits that haven't been reviewed. I don't think you've seen the last 4 yet.

alexcrichton · 2015-04-21T21:55:20Z

Looks good to me! Could this hold off on the last commit for now though? Duplicating that kind of code is a bit unfortunate and there's still other features in use by libsyntax so we can hold off on the duplication as long as possible (hopefully!)

erickt · 2015-04-21T21:56:55Z

@alexcrichton: Sure no problem. I'll remove that patch for now.

alexcrichton · 2015-04-21T21:57:39Z

@bors: r+ 19c8d70

This removes the usage of `#[feature(into_cow, slice_patterns, box_syntax, box_patterns, quote, unsafe_destructor)]` from being used in libsyntax. My main desire for this is that it brings me one step closer to letting [syntex](https://github.com/erickt/rust-syntex) compile with stable rust. Hopefully this doesn't inconvenience rust development.

rust-highfive assigned alexcrichton Apr 16, 2015

erickt force-pushed the syntax branch from 16200cb to c499fee Compare April 16, 2015 06:06

erickt force-pushed the syntax branch from c499fee to b17c625 Compare April 17, 2015 03:40

alexcrichton reviewed Apr 17, 2015
View reviewed changes

erickt mentioned this pull request Apr 17, 2015

Make libsyntax compile with minimal amount of feature flags #24518

Closed

18 tasks

erickt force-pushed the syntax branch from b17c625 to 121778e Compare April 17, 2015 05:33

erickt force-pushed the syntax branch from 121778e to 3721bdf Compare April 17, 2015 06:10

erickt force-pushed the syntax branch from 3721bdf to 51a2935 Compare April 19, 2015 22:31

erickt added 10 commits April 21, 2015 10:07

syntax: remove #![feature(box_syntax, box_patterns)]

a4541b0

syntax: Remove uses of #[feature(slice_patterns)]

ca0ee4c

syntax: remove uses of .into_cow()

cfb9d28

syntax: Remove use of TraitObject in pretty printer

e3dd68d

syntax: Don't use unstable fn to convert single element to a slice

bc6d990

syntax: remove #[feature(quote, unsafe_destructor)]

8553658

syntax: Replace String::from_str with the stable String::from

2937cce

syntax: Replace [].tail with the stable [1..] syntax

a2cfe38

syntax: Replace Vec::map_in_place with stable mut iterator

21143aa

syntax: replace Vec::push_all with stable Vec::extend

c3da1a1

erickt added 3 commits April 21, 2015 10:09

syntax: Remove #[feature(path_ext)]

83b1d7f

Replace Path::exists with stable metadata call.

syntax: Change ExpnId::{from,to}_llvm_cookie to {from,to}_u32

7f9180f

syntax: Copy unstable str::char_at into libsyntax

19c8d70

erickt force-pushed the syntax branch from 51a2935 to 9a01471 Compare April 21, 2015 18:46

erickt force-pushed the syntax branch from 9a01471 to 19c8d70 Compare April 21, 2015 21:57

bors merged commit 19c8d70 into rust-lang:master Apr 22, 2015

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove some feature flag usage from libsyntax #24487

Remove some feature flag usage from libsyntax #24487

erickt commented Apr 16, 2015

rust-highfive commented Apr 16, 2015

Manishearth commented Apr 16, 2015

bors commented Apr 16, 2015

erickt commented Apr 17, 2015

alexcrichton Apr 17, 2015

erickt Apr 17, 2015

erickt commented Apr 17, 2015

alexcrichton commented Apr 17, 2015

bors commented Apr 18, 2015

erickt commented Apr 19, 2015

bors commented Apr 19, 2015

bors commented Apr 20, 2015

Manishearth commented Apr 20, 2015

erickt commented Apr 21, 2015

alexcrichton commented Apr 21, 2015

erickt commented Apr 21, 2015

alexcrichton commented Apr 21, 2015

Remove some feature flag usage from libsyntax #24487

Remove some feature flag usage from libsyntax #24487

Conversation

erickt commented Apr 16, 2015

rust-highfive commented Apr 16, 2015

Manishearth commented Apr 16, 2015

bors commented Apr 16, 2015

erickt commented Apr 17, 2015

alexcrichton Apr 17, 2015

Choose a reason for hiding this comment

erickt Apr 17, 2015

Choose a reason for hiding this comment

erickt commented Apr 17, 2015

alexcrichton commented Apr 17, 2015

bors commented Apr 18, 2015

erickt commented Apr 19, 2015

bors commented Apr 19, 2015

bors commented Apr 20, 2015

Manishearth commented Apr 20, 2015

erickt commented Apr 21, 2015

alexcrichton commented Apr 21, 2015

erickt commented Apr 21, 2015

alexcrichton commented Apr 21, 2015