-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix two regressions introduced by #11072.
There, concrete evidence that I shouldn't try doing such things at 1:30am.
- Loading branch information
1 parent
3906823
commit 2205580
Showing
1 changed file
with
1 addition
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2205580
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from brson
at chris-morgan@2205580
2205580
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging chris-morgan/rust/fix-11072-regressions = 2205580 into auto
2205580
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
chris-morgan/rust/fix-11072-regressions = 2205580 merged ok, testing candidate = a070f82c
2205580
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
some tests failed:
failure: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2213
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3104
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/947
exception: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/949
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3110
exception: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2212
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3121
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2210
exception: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2215
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3123
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2214
exception: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2290
exception: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3109
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2211
exception: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2215
exception: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/2885
2205580
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from brson
at chris-morgan@2205580
2205580
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging chris-morgan/rust/fix-11072-regressions = 2205580 into auto
2205580
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
chris-morgan/rust/fix-11072-regressions = 2205580 merged ok, testing candidate = 35fc0c8
2205580
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/3116
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/959
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/961
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3122
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2224
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2225
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3133
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2222
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2227
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3135
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2222
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2226
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2301
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3121
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2223
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2227
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/2896
2205580
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 35fc0c8