Skip to content

/ rust-encoding

forked from lifthrasiir/rust-encoding
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to upstream/master. #9

Merged
merged 13 commits into from Jul 31, 2014
Merged

Update to upstream/master. #9

merged 13 commits into from Jul 31, 2014
+120 −110

Conversation

@metajack
Copy link

metajack commented Jul 31, 2014

No description provided.

lifthrasiir and others added 12 commits Jun 21, 2014
@lifthrasiir
language changes: bytes!() is now deprecated.
2b9bd95
@lifthrasiir
language changes: integer type fallback is gone.
170facf
@lifthrasiir
initial cargo support.
2135362
@lifthrasiir
language changes: no integer type inference.
08d3214
@lifthrasiir
language changes: #[crate_id] -> #[crate_name], no dummy file is requ…
d64ef45 
…ired.

this also removes a `configure` script, it only set the VPATH and
was not very useful. there is not much use case that VPATH is
absolutely required anyway, and we will eventually switch to Cargo
so it is the least concern.
@lifthrasiir
I forgot to update .travis.yml.
7a8dfd6
@lifthrasiir
well, rustc -o causes some issues with LTO. revert to --out-dir.
a290920
@lifthrasiir
oops, fixed `make check`.
4547a5d
@lifthrasiir
updated .travis.yml.
c7a1a15
@lifthrasiir
Merge pull request lifthrasiir#32 from SimonSapin/share
a59eb71 
Make EncodingRef satisfy Share too.
@klutzy
Update for language changes
663c36f
@lifthrasiir
Merge pull request lifthrasiir#33 from klutzy/update
12b6610 
Update for language changes
@metajack
Copy link
Author

metajack commented Jul 31, 2014

Will rebase this to get an actual merge commit.
@metajack
Merge remote-tracking branch 'refs/remotes/upstream/master' into rust…
59b9a67 
…up-20140716

Conflicts:
	Makefile.in
@metajack metajack changed the title Merge upstream/master in. Update to upstream/master. Jul 31, 2014
SimonSapin added a commit that referenced this pull request Jul 31, 2014
@SimonSapin
Merge pull request #9 from servo/rustup-20140716
6bb05b9 
Update to upstream/master.
@SimonSapin SimonSapin merged commit 6bb05b9 into servo Jul 31, 2014
@SimonSapin SimonSapin deleted the rustup-20140716 branch Jul 31, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants
@metajack @SimonSapin @lifthrasiir @klutzy
You can’t perform that action at this time.