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

resolve: Remove remaining special cases from built-in macros #63449

Merged
merged 1 commit into from Aug 12, 2019

Conversation

@petrochenkov
Copy link
Contributor

commented Aug 10, 2019

Edition and definition sites of the macros are now also taken from the #[rustc_builtin_macro] definitions in libcore.


The edition switch may be a breaking change for Rustc{Encodable,Decodable} derives if they are used in combination with the unstable crate serialize from sysroot like this

extern crate serialize;
use serialize as rustc_serialize;

#[derive(RustcEncodable)]
struct S;

(see the updated ui-fulldeps tests).

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Aug 10, 2019

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@Mark-Simulacrum

This comment has been minimized.

Copy link
Member

commented Aug 10, 2019

Labeling relnotes for the change to Rustc{Encodable, Decodable}.

@eddyb

This comment has been minimized.

Copy link
Member

commented Aug 11, 2019

r=me if the breaking change is unstable-only (i.e. users of the crates.io version of rustc_serialize aren't affected)

@petrochenkov

This comment has been minimized.

Copy link
Contributor Author

commented Aug 11, 2019

@bors r=eddyb

@bors

This comment has been minimized.

Copy link
Contributor

commented Aug 11, 2019

📌 Commit fa7fe19 has been approved by eddyb

Centril added a commit to Centril/rust that referenced this pull request Aug 12, 2019
Rollup merge of rust-lang#63449 - petrochenkov:builtinagain, r=eddyb
resolve: Remove remaining special cases from built-in macros

Edition and definition sites of the macros are now also taken from the `#[rustc_builtin_macro]` definitions in `libcore`.

---
The edition switch may be a breaking change for `Rustc{Encodable,Decodable}` derives if they are used in combination with the unstable crate `serialize` from sysroot like this
```rust
extern crate serialize;
use serialize as rustc_serialize;

#[derive(RustcEncodable)]
struct S;
```
(see the updated `ui-fulldeps` tests).
bors added a commit that referenced this pull request Aug 12, 2019
Auto merge of #63482 - Centril:rollup-iyakgmg, r=Centril
Rollup of 10 pull requests

Successful merges:

 - #62108 (Use sharded maps for queries)
 - #63297 (Improve pointer offset method docs)
 - #63306 (Adapt AddRetag for shallow retagging)
 - #63406 (Suggest using a qualified path in patterns with inconsistent bindings)
 - #63431 (Revert "Simplify MIR generation for logical ops")
 - #63449 (resolve: Remove remaining special cases from built-in macros)
 - #63461 (docs: add stdlib env::var(_os) panic)
 - #63473 (Regression test for #56870)
 - #63474 (Add tests for issue #53598 and #57700)
 - #63480 (Fixes #63477)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Aug 12, 2019
Rollup merge of rust-lang#63449 - petrochenkov:builtinagain, r=eddyb
resolve: Remove remaining special cases from built-in macros

Edition and definition sites of the macros are now also taken from the `#[rustc_builtin_macro]` definitions in `libcore`.

---
The edition switch may be a breaking change for `Rustc{Encodable,Decodable}` derives if they are used in combination with the unstable crate `serialize` from sysroot like this
```rust
extern crate serialize;
use serialize as rustc_serialize;

#[derive(RustcEncodable)]
struct S;
```
(see the updated `ui-fulldeps` tests).
bors added a commit that referenced this pull request Aug 12, 2019
Auto merge of #63489 - Centril:rollup-uuf6z1s, r=Centril
Rollup of 9 pull requests

Successful merges:

 - #62108 (Use sharded maps for queries)
 - #63297 (Improve pointer offset method docs)
 - #63406 (Suggest using a qualified path in patterns with inconsistent bindings)
 - #63431 (Revert "Simplify MIR generation for logical ops")
 - #63449 (resolve: Remove remaining special cases from built-in macros)
 - #63461 (docs: add stdlib env::var(_os) panic)
 - #63473 (Regression test for #56870)
 - #63474 (Add tests for issue #53598 and #57700)
 - #63480 (Fixes #63477)

Failed merges:

r? @ghost

@bors bors merged commit fa7fe19 into rust-lang:master Aug 12, 2019

4 checks passed

pr Build #20190810.45 succeeded
Details
pr (Linux mingw-check) Linux mingw-check succeeded
Details
pr (Linux x86_64-gnu-llvm-6.0) Linux x86_64-gnu-llvm-6.0 succeeded
Details
pr (LinuxTools) LinuxTools succeeded
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.