diff options
| author | bors <bors@rust-lang.org> | 2020-03-19 00:28:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-03-19 00:28:33 +0000 |
| commit | 57e1da59cd0761330b4ea8d47b16340a78eeafa9 (patch) | |
| tree | 0dc41b23dbe3fda1dbc8e69548e7060adcea0fd1 /src/librustc_span | |
| parent | f509b26a7730d721ef87423a72b3fdf8724b4afa (diff) | |
| parent | 94ed0719f7ab083e4c94651a608ae49e14653e6a (diff) | |
| download | rust-57e1da59cd0761330b4ea8d47b16340a78eeafa9.tar.gz rust-57e1da59cd0761330b4ea8d47b16340a78eeafa9.zip | |
Auto merge of #70118 - pietroalbini:rollup-pgjc90i, r=pietroalbini
Rollup of 2 pull requests Successful merges: - #70112 (Rollup of 10 pull requests) - #70116 (ci: use python from the correct path) Failed merges: r? @ghost
Diffstat (limited to 'src/librustc_span')
| -rw-r--r-- | src/librustc_span/def_id.rs | 2 | ||||
| -rw-r--r-- | src/librustc_span/lib.rs | 3 | ||||
| -rw-r--r-- | src/librustc_span/symbol.rs | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/librustc_span/def_id.rs b/src/librustc_span/def_id.rs index a2944782e91..af8d5ce09b5 100644 --- a/src/librustc_span/def_id.rs +++ b/src/librustc_span/def_id.rs @@ -25,7 +25,7 @@ pub enum CrateNum { /// Item definitions in the currently-compiled crate would have the `CrateNum` /// `LOCAL_CRATE` in their `DefId`. -pub const LOCAL_CRATE: CrateNum = CrateNum::Index(CrateId::from_u32_const(0)); +pub const LOCAL_CRATE: CrateNum = CrateNum::Index(CrateId::from_u32(0)); impl Idx for CrateNum { #[inline] diff --git a/src/librustc_span/lib.rs b/src/librustc_span/lib.rs index caa50e9a41c..1f6d10f4e8f 100644 --- a/src/librustc_span/lib.rs +++ b/src/librustc_span/lib.rs @@ -6,6 +6,9 @@ #![doc(html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(crate_visibility_modifier)] +#![feature(const_if_match)] +#![feature(const_fn)] +#![feature(const_panic)] #![feature(nll)] #![feature(optin_builtin_traits)] #![feature(specialization)] diff --git a/src/librustc_span/symbol.rs b/src/librustc_span/symbol.rs index 19754c83038..5685505f694 100644 --- a/src/librustc_span/symbol.rs +++ b/src/librustc_span/symbol.rs @@ -1026,7 +1026,7 @@ rustc_index::newtype_index! { impl Symbol { const fn new(n: u32) -> Self { - Symbol(SymbolIndex::from_u32_const(n)) + Symbol(SymbolIndex::from_u32(n)) } /// Maps a string to its interned representation. |
