Update syntex #25

pczarn · 2016-01-02T21:37:16Z

No description provided.

Conflicts: syntex_bitflags/src/lib.rs syntex_syntax/src/lib.rs

Conflicts: syntex_syntax/src/ext/expand.rs

# Conflicts: # syntex_bitflags/src/lib.rs

# Conflicts: # syntex_bitflags/src/lib.rs # syntex_syntax/src/ext/deriving/generic/mod.rs # syntex_syntax/src/ext/expand.rs # syntex_syntax/src/lib.rs

# Conflicts: # syntex_syntax/src/ext/expand.rs

# Conflicts: # syntex_bitflags/Cargo.lock # syntex_bitflags/Cargo.toml # syntex_bitflags/src/lib.rs

This will be slower and use more memory, but this shouldn't be a large impact until syntex is used on large codebases. Hopefully by then there will be a stable BitSet that we can use.

Conflicts: syntex_syntax/src/ext/base.rs syntex_syntax/src/ext/deriving/mod.rs syntex_syntax/src/util/small_vector.rs

Sync with master

# Conflicts: # syntex_syntax/src/ext/base.rs # syntex_syntax/src/ext/deriving/mod.rs # syntex_syntax/src/util/small_vector.rs

# Conflicts: # syntex_syntax/src/lib.rs # syntex_syntax/src/parse/parser.rs

fix(rustup): Update syntex

fix(syntex_syntax): Don't expand builtin derive decorators

# Conflicts: # syntex_syntax/src/diagnostic.rs # syntex_syntax/src/lib.rs

# Conflicts: # syntex_syntax/src/diagnostic.rs

# Conflicts: # syntex_syntax/src/ext/expand.rs

# Conflicts: # syntex_syntax/src/ext/base.rs # syntex_syntax/src/ext/expand.rs # syntex_syntax/src/ext/quote.rs # syntex_syntax/src/fold.rs # syntex_syntax/src/lib.rs # syntex_syntax/src/parse/parser.rs # syntex_syntax/src/util/small_vector.rs

# Conflicts: # syntex_syntax/src/ext/asm.rs # syntex_syntax/src/ext/base.rs # syntex_syntax/src/ext/deriving/mod.rs # syntex_syntax/src/lib.rs # syntex_syntax/src/print/pprust.rs # syntex_syntax/src/ptr.rs

In the core rust repo, this was migrated into a separate crate. I don't think it's necessary to replicate that crate since all we want is #[derive] support.

# Conflicts: # syntex_syntax/src/ext/expand.rs # syntex_syntax/src/parse/parser.rs

Manishearth · 2016-01-02T21:39:35Z

r? @erickt

hansihe · 2016-01-04T16:14:11Z

I am waiting for this to land. Are there any holdups?

pczarn · 2016-01-05T20:26:56Z

@hansihe: It seems @erickt is away.
For now, just run this in a chosen directory:

git clone -b rustup [email protected]:pczarn/syntex.git
git clone -b rustup-local [email protected]:pczarn/aster.git
git clone -b rustup-local [email protected]:pczarn/quasi.git

Then use a local path to depend on the updated version.

aster = { version = "0.9", path = "../aster/" }

I think cargo-vendor could make this process somehow easier.

erickt · 2016-01-06T20:49:51Z

Yeah, sorry traveling for the holidays, looking now!

erickt added 30 commits January 23, 2015 09:36

Merge branch 'rust'

3955e74

Change the rust library crate_name

3b12c1f

Merge branch 'rust'

430e9cc

Conflicts: syntex_bitflags/src/lib.rs syntex_syntax/src/lib.rs

Update to Rust HEAD

e4f78bd

Disable erroring on unknown macros

a439aa1

Simplify the the api and the example

6ab24fe

Link syntex_bitflags against std

43e5c55

Merge branch 'rust'

3942deb

Conflicts: syntex_syntax/src/ext/expand.rs

Simplify the cargo files

5215192

Merge branch 'rust'

72f4119

Clean up some warnings

eed206d

Fix ignoring unknown macros in stmts and methods

d6292e7

Merge branch 'rust'

e8eabc2

# Conflicts: # syntex_bitflags/src/lib.rs

Merge branch 'rust'

7324fa4

# Conflicts: # syntex_bitflags/src/lib.rs # syntex_syntax/src/ext/deriving/generic/mod.rs # syntex_syntax/src/ext/expand.rs # syntex_syntax/src/lib.rs

Fix compiling syntex

23b8be3

Merge branch 'rust'

bec0a9a

# Conflicts: # syntex_syntax/src/ext/expand.rs

Merge branch 'rust'

bfd20f9

Switch to using the external bitflags crate

12b7293

Merge branch 'rust'

8158d20

