From 6fc138136d8d6cf9f8478efa501e3a173e5c0277 Mon Sep 17 00:00:00 2001 From: Dave Huseby Date: Tue, 14 Apr 2015 11:18:12 -0700 Subject: [PATCH 1/4] disabling a test for bitrig and openbsd --- src/doc/trpl/no-stdlib.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/trpl/no-stdlib.md b/src/doc/trpl/no-stdlib.md index 094c82a08cc9d..67db919c59f45 100644 --- a/src/doc/trpl/no-stdlib.md +++ b/src/doc/trpl/no-stdlib.md @@ -103,7 +103,7 @@ necessary functionality for writing idiomatic and effective Rust code. As an example, here is a program that will calculate the dot product of two vectors provided from C, using idiomatic Rust practices. -``` +```ignore #![feature(lang_items, start, no_std, core, libc)] #![no_std] From cbe9a1a6f49dad61dac0613920631eb63a004823 Mon Sep 17 00:00:00 2001 From: Pascal Hertleif Date: Tue, 14 Apr 2015 23:22:37 +0200 Subject: [PATCH 2/4] Remove Incorrect Link from std::ptr::null Docs The link works on the std::ptr docs page, but not the primitive.ptr.html page. Instead of leaving it half-broken, it is removed. --- src/libcore/ptr.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libcore/ptr.rs b/src/libcore/ptr.rs index a622ef78a21a4..fdd96e64e4a5f 100644 --- a/src/libcore/ptr.rs +++ b/src/libcore/ptr.rs @@ -15,9 +15,9 @@ //! Working with unsafe pointers in Rust is uncommon, //! typically limited to a few patterns. //! -//! Use the [`null` function](fn.null.html) to create null pointers, and -//! the `is_null` method of the `*const T` type to check for null. -//! The `*const T` type also defines the `offset` method, for pointer math. +//! Use the `null` function to create null pointers, and the `is_null` method +//! of the `*const T` type to check for null. The `*const T` type also defines +//! the `offset` method, for pointer math. //! //! # Common ways to create unsafe pointers //! From 4f3d400b3d117d2c9088c7b9d0a7c0a16c908ca6 Mon Sep 17 00:00:00 2001 From: Florian Hahn Date: Tue, 14 Apr 2015 23:24:03 +0200 Subject: [PATCH 3/4] Remove superfluous `the` from `custom_attribute` feature gate message --- src/libsyntax/feature_gate.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 689b4595d39a6..0d51816dbdbec 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -399,7 +399,7 @@ impl<'a> Context<'a> { } else { self.gate_feature("custom_attribute", attr.span, &format!("The attribute `{}` is currently \ - unknown to the the compiler and \ + unknown to the compiler and \ may have meaning \ added to it in the future", name)); From f37365ea929e77142ac77b482804683c1a86b20d Mon Sep 17 00:00:00 2001 From: Nick Cameron Date: Wed, 15 Apr 2015 11:20:17 +1200 Subject: [PATCH 4/4] Fix the span for tuple expressions --- src/libsyntax/parse/parser.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index a3dd77b8197dc..7cc21105102ac 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -1972,7 +1972,7 @@ impl<'a> Parser<'a> { } try!(self.bump()); - hi = self.span.hi; + hi = self.last_span.hi; return if es.len() == 1 && !trailing_comma { Ok(self.mk_expr(lo, hi, ExprParen(es.into_iter().nth(0).unwrap()))) } else {