From 2644205578b6d5259c59c099cc3d29ab03364931 Mon Sep 17 00:00:00 2001
From: sd234678 <sd234678@protonmail.com>
Date: Fri, 9 Aug 2019 23:07:51 +0100
Subject: [PATCH 1/7] Remove unneeded comment in src/libcore/hash/mod.rs
---
src/libcore/hash/mod.rs | 2 --
1 file changed, 2 deletions(-)
diff --git a/src/libcore/hash/mod.rs b/src/libcore/hash/mod.rs
index c4cbf40a93a15..685540ba6fc26 100644
--- a/src/libcore/hash/mod.rs
+++ b/src/libcore/hash/mod.rs
@@ -553,8 +553,6 @@ impl<H> PartialEq for BuildHasherDefault<H> {
#[stable(since = "1.29.0", feature = "build_hasher_eq")]
impl<H> Eq for BuildHasherDefault<H> {}
-//////////////////////////////////////////////////////////////////////////////
-
mod impls {
use crate::mem;
use crate::slice;
From 51ce121592f85a22b8f8f1905525efaa89d07d20 Mon Sep 17 00:00:00 2001
From: Clar Fon <them@lightdark.xyz>
Date: Fri, 9 Aug 2019 14:58:09 -0400
Subject: [PATCH 2/7] Implement Clone, Display for ascii::EscapeDefault
---
src/libcore/ascii.rs | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/src/libcore/ascii.rs b/src/libcore/ascii.rs
index e6a6fdde54042..4087333e2cf6d 100644
--- a/src/libcore/ascii.rs
+++ b/src/libcore/ascii.rs
@@ -14,6 +14,7 @@
use crate::fmt;
use crate::ops::Range;
use crate::iter::FusedIterator;
+use crate::str::from_utf8_unchecked;
/// An iterator over the escaped version of a byte.
///
@@ -22,6 +23,7 @@ use crate::iter::FusedIterator;
///
/// [`escape_default`]: fn.escape_default.html
#[stable(feature = "rust1", since = "1.0.0")]
+#[derive(Clone)]
pub struct EscapeDefault {
range: Range<usize>,
data: [u8; 4],
@@ -130,6 +132,13 @@ impl ExactSizeIterator for EscapeDefault {}
#[stable(feature = "fused", since = "1.26.0")]
impl FusedIterator for EscapeDefault {}
+#[stable(feature = "ascii_escape_display", since = "1.39.0")]
+impl fmt::Display for EscapeDefault {
+ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+ f.write_str(unsafe { from_utf8_unchecked(&self.data[self.range.clone()]) })
+ }
+}
+
#[stable(feature = "std_debug", since = "1.16.0")]
impl fmt::Debug for EscapeDefault {
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
From 30fcd50ba913e579bf01393d25ba85c9c2c5a781 Mon Sep 17 00:00:00 2001
From: Wang Xuerui <git@xen0n.name>
Date: Sun, 28 Jul 2019 11:46:47 +0800
Subject: [PATCH 3/7] rustc_target: add n64 musl targets for MIPS64 arches
Hard-float (unlike mips32 musl targets but consistent with any other
musl target), MIPS64r2, n64 ABI.
The triples are renamed to carry the `abi64` ABI suffix found on all
other MIPS64 targets, for consistency and forward compatibility, should
Rust gain support for the n32 ABI one day.
---
.../spec/mips64_unknown_linux_muslabi64.rs | 25 +++++++++++++++++++
.../spec/mips64el_unknown_linux_muslabi64.rs | 25 +++++++++++++++++++
src/librustc_target/spec/mod.rs | 2 ++
3 files changed, 52 insertions(+)
create mode 100644 src/librustc_target/spec/mips64_unknown_linux_muslabi64.rs
create mode 100644 src/librustc_target/spec/mips64el_unknown_linux_muslabi64.rs
diff --git a/src/librustc_target/spec/mips64_unknown_linux_muslabi64.rs b/src/librustc_target/spec/mips64_unknown_linux_muslabi64.rs
new file mode 100644
index 0000000000000..75f3efa49c4f0
--- /dev/null
+++ b/src/librustc_target/spec/mips64_unknown_linux_muslabi64.rs
@@ -0,0 +1,25 @@
+use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
+
+pub fn target() -> TargetResult {
+ let mut base = super::linux_musl_base::opts();
+ base.cpu = "mips64r2".to_string();
+ base.features = "+mips64r2".to_string();
+ base.max_atomic_width = Some(64);
+ Ok(Target {
+ // LLVM doesn't recognize "muslabi64" yet.
+ llvm_target: "mips64-unknown-linux-musl".to_string(),
+ target_endian: "big".to_string(),
+ target_pointer_width: "64".to_string(),
+ target_c_int_width: "32".to_string(),
+ data_layout: "E-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
+ arch: "mips64".to_string(),
+ target_os: "linux".to_string(),
+ target_env: "musl".to_string(),
+ target_vendor: "unknown".to_string(),
+ linker_flavor: LinkerFlavor::Gcc,
+ options: TargetOptions {
+ target_mcount: "_mcount".to_string(),
+ .. base
+ },
+ })
+}
diff --git a/src/librustc_target/spec/mips64el_unknown_linux_muslabi64.rs b/src/librustc_target/spec/mips64el_unknown_linux_muslabi64.rs
new file mode 100644
index 0000000000000..a6aad3ddd3d79
--- /dev/null
+++ b/src/librustc_target/spec/mips64el_unknown_linux_muslabi64.rs
@@ -0,0 +1,25 @@
+use crate::spec::{LinkerFlavor, Target, TargetOptions, TargetResult};
+
+pub fn target() -> TargetResult {
+ let mut base = super::linux_musl_base::opts();
+ base.cpu = "mips64r2".to_string();
+ base.features = "+mips64r2".to_string();
+ base.max_atomic_width = Some(64);
+ Ok(Target {
+ // LLVM doesn't recognize "muslabi64" yet.
+ llvm_target: "mips64el-unknown-linux-musl".to_string(),
+ target_endian: "little".to_string(),
+ target_pointer_width: "64".to_string(),
+ target_c_int_width: "32".to_string(),
+ data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-n32:64-S128".to_string(),
+ arch: "mips64".to_string(),
+ target_os: "linux".to_string(),
+ target_env: "musl".to_string(),
+ target_vendor: "unknown".to_string(),
+ linker_flavor: LinkerFlavor::Gcc,
+ options: TargetOptions {
+ target_mcount: "_mcount".to_string(),
+ .. base
+ },
+ })
+}
diff --git a/src/librustc_target/spec/mod.rs b/src/librustc_target/spec/mod.rs
index ec72c00c28f61..ebf931cb6942b 100644
--- a/src/librustc_target/spec/mod.rs
+++ b/src/librustc_target/spec/mod.rs
@@ -371,6 +371,8 @@ supported_targets! {
("i586-unknown-linux-musl", i586_unknown_linux_musl),
("mips-unknown-linux-musl", mips_unknown_linux_musl),
("mipsel-unknown-linux-musl", mipsel_unknown_linux_musl),
+ ("mips64-unknown-linux-muslabi64", mips64_unknown_linux_muslabi64),
+ ("mips64el-unknown-linux-muslabi64", mips64el_unknown_linux_muslabi64),
("hexagon-unknown-linux-musl", hexagon_unknown_linux_musl),
("mips-unknown-linux-uclibc", mips_unknown_linux_uclibc),
From fa7a40cc6ee7e16c948a804dbb487d36b3d0ccc9 Mon Sep 17 00:00:00 2001
From: Observer42 <yishengxu@outlook.com>
Date: Mon, 12 Aug 2019 16:07:13 +0800
Subject: [PATCH 4/7] Document From trait for BinaryHeap
---
src/liballoc/collections/binary_heap.rs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/liballoc/collections/binary_heap.rs b/src/liballoc/collections/binary_heap.rs
index 9f531f5b83c75..cc6c69d5738ea 100644
--- a/src/liballoc/collections/binary_heap.rs
+++ b/src/liballoc/collections/binary_heap.rs
@@ -1163,6 +1163,9 @@ impl<T> FusedIterator for Drain<'_, T> {}
#[stable(feature = "binary_heap_extras_15", since = "1.5.0")]
impl<T: Ord> From<Vec<T>> for BinaryHeap<T> {
+ /// Converts a `Vec` into a `BinaryHeap`.
+ ///
+ /// This conversion happens in-place, and has O(n) time complexity.
fn from(vec: Vec<T>) -> BinaryHeap<T> {
let mut heap = BinaryHeap { data: vec };
heap.rebuild();
From 91af5c2daf950bd6f99e17dd2e0d23e7cd45e131 Mon Sep 17 00:00:00 2001
From: Ilija Tovilo <ilija.tovilo@me.com>
Date: Sun, 11 Aug 2019 23:37:05 +0200
Subject: [PATCH 5/7] Bring back suggestion for splitting `<-` into `< -`
Closes #62632
---
src/libsyntax/parse/parser/expr.rs | 17 +++++++++++++++++
src/libsyntax/util/parser.rs | 2 ++
src/test/ui/obsolete-in-place/bad.rs | 2 +-
src/test/ui/obsolete-in-place/bad.stderr | 8 ++++++--
src/test/ui/placement-syntax.rs | 2 +-
src/test/ui/placement-syntax.stderr | 10 ++++++----
6 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/src/libsyntax/parse/parser/expr.rs b/src/libsyntax/parse/parser/expr.rs
index 4432c1329cbfe..4fdb000ed9029 100644
--- a/src/libsyntax/parse/parser/expr.rs
+++ b/src/libsyntax/parse/parser/expr.rs
@@ -224,6 +224,10 @@ impl<'a> Parser<'a> {
self.err_dotdotdot_syntax(self.token.span);
}
+ if self.token == token::LArrow {
+ self.err_larrow_operator(self.token.span);
+ }
+
self.bump();
if op.is_comparison() {
self.check_no_chained_comparison(&lhs, &op);
@@ -1702,6 +1706,19 @@ impl<'a> Parser<'a> {
.emit();
}
+ fn err_larrow_operator(&self, span: Span) {
+ self.struct_span_err(
+ span,
+ "unexpected token: `<-`"
+ ).span_suggestion(
+ span,
+ "if you meant to write a comparison against a negative value, add a \
+ space in between `<` and `-`",
+ "< -".to_string(),
+ Applicability::MaybeIncorrect
+ ).emit();
+ }
+
fn mk_assign_op(&self, binop: BinOp, lhs: P<Expr>, rhs: P<Expr>) -> ExprKind {
ExprKind::AssignOp(binop, lhs, rhs)
}
diff --git a/src/libsyntax/util/parser.rs b/src/libsyntax/util/parser.rs
index d71358f45c470..a501541c95909 100644
--- a/src/libsyntax/util/parser.rs
+++ b/src/libsyntax/util/parser.rs
@@ -97,6 +97,8 @@ impl AssocOp {
// DotDotDot is no longer supported, but we need some way to display the error
token::DotDotDot => Some(DotDotEq),
token::Colon => Some(Colon),
+ // `<-` should probably be `< -`
+ token::LArrow => Some(Less),
_ if t.is_keyword(kw::As) => Some(As),
_ => None
}
diff --git a/src/test/ui/obsolete-in-place/bad.rs b/src/test/ui/obsolete-in-place/bad.rs
index 3530862f76787..a491bb21a57a0 100644
--- a/src/test/ui/obsolete-in-place/bad.rs
+++ b/src/test/ui/obsolete-in-place/bad.rs
@@ -2,7 +2,7 @@
fn foo() {
let (x, y) = (0, 0);
- x <- y; //~ ERROR expected one of
+ x <- y; //~ ERROR unexpected token: `<-`
}
fn main() {
diff --git a/src/test/ui/obsolete-in-place/bad.stderr b/src/test/ui/obsolete-in-place/bad.stderr
index 373b7ea42183d..8a731b6240b2f 100644
--- a/src/test/ui/obsolete-in-place/bad.stderr
+++ b/src/test/ui/obsolete-in-place/bad.stderr
@@ -1,8 +1,12 @@
-error: expected one of `!`, `.`, `::`, `;`, `?`, `{`, `}`, or an operator, found `<-`
+error: unexpected token: `<-`
--> $DIR/bad.rs:5:7
|
LL | x <- y;
- | ^^ expected one of 8 possible tokens here
+ | ^^
+help: if you meant to write a comparison against a negative value, add a space in between `<` and `-`
+ |
+LL | x < - y;
+ | ^^^
error: expected expression, found keyword `in`
--> $DIR/bad.rs:10:5
diff --git a/src/test/ui/placement-syntax.rs b/src/test/ui/placement-syntax.rs
index 2edd78ec8ab3d..4df96dedbd45b 100644
--- a/src/test/ui/placement-syntax.rs
+++ b/src/test/ui/placement-syntax.rs
@@ -1,6 +1,6 @@
fn main() {
let x = -5;
- if x<-1 { //~ ERROR expected `{`, found `<-`
+ if x<-1 { //~ ERROR unexpected token: `<-`
println!("ok");
}
}
diff --git a/src/test/ui/placement-syntax.stderr b/src/test/ui/placement-syntax.stderr
index e90acce168e47..e26931e60d88f 100644
--- a/src/test/ui/placement-syntax.stderr
+++ b/src/test/ui/placement-syntax.stderr
@@ -1,10 +1,12 @@
-error: expected `{`, found `<-`
+error: unexpected token: `<-`
--> $DIR/placement-syntax.rs:3:9
|
LL | if x<-1 {
- | -- ^^ expected `{`
- | |
- | this `if` statement has a condition, but no block
+ | ^^
+help: if you meant to write a comparison against a negative value, add a space in between `<` and `-`
+ |
+LL | if x< -1 {
+ | ^^^
error: aborting due to previous error
From e30480ca864c5810c89bbf1f475eb0bc2999c251 Mon Sep 17 00:00:00 2001
From: Observer42 <yishengxu47@gmail.com>
Date: Mon, 12 Aug 2019 18:07:14 +0800
Subject: [PATCH 6/7] Apply suggestions from code review
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
---
src/liballoc/collections/binary_heap.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/liballoc/collections/binary_heap.rs b/src/liballoc/collections/binary_heap.rs
index cc6c69d5738ea..3d04f30e7bde5 100644
--- a/src/liballoc/collections/binary_heap.rs
+++ b/src/liballoc/collections/binary_heap.rs
@@ -1163,9 +1163,9 @@ impl<T> FusedIterator for Drain<'_, T> {}
#[stable(feature = "binary_heap_extras_15", since = "1.5.0")]
impl<T: Ord> From<Vec<T>> for BinaryHeap<T> {
- /// Converts a `Vec` into a `BinaryHeap`.
+ /// Converts a `Vec<T>` into a `BinaryHeap<T>`.
///
- /// This conversion happens in-place, and has O(n) time complexity.
+ /// This conversion happens in-place, and has `O(n)` time complexity.
fn from(vec: Vec<T>) -> BinaryHeap<T> {
let mut heap = BinaryHeap { data: vec };
heap.rebuild();
From 34dcca20e5909513f08d1c21df1168357c3b6b6a Mon Sep 17 00:00:00 2001
From: Eduard-Mihai Burtescu <edy.burt@gmail.com>
Date: Sun, 11 Aug 2019 08:25:30 +0300
Subject: [PATCH 7/7] syntax: account for CVarArgs being in the argument list.
---
src/libsyntax/parse/parser.rs | 2 +-
src/test/ui/c-variadic/variadic-ffi-no-fixed-args.rs | 6 ++++++
src/test/ui/c-variadic/variadic-ffi-no-fixed-args.stderr | 8 ++++++++
3 files changed, 15 insertions(+), 1 deletion(-)
create mode 100644 src/test/ui/c-variadic/variadic-ffi-no-fixed-args.rs
create mode 100644 src/test/ui/c-variadic/variadic-ffi-no-fixed-args.stderr
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 1c1428c5713f7..2286e74e63304 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -1236,7 +1236,7 @@ impl<'a> Parser<'a> {
let args: Vec<_> = args.into_iter().filter_map(|x| x).collect();
- if c_variadic && args.is_empty() {
+ if c_variadic && args.len() <= 1 {
self.span_err(sp,
"C-variadic function must be declared with at least one named argument");
}
diff --git a/src/test/ui/c-variadic/variadic-ffi-no-fixed-args.rs b/src/test/ui/c-variadic/variadic-ffi-no-fixed-args.rs
new file mode 100644
index 0000000000000..e3b642a9d418d
--- /dev/null
+++ b/src/test/ui/c-variadic/variadic-ffi-no-fixed-args.rs
@@ -0,0 +1,6 @@
+extern {
+ fn foo(...);
+ //~^ ERROR C-variadic function must be declared with at least one named argument
+}
+
+fn main() {}
diff --git a/src/test/ui/c-variadic/variadic-ffi-no-fixed-args.stderr b/src/test/ui/c-variadic/variadic-ffi-no-fixed-args.stderr
new file mode 100644
index 0000000000000..cb6060525fc0d
--- /dev/null
+++ b/src/test/ui/c-variadic/variadic-ffi-no-fixed-args.stderr
@@ -0,0 +1,8 @@
+error: C-variadic function must be declared with at least one named argument
+ --> $DIR/variadic-ffi-no-fixed-args.rs:2:11
+ |
+LL | fn foo(...);
+ | ^
+
+error: aborting due to previous error
+