Skip to content

/ servo

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 Rust #821

Closed
wants to merge 8 commits into from
Closed

Update Rust #821

wants to merge 8 commits into from

Conversation

@brson
Copy link
Contributor

brson commented Aug 29, 2013

Still needs servo/glfw-rs#5 and servo/rust-mozjs#31
brson added 3 commits Aug 28, 2013
@brson
Update Rust
1026556
@brson
Merge remote-tracking branch 'origin/master' into HEAD
9624148 
Conflicts:
	src/components/script/dom/bindings/proxyhandler.rs
	src/components/script/dom/bindings/text.rs
@brson
Rebase and update submodules
449a252
@jdm

This comment has been minimized.

Sign in to view
Copy link

jdm commented on 1026556 Aug 30, 2013

This can be merged as soon as the prerequisites are ready; it looks fine to me.
@brson
Remove incorrectly-added rust-http directory
Loading status checks…
6d52445
@brson
Copy link
Contributor Author

brson commented Aug 30, 2013

Sorry for the ugly commit history here.
@metajack

This comment has been minimized.

Sign in to view
Copy link

metajack commented on 6d52445 Aug 30, 2013

r+

This comment has been minimized.

Sign in to view
Copy link

metajack replied Aug 30, 2013

@bors: retry

This comment has been minimized.

Sign in to view
Copy link

metajack replied Aug 30, 2013

@bors: retry
@bors-servo

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo commented on 6d52445 Aug 30, 2013

saw approval from metajack
at brson@6d52445

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

merging brson/servo/master = 6d52445 into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

brson/servo/master = 6d52445 merged ok, testing candidate = f288478

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

saw approval from metajack
at brson@6d52445

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

merging brson/servo/master = 6d52445 into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

merging brson/servo/master = 6d52445 into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

brson/servo/master = 6d52445 merged ok, testing candidate = 660ede7

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

some tests failed:
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/249

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

some tests failed:
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/249

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

some tests failed:
http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/294
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/249
bors-servo pushed a commit that referenced this pull request Aug 30, 2013
bors-servo
auto merge of #821 : brson/servo/master, r=metajack
f288478 
Still needs servo/glfw-rs#5 and servo/rust-mozjs#31
bors-servo pushed a commit that referenced this pull request Aug 30, 2013
bors-servo
auto merge of #821 : brson/servo/master, r=metajack
25b808d 
Still needs servo/glfw-rs#5 and servo/rust-mozjs#31
bors-servo pushed a commit that referenced this pull request Aug 30, 2013
bors-servo
auto merge of #821 : brson/servo/master, r=metajack
660ede7 
Still needs servo/glfw-rs#5 and servo/rust-mozjs#31
@SimonSapin
Copy link
Member

SimonSapin commented Aug 30, 2013

@brson , I believe this is missing a change in src/compiler/rust-auto-clean-trigger. (I just built your PR and still had an older rust.)
@SimonSapin
Copy link
Member

SimonSapin commented Aug 30, 2013

I did a few more upgrades on top of this PR:
https://github.com/SimonSapin/servo/commits/rust-upgrade
SimonSapin@f84244f
brson added 2 commits Aug 30, 2013
@brson
Touch rust-auto-clean-trigger
d787033
@brson
Merge remote-tracking branch 'origin/master'
Loading status checks…
4487b1c 
Conflicts:
	src/components/script/dom/bindings/element.rs
	src/components/script/dom/bindings/node.rs
	src/components/script/dom/bindings/utils.rs
@brson

This comment has been minimized.

Sign in to view
Copy link
Owner Author

brson commented on 4487b1c Aug 30, 2013

r=metajack
@bors-servo

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo commented on 4487b1c Aug 30, 2013

saw approval from brson, metajack
at brson@4487b1c

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

merging brson/servo/master = 4487b1c into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

brson/servo/master = 4487b1c merged ok, testing candidate = 403d1d5

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

some tests failed:
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/255
bors-servo pushed a commit that referenced this pull request Aug 30, 2013
bors-servo
auto merge of #821 : brson/servo/master, r=brson,metajack
403d1d5 
Still needs servo/glfw-rs#5 and servo/rust-mozjs#31
brson added 2 commits Aug 30, 2013
@brson
Merge remote-tracking branch 'origin/master'
01cdfa3
@brson
Update contenttest
Loading status checks…
e2aa7b8
@brson

This comment has been minimized.

Sign in to view
Copy link
Owner Author

brson commented on e2aa7b8 Aug 30, 2013

r=metajack

This comment has been minimized.

Sign in to view
Copy link

metajack replied Aug 30, 2013

r+
@bors-servo

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo commented on e2aa7b8 Aug 30, 2013

saw approval from brson, metajack, metajack
at brson@e2aa7b8

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

merging brson/servo/master = e2aa7b8 into auto

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

brson/servo/master = e2aa7b8 merged ok, testing candidate = c532c73

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

all tests pass:
http://servo-buildbot.pub.build.mozilla.org/builders/linux/builds/301
http://servo-buildbot.pub.build.mozilla.org/builders/mac/builds/256

This comment has been minimized.

Sign in to view
Copy link
Contributor

bors-servo replied Aug 30, 2013

fast-forwarding master to auto = c532c73
bors-servo pushed a commit that referenced this pull request Aug 30, 2013
bors-servo
auto merge of #821 : brson/servo/master, r=brson,metajack,metajack
c532c73 
Still needs servo/glfw-rs#5 and servo/rust-mozjs#31
@bors-servo bors-servo closed this Aug 30, 2013
ChrisParis pushed a commit to ChrisParis/servo that referenced this pull request Sep 7, 2014
@jgraham
Merge pull request servo#821 from w3c/jgraham/testharness_properties
3e544e8 
Allow testharness properties to be set from the runner
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

5 participants
@brson @SimonSapin @bors-servo @metajack @jdm
You can’t perform that action at this time.