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

stage0 bootstrap bump #97147

Merged
merged 3 commits into from
May 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
50 changes: 22 additions & 28 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ dependencies = [
"tar",
"tempfile",
"termcolor",
"toml_edit 0.14.3",
"toml_edit",
"unicode-width",
"unicode-xid",
"url 2.2.2",
Expand Down Expand Up @@ -451,7 +451,7 @@ dependencies = [
"snapbox",
"tar",
"termcolor",
"toml_edit 0.14.3",
"toml_edit",
"url 2.2.2",
]

Expand Down Expand Up @@ -2041,15 +2041,6 @@ dependencies = [
"unicase",
]

[[package]]
name = "kstring"
version = "1.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8b310ccceade8121d7d77fee406160e457c2f4e7c7982d589da3499bc7ea4526"
dependencies = [
"serde",
]

[[package]]
name = "kstring"
version = "2.0.0"
Expand Down Expand Up @@ -3003,19 +2994,35 @@ dependencies = [
[[package]]
name = "racer"
version = "2.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "64954e44fc0d1dcc64e0b9f2b155249ad62849eba25354b76ae1598d1e8f0fa0"
dependencies = [
"bitflags",
"clap 2.34.0",
"derive_more",
"env_logger 0.7.1",
"humantime 2.0.1",
"lazy_static",
"lazycell",
"log",
"racer-cargo-metadata",
"rls-span",
]

[[package]]
name = "racer-cargo-metadata"
version = "0.1.2"
dependencies = [
"racer-interner",
"serde",
"serde_json",
]

[[package]]
name = "racer-interner"
version = "0.1.0"
dependencies = [
"serde",
]

[[package]]
name = "rand"
version = "0.7.3"
Expand Down Expand Up @@ -3246,7 +3253,7 @@ dependencies = [
"tokio-stream",
"tokio-util",
"toml",
"toml_edit 0.13.4",
"toml_edit",
"url 2.2.2",
"walkdir",
]
Expand Down Expand Up @@ -5320,19 +5327,6 @@ dependencies = [
"serde",
]

[[package]]
name = "toml_edit"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "744e9ed5b352340aa47ce033716991b5589e23781acb97cad37d4ea70560f55b"
dependencies = [
"combine",
"indexmap",
"itertools",
"kstring 1.0.6",
"serde",
]

[[package]]
name = "toml_edit"
version = "0.14.3"
Expand All @@ -5342,7 +5336,7 @@ dependencies = [
"combine",
"indexmap",
"itertools",
"kstring 2.0.0",
"kstring",
"serde",
]

Expand Down
1 change: 0 additions & 1 deletion library/core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@
#![feature(const_precise_live_drops)]
#![feature(const_refs_to_cell)]
#![feature(decl_macro)]
#![cfg_attr(bootstrap, feature(derive_default_enum))]
#![feature(deprecated_suggestion)]
#![feature(doc_cfg)]
#![feature(doc_notable_trait)]
Expand Down
1 change: 0 additions & 1 deletion library/core/src/slice/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4016,7 +4016,6 @@ impl<T> [T] {
}
}

#[cfg(not(bootstrap))]
impl<T, const N: usize> [[T; N]] {
/// Takes a `&[[T; N]]`, and flattens it to a `&[T]`.
///
Expand Down
2 changes: 0 additions & 2 deletions library/core/tests/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2518,15 +2518,13 @@ fn test_slice_from_ptr_range() {
}

#[test]
#[cfg(not(bootstrap))]
#[should_panic = "slice len overflow"]
fn test_flatten_size_overflow() {
let x = &[[(); usize::MAX]; 2][..];
let _ = x.flatten();
}

#[test]
#[cfg(not(bootstrap))]
#[should_panic = "slice len overflow"]
fn test_flatten_mut_size_overflow() {
let x = &mut [[(); usize::MAX]; 2][..];
Expand Down
Loading