]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #102049 - fee1-dead-contrib:derive_const, r=oli-obk
authorDylan DPC <99973273+Dylan-DPC@users.noreply.github.com>
Sat, 12 Nov 2022 06:32:50 +0000 (12:02 +0530)
committerGitHub <noreply@github.com>
Sat, 12 Nov 2022 06:32:50 +0000 (12:02 +0530)
Add the `#[derive_const]` attribute

Closes #102371. This is a minimal patchset for the attribute to work. There are no restrictions on what traits this attribute applies to.

r? `````@oli-obk`````

21 files changed:
1  2 
compiler/rustc_builtin_macros/src/deriving/bounds.rs
compiler/rustc_builtin_macros/src/deriving/clone.rs
compiler/rustc_builtin_macros/src/deriving/cmp/eq.rs
compiler/rustc_builtin_macros/src/deriving/cmp/ord.rs
compiler/rustc_builtin_macros/src/deriving/cmp/partial_eq.rs
compiler/rustc_builtin_macros/src/deriving/cmp/partial_ord.rs
compiler/rustc_builtin_macros/src/deriving/debug.rs
compiler/rustc_builtin_macros/src/deriving/decodable.rs
compiler/rustc_builtin_macros/src/deriving/default.rs
compiler/rustc_builtin_macros/src/deriving/encodable.rs
compiler/rustc_builtin_macros/src/deriving/generic/mod.rs
compiler/rustc_builtin_macros/src/deriving/hash.rs
compiler/rustc_builtin_macros/src/deriving/mod.rs
compiler/rustc_builtin_macros/src/lib.rs
compiler/rustc_expand/src/base.rs
compiler/rustc_expand/src/expand.rs
compiler/rustc_resolve/src/macros.rs
compiler/rustc_span/src/symbol.rs
library/core/src/macros/mod.rs
library/core/src/prelude/v1.rs
library/std/src/prelude/v1.rs

index 16ee3aa89bb1237967b3a7a16e2c65bd447ca8de,78dbe8e5979e265d97a25f6310a53720b9e322d5..3972c3b493410b277991d12cea7fa45c16de51ff
@@@ -171,10 -171,9 +171,10 @@@ use rustc_ast::{GenericArg, GenericPara
  use rustc_attr as attr;
  use rustc_expand::base::{Annotatable, ExtCtxt};
  use rustc_span::symbol::{kw, sym, Ident, Symbol};
- use rustc_span::Span;
+ use rustc_span::{Span, DUMMY_SP};
  use std::cell::RefCell;
  use std::iter;
 +use std::ops::Not;
  use std::vec;
  use thin_vec::thin_vec;
  use ty::{Bounds, Path, Ref, Self_, Ty};
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge