Skip to content

Commit c2b9b5c

Browse files
committed
Auto merge of #24453 - Manishearth:rollup, r=Manishearth
- Successful merges: #24425, #24435, #24436, #24438, #24448 - Failed merges:
2 parents a691f1e + 5a4835a commit c2b9b5c

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/doc/trpl/no-stdlib.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ necessary functionality for writing idiomatic and effective Rust code.
103103
As an example, here is a program that will calculate the dot product of two
104104
vectors provided from C, using idiomatic Rust practices.
105105

106-
```
106+
```ignore
107107
#![feature(lang_items, start, no_std, core, libc)]
108108
#![no_std]
109109

src/libcore/ptr.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
//! Working with unsafe pointers in Rust is uncommon,
1616
//! typically limited to a few patterns.
1717
//!
18-
//! Use the [`null` function](fn.null.html) to create null pointers, and
19-
//! the `is_null` method of the `*const T` type to check for null.
20-
//! The `*const T` type also defines the `offset` method, for pointer math.
18+
//! Use the `null` function to create null pointers, and the `is_null` method
19+
//! of the `*const T` type to check for null. The `*const T` type also defines
20+
//! the `offset` method, for pointer math.
2121
//!
2222
//! # Common ways to create unsafe pointers
2323
//!

src/libsyntax/feature_gate.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ impl<'a> Context<'a> {
399399
} else {
400400
self.gate_feature("custom_attribute", attr.span,
401401
&format!("The attribute `{}` is currently \
402-
unknown to the the compiler and \
402+
unknown to the compiler and \
403403
may have meaning \
404404
added to it in the future",
405405
name));

src/libsyntax/parse/parser.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1972,7 +1972,7 @@ impl<'a> Parser<'a> {
19721972
}
19731973
try!(self.bump());
19741974

1975-
hi = self.span.hi;
1975+
hi = self.last_span.hi;
19761976
return if es.len() == 1 && !trailing_comma {
19771977
Ok(self.mk_expr(lo, hi, ExprParen(es.into_iter().nth(0).unwrap())))
19781978
} else {

0 commit comments

Comments
 (0)