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 9 pull requests #64645

Closed
wants to merge 23 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e608549
Filter out stmts made for the redundant_semicolon lint when pretty-pr…
nathanwhit Sep 12, 2019
96526d4
Add test for redundant_semicolon lint interaction with proc macro attrs
nathanwhit Sep 12, 2019
612ef5f
add new tests for re_rebalance_coherence
nikomatsakis Sep 12, 2019
e69d1b6
change to check-pass
nikomatsakis Sep 13, 2019
194d357
Document `From` trait for `LhsExpr`
crgl Sep 3, 2019
3f004a1
Fix re-rebalance coherence implementation for fundamental types
weiznich Sep 17, 2019
a9c38d9
Add more tests
weiznich Sep 18, 2019
31b3012
Split line to fix tidy
weiznich Sep 18, 2019
8112f71
rustbuild: Turn down compression on exe installers
alexcrichton Sep 19, 2019
1ab5593
factor out pluralisation remains after #64280
Sep 19, 2019
fde8cfe
rustbuild: Turn down compression on msi installers
alexcrichton Sep 19, 2019
255dd3f
rustbuild: Improve output of `dist` step
alexcrichton Sep 19, 2019
3db2c13
Add Compatibility Notes to RELEASES.md for 1.38.0
XAMPPRocky Sep 19, 2019
c3140ba
remove the extra comma after the match arm
Sep 20, 2019
5096f24
Rollup merge of #64136 - crgl:doc-from-parser-lhs, r=Centril
tmandry Sep 20, 2019
a5bd08f
Rollup merge of #64342 - glorv:master, r=varkor
tmandry Sep 20, 2019
50df43d
Rollup merge of #64387 - nathanwhit:redundant-semi-fix, r=varkor
tmandry Sep 20, 2019
5edb619
Rollup merge of #64546 - weiznich:bugfix/rfc-2451-rerebalance-tests, …
tmandry Sep 20, 2019
d3a623d
Rollup merge of #64615 - alexcrichton:smaller-exe, r=Mark-Simulacrum
tmandry Sep 20, 2019
fa7683d
Rollup merge of #64617 - alexcrichton:smaller-msi, r=Mark-Simulacrum
tmandry Sep 20, 2019
8896f79
Rollup merge of #64618 - alexcrichton:improve-dist-output, r=Mark-Sim…
tmandry Sep 20, 2019
5e71a79
Rollup merge of #64621 - XAMPPRocky:relnotes, r=Mark-Simulacrum
tmandry Sep 20, 2019
88ad194
Rollup merge of #64632 - guanqun:patch-1, r=jonas-schievink
tmandry Sep 20, 2019
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#![feature(re_rebalance_coherence)]

// run-pass
// compile-flags:--crate-name=test
// aux-build:coherence_lib.rs

extern crate coherence_lib as lib;
use lib::*;
use std::rc::Rc;

struct Local;
impl<T> Remote2<Rc<T>, Local> for usize { }

fn main() {}
21 changes: 21 additions & 0 deletions src/test/ui/coherence/impl[t]-foreign[local]-for-fundamental[t].rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
#![feature(re_rebalance_coherence)]

// compile-flags:--crate-name=test
// aux-build:coherence_lib.rs
// run-pass

extern crate coherence_lib as lib;
use lib::*;
use std::rc::Rc;

struct Local;

impl<T> Remote1<Local> for Box<T> {
// FIXME(#64412) -- this is expected to error
}

impl<T> Remote1<Local> for &T {
// FIXME(#64412) -- this is expected to error
}

fn main() {}
16 changes: 16 additions & 0 deletions src/test/ui/coherence/impl[t]-foreign[local]-for-t.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#![feature(re_rebalance_coherence)]

// compile-flags:--crate-name=test
// aux-build:coherence_lib.rs

extern crate coherence_lib as lib;
use lib::*;
use std::rc::Rc;

struct Local;

impl<T> Remote1<Local> for T {
//~^ ERROR type parameter `T` must be used as the type parameter for some local type
}

fn main() {}
11 changes: 11 additions & 0 deletions src/test/ui/coherence/impl[t]-foreign[local]-for-t.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
error[E0210]: type parameter `T` must be used as the type parameter for some local type (e.g., `MyStruct<T>`)
--> $DIR/impl[t]-foreign[local]-for-t.rs:12:1
|
LL | impl<T> Remote1<Local> for T {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ type parameter `T` must be used as the type parameter for some local type
|
= note: only traits defined in the current crate can be implemented for a type parameter

error: aborting due to previous error

For more information about this error, try `rustc --explain E0210`.
14 changes: 0 additions & 14 deletions src/test/ui/coherence/re-rebalance-coherence-rpass.rs

This file was deleted.