-
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.
Closes #14482 (std: Bring back half of Add on String) Closes #15026 (librustc: Remove the fallback to `int` from typechecking.) Closes #15119 (Add more description to c_str::unwrap().) Closes #15120 (Add tests for #12470 and #14285) Closes #15122 (Remove the cheat sheet.) Closes #15126 (rustc: Always include the morestack library) Closes #15127 (Improve ambiguous pronoun.) Closes #15130 (Fix #15129) Closes #15131 (Add the Guide, add warning to tutorial.) Closes #15134 (Xfailed tests for hygiene, etc.) Closes #15135 (core: Add stability attributes to Clone) Closes #15136 (Some minor improvements to core::bool) Closes #15137 (std: Add stability attributes to primitive numeric modules) Closes #15141 (Fix grammar in tutorial) Closes #15143 (Remove few FIXMEs) Closes #15145 (Avoid unnecessary temporary on assignments) Closes #15147 (Small improvements for metaprogramming) Closes #15153 (librustc: Check function argument patterns for legality of by-move) Closes #15154 (test: Add a test for regions, traits, and variance.) Closes #15159 (rustc: Don't register syntax crates twice) Closes #13816 (Stabilize version output for rustc and rustdoc)
- Loading branch information
1 parent
d6a4c43
commit cdccecb
Showing
6 changed files
with
13 additions
and
7 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
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -52,8 +52,8 @@ fn outer<TA: Clone>(a: TA) { | |
} | ||
|
||
fn main() { | ||
outer(-1); | ||
outer(-2.5); | ||
outer(-1i); | ||
outer(-2.5f64); | ||
} | ||
|
||
fn zzz() {()} |
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
cdccecb
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 alexcrichton
at alexcrichton@cdccecb
cdccecb
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 alexcrichton/rust/rollup = cdccecb into auto
cdccecb
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.
alexcrichton/rust/rollup = cdccecb merged ok, testing candidate = 91be86a
cdccecb
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/45
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/46
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/46
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/46
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/48
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/49
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/48
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/54
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/49
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/48
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/51
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/49
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/48
cdccecb
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 = 91be86a