Skip to content
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

Rollup of 8 pull requests #41383

Closed
wants to merge 28 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
99f5c85
rustc: ban registering obligations during InferCtxt snapshots.
eddyb Apr 15, 2017
e56b119
rustc_typeck: keep register_infer_ok_obligations calls out of snapshots.
eddyb Apr 15, 2017
2ad1964
rustc_typeck: Autoderef::finalize is always called with one &hir::Expr.
eddyb Apr 15, 2017
516570f
rustc_typeck: move some obligation methods to Inherited.
eddyb Apr 15, 2017
3725cab
rustc_typeck: return InferOk from lookup_method_in_trait_adjusted.
eddyb Apr 15, 2017
1afe77f
Cleaned up throughout std::path's docs
Apr 15, 2017
cd64ff9
rustc_typeck: fix binops needing more type informations to coerce.
eddyb Apr 16, 2017
8c21b60
Expand and add examples to std::path::{Prefix, PrefixComponent}'s docs
Apr 16, 2017
51ca5fe
Restructure and redistribute std::path's module docs
Apr 17, 2017
32132d9
Expand std::path::Display's docs
Apr 17, 2017
d6f7577
Fix typos in std::path's docs
Apr 18, 2017
2c9d756
Run tests for the cargo submodule in tree
alexcrichton Apr 18, 2017
43d92bb
update mdbook
steveklabnik Apr 18, 2017
0a69bf4
Bump stage0 to fix ARM LLVM
cuviper Apr 18, 2017
6383de1
fixes #40013
Apr 11, 2017
8b45a21
comment out removed error codes
Apr 18, 2017
3092ac4
change note for patterns
Apr 18, 2017
cba0c6a
rustc_trans: do not treat byval as using up registers.
eddyb Apr 18, 2017
19da9bb
Add top level sections to the Unstable Book.
frewsxcv Apr 13, 2017
19851f4
Bump book and reference.
frewsxcv Apr 17, 2017
b9f5f91
Rollup merge of #41236 - cengizIO:master, r=nikomatsakis
frewsxcv Apr 18, 2017
0f38011
Rollup merge of #41295 - frewsxcv:frewsxcxv-unstability, r=steveklabnik
frewsxcv Apr 18, 2017
4882a74
Rollup merge of #41325 - eddyb:isolate-snapshots-for-good, r=arielb1
frewsxcv Apr 18, 2017
b739b56
Rollup merge of #41348 - lukaramu:std-path-docs, r=frewsxcv
frewsxcv Apr 18, 2017
c1634ba
Rollup merge of #41362 - alexcrichton:run-cargot-ests, r=aturon
frewsxcv Apr 18, 2017
1093d5e
Rollup merge of #41369 - cuviper:arm-stage0, r=alexcrichton
frewsxcv Apr 18, 2017
a919245
Rollup merge of #41374 - steveklabnik:update-mdbook, r=frewsxcv
frewsxcv Apr 18, 2017
933cf2c
Rollup merge of #41378 - eddyb:byval-is-not-like-sret, r=arielb1
frewsxcv Apr 18, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
rustc_typeck: fix binops needing more type informations to coerce.
  • Loading branch information
eddyb committed Apr 16, 2017

Verified

This commit was signed with the committer’s verified signature. The key has expired.
danielleadams Danielle Adams
commit cd64ff943889b1cda1029a4a0d906d934a47abeb
2 changes: 2 additions & 0 deletions src/librustc_typeck/check/op.rs
Original file line number Diff line number Diff line change
@@ -411,6 +411,8 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
match method {
Some(ok) => {
let method = self.register_infer_ok_obligations(ok);
self.select_obligations_where_possible();

let method_ty = method.ty;

// HACK(eddyb) Fully qualified path to work around a resolve bug.
4 changes: 4 additions & 0 deletions src/test/run-pass/coerce-overloaded-autoderef.rs
Original file line number Diff line number Diff line change
@@ -68,4 +68,8 @@ fn use_vec_ref(v: &Vec<u8>) {
use_slice(&&&mut &&&v);
}

fn use_op_rhs(s: &mut String) {
*s += {&String::from(" ")};
}

pub fn main() {}