# Conflicts: # syntex_bitflags/Cargo.lock # syntex_bitflags/Cargo.toml # syntex_bitflags/src/lib.rs

Merge branch 'rust'

9967a8e

Switch to unicode-xid to get rid of #![feature(unicode)]

9fbbe72

Replace unstable BitSet with HashSet

8dc71a2

This will be slower and use more memory, but this shouldn't be a large impact until syntex is used on large codebases. Hopefully by then there will be a stable BitSet that we can use.

Replace unstable .push_all() with .extend()

5e05b8b

Replace unsafe str::escape_default with iter char::escape_defaults

db5e820

Remove #![feature(collections)]

35b4d47

Replace #![feature(libc)] with libc crate

e9851b9

Remove #![feature(staged_api)]

32c77c5

Remove #![feature(str_char)] and unstable str::slice_shift_char

068a15b

Remove ast_map, which will be moved upstream

0b67008

Remove use of unstable std::ptr::read_and_drop

4faddf2

erickt and others added 24 commits October 16, 2015 12:18

chore(cargo): Version bump

3c0dd9c

Sync with rust HEAD (83cf3ce4981e2ff1a3d7629665b7ec884adbb9de)

9b392a6

chore(cargo): Pin syntex_syntax crate dependencies

9f906b3

Merge branch 'rust'

b04e3c6

Conflicts: syntex_syntax/src/ext/base.rs syntex_syntax/src/ext/deriving/mod.rs syntex_syntax/src/util/small_vector.rs

Auto merge of serde-deprecated#15 - alexcrichton:update, r=erickt

176ca5d

Sync with master

Merge branch 'rust'

3d1d719

# Conflicts: # syntex_syntax/src/ext/base.rs # syntex_syntax/src/ext/deriving/mod.rs # syntex_syntax/src/util/small_vector.rs

Merge branch 'rust'

79b37e7

# Conflicts: # syntex_syntax/src/lib.rs # syntex_syntax/src/parse/parser.rs

fix(cargo): Bump version

d9010b5

Merge remote-tracking branch 'remotes/origin/master'

3ac50b0

Auto merge of serde-deprecated#16 - erickt:master, r=erickt

f721e3e

fix(rustup): Update syntex

fix(syntex_syntax): Don't expand builtin derive decorators

dc176ef

Auto merge of serde-deprecated#17 - erickt:master, r=erickt

80b52b0

fix(syntex_syntax): Don't expand builtin derive decorators

Merge branch 'rust'

a26e399

# Conflicts: # syntex_syntax/src/diagnostic.rs # syntex_syntax/src/lib.rs

Merge branch 'rust'

afd3b01

# Conflicts: # syntex_syntax/src/diagnostic.rs

feat(cargo): Version bump

069fe5d

Merge branch 'rust'

7913a15

# Conflicts: # syntex_syntax/src/ext/expand.rs

Merge branch 'rust'

b36c91f

# Conflicts: # syntex_syntax/src/ext/base.rs # syntex_syntax/src/ext/expand.rs # syntex_syntax/src/ext/quote.rs # syntex_syntax/src/fold.rs # syntex_syntax/src/lib.rs # syntex_syntax/src/parse/parser.rs # syntex_syntax/src/util/small_vector.rs

Merge branch 'rust'

fc7c4cf

feat(cargo): Version bump

f1e67d2

Merge branch 'rust'

a0a7eda

# Conflicts: # syntex_syntax/src/ext/asm.rs # syntex_syntax/src/ext/base.rs # syntex_syntax/src/ext/deriving/mod.rs # syntex_syntax/src/lib.rs # syntex_syntax/src/print/pprust.rs # syntex_syntax/src/ptr.rs

fix(derive): Restore #[derive] functionality

6f8b476

In the core rust repo, this was migrated into a separate crate. I don't think it's necessary to replicate that crate since all we want is #[derive] support.

feat(cargo): Version bump

2b7d19e

Merge branch 'rust'

160faf3

# Conflicts: # syntex_syntax/src/ext/expand.rs # syntex_syntax/src/parse/parser.rs

feat(cargo): Version bump

076c7e9

pczarn mentioned this pull request Jan 2, 2016

Issues compiling on 1.7.0-nightly serde-deprecated/aster#61

Closed

erickt merged commit 076c7e9 into serde-deprecated:master Jan 6, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update syntex #25

Update syntex #25

pczarn commented Jan 2, 2016

Manishearth commented Jan 2, 2016

hansihe commented Jan 4, 2016

pczarn commented Jan 5, 2016

erickt commented Jan 6, 2016

Update syntex #25

Update syntex #25

Conversation

pczarn commented Jan 2, 2016

Manishearth commented Jan 2, 2016

hansihe commented Jan 4, 2016

pczarn commented Jan 5, 2016

erickt commented Jan 6, 2016