Skip to content

Rollup of 7 pull requests #27098

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 17 commits into from
Jul 17, 2015
Merged

Rollup of 7 pull requests #27098

merged 17 commits into from
Jul 17, 2015

Conversation

Manishearth
Copy link
Member

barosl and others added 9 commits July 10, 2015 01:30
@barosl
Preserve escape sequences in documentation comments on macro expansion
5c60d1d 
Escape sequences in documentation comments must not be parsed as a
normal string when expanding a macro, otherwise some innocent but
invalid-escape-sequence-looking comments will trigger an ICE.

Although this commit replaces normal string literals with raw string
literals in macro expansion, this shouldn't be much a problem
considering documentation comments are converted into attributes before
being passed to a macro anyways.

Fixes rust-lang#25929.
Fixes rust-lang#25943.
@nikomatsakis
Transition to the new object lifetime defaults, replacing the old
de6b3c2 
defaults completely.
@GuillaumeGomez
Improve register_diagnostics macro
a5d8c43
@rick68
Update vec.rs
1070231 
improve the 'Unsafety' section of `collections::vec::Vec::<T>::from_raw_parts`.
@GuillaumeGomez
Improve register_long_diagnostics macro
6e58043
@steveklabnik
Clean up some wording around globs.
d0e1b06 
Globs used to be a feature you'd turn on, but now they're not, so this sounds
a bit odd.
@tamird
DRY
b3a9cd3
@bors
Auto merge of rust-lang#27045 - nikomatsakis:better-object-defaults-e…
e05ac39 
…rror, r=pnkfelix

Transition to the new object lifetime defaults, replacing the old defaults completely.

r? @pnkfelix 

This is a [breaking-change] as specified by [RFC 1156][1156] (though all cases that would break should have been receiving warnings starting in Rust 1.2). Types like `&'a Box<Trait>` (or `&'a Rc<Trait>`, etc) will change from being interpreted as `&'a Box<Trait+'a>` to `&'a Box<Trait+'static>`. To restore the old behavior, write the `+'a` explicitly. For example, the function:


```rust
trait Trait { }
fn foo(x: &Box<Trait>) { ... }
```

would be rewritten as:

```rust
trait Trait { }
fn foo(x: &'a Box<Trait+'a>) { ... }
```

if one wanted to preserve the current typing.

[1156]: https://github.com/rust-lang/rfcs/blob/master/text/1156-adjust-default-object-bounds.md
@tshepang
doc: add missing space
02ae661
@rust-highfive
Copy link
Contributor

r? @brson

(rust_highfive has picked a reviewer for you, use r? to override)

@Manishearth
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Jul 17, 2015

📌 Commit 1f0564b has been approved by Manishearth

@Manishearth
Copy link
Member Author

@bors r+ p=10

@bors
Copy link
Collaborator

bors commented Jul 17, 2015

📌 Commit 8638dc7 has been approved by Manishearth

@bors
Copy link
Collaborator

bors commented Jul 17, 2015

⌛ Testing commit 8638dc7 with merge 5df259b...

bors added a commit that referenced this pull request Jul 17, 2015
@bors
Auto merge of #27098 - Manishearth:rollup, r=Manishearth
5df259b 
- Successful merges: #26777, #27067, #27071, #27081, #27091, #27094, #27095
- Failed merges:
@bors
Copy link
Collaborator

bors commented Jul 17, 2015

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-x-android-t, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt

@bors bors merged commit 8638dc7 into rust-lang:master Jul 17, 2015
This was referenced Jul 18, 2015
Merged
Merged
@Manishearth Manishearth deleted the rollup branch July 18, 2015 00:04
@Manishearth
Rollup merge of rust-lang#26777 - barosl:macro-doc-escapes, r=pnkfelix
22aa163 
Escape sequences in documentation comments must not be parsed as a normal string when expanding a macro, otherwise some innocent but invalid-escape-sequence-looking comments will trigger an ICE.

Although this commit replaces normal string literals with raw string literals in macro expansion, this shouldn't be much a problem considering documentation comments are converted into attributes before being passed to a macro anyways.

Fixes rust-lang#25929.
Fixes rust-lang#25943.
@Manishearth
Rollup merge of rust-lang#27067 - GuillaumeGomez:patch-1, r=cmr
1cf11cc 
Now the macro argument list can be finished by a comma (not sure this is correct english...).

cc @tamird
r? @bluss
@Manishearth
Rollup merge of rust-lang#27071 - AlisdairO:diagnostics, r=Manishearth
00653da 
Added some detailed diagnostics for E0364 and E0365.
@Manishearth
Rollup merge of rust-lang#27081 - rick68:patch-15, r=alexcrichton
2ea8778 
improve the 'Unsafety' section of `collections::vec::Vec::<T>::from_raw_parts`.
@Manishearth
Rollup merge of rust-lang#27091 - steveklabnik:doc_tests_glob, r=Gankro
99987a8 
Globs used to be a feature you'd turn on, but now they're not, so this sounds
a bit odd.
@Manishearth
Rollup merge of rust-lang#27094 - tamird:DRY-search-focus, r=brson
fdc39cd 
Following up on comment from rust-lang#26977.

r? @brson
@Manishearth
Rollup merge of rust-lang#27095 - tshepang:space, r=alexcrichton
1f0564b
@Manishearth
nit
8638dc7
@GuillaumeGomez GuillaumeGomez mentioned this pull request Jul 20, 2015
Closed
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
rollup A PR which is a rollup
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.