Rollup of 3 pull requests#25560

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.

Sign up for GitHub

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

Merged
bors merged 6 commits into from
May 18, 2015
Merged

Rollup of 3 pull requests #25560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
09a473e
Fix typo in references-and-borrowing docs
chellmuth May 17, 2015
82447cf
Fix doc whitespace issues
peferron May 17, 2015
e70c858
Revert "Panic if the grammar verifier sees a token it doesn't recognize"
carols10cents May 16, 2015
6f2a069
Rollup merge of #25526 - chellmuth:patch-1, r=alexcrichton
Manishearth May 18, 2015
2520277
Rollup merge of #25530 - peferron:doc-closures-whitespace-fix, r=alex…
Manishearth May 18, 2015
5ed02b5
Rollup merge of #25537 - carols10cents:grammar-oops, r=alexcrichton
Manishearth May 18, 2015
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
12 changes: 6 additions & 6 deletions src/doc/trpl/closures.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,9 +54,9 @@ The second is that the syntax is similar, but a bit different. I’ve added spac
here to make them look a little closer:

```rust
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
```

Small differences, but they’re similar in ways.
Expand DownExpand Up@@ -136,7 +136,7 @@ This gives us:
note: `nums` moved into closure environment here because it has type
`[closure(()) -> collections::vec::Vec<i32>]`, which is non-copyable
let takes_nums = || nums;
^~~~~~~
^~~~~~~
```

`Vec<T>` has ownership over its contents, and therefore, when we refer to it
Expand DownExpand Up@@ -352,8 +352,8 @@ error: the trait `core::marker::Sized` is not implemented for the type
factory() -> (Fn(i32) -> Vec<i32>) {
^~~~~~~~~~~~~~~~~~~~~
note: `core::ops::Fn(i32) -> collections::vec::Vec<i32>` does not have a constant size known at compile-time
fa ctory() -> (Fn(i32) -> Vec<i32>) {
^~~~~~~~~~~~~~~~~~~~~
factory() -> (Fn(i32) -> Vec<i32>) {
^~~~~~~~~~~~~~~~~~~~~

```

Expand Down
2 changes: 1 addition & 1 deletion src/doc/trpl/references-and-borrowing.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,7 @@ We can’t modify `v` because it’s borrowed by the loop.
References must live as long as the resource they refer to. Rust will check the
scopes of your references to ensure that this is true.

If Rust didn’t check that this property, we could accidentally use a reference
If Rust didn’t check this property, we could accidentally use a reference
which was invalid. For example:

```rust,ignore
Expand Down
2 changes: 1 addition & 1 deletion src/grammar/verify.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
"LIT_BINARY_RAW" => token::Literal(token::BinaryRaw(Name(0), 0), None),
"QUESTION" => token::Question,
"SHEBANG" => token::Shebang(Name(0)),
_ => panic!("Bad token str `{}`", val),
_ => continue,
};

res.insert(num.to_string(), tok);
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Rollup of 3 pull requests#25560

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.

 Sign up for GitHub

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

 Merged

bors
merged 6 commits into

from

May 18, 2015
 Merged


Rollup of 3 pull requests
#25560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
09a473e

Fix typo in references-and-borrowing docs


chellmuth May 17, 2015
82447cf

Fix doc whitespace issues


peferron May 17, 2015
e70c858

Revert "Panic if the grammar verifier sees a token it doesn't recognize"


carols10cents May 16, 2015
6f2a069

Rollup merge of #25526 - chellmuth:patch-1, r=alexcrichton


Manishearth May 18, 2015
2520277

Rollup merge of #25530 - peferron:doc-closures-whitespace-fix, r=alex…


Manishearth May 18, 2015
5ed02b5

Rollup merge of #25537 - carols10cents:grammar-oops, r=alexcrichton


Manishearth May 18, 2015

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


12 changes: 6 additions & 6 deletions
src/doc/trpl/closures.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,9 +54,9 @@ The second is that the syntax is similar, but a bit different. I’ve added spac
here to make them look a little closer:

```rust
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
```

Small differences, but they’re similar in ways.
Expand DownExpand Up@@ -136,7 +136,7 @@ This gives us:
note: `nums` moved into closure environment here because it has type
 `[closure(()) -> collections::vec::Vec<i32>]`, which is non-copyable
let takes_nums = || nums;
^~~~~~~
 ^~~~~~~
```

`Vec<T>` has ownership over its contents, and therefore, when we refer to it
Expand DownExpand Up@@ -352,8 +352,8 @@ error: the trait `core::marker::Sized` is not implemented for the type
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~
note: `core::ops::Fn(i32) -> collections::vec::Vec<i32>` does not have a constant size known at compile-time
fa ctory() -> (Fn(i32) -> Vec<i32>) {
^~~~~~~~~~~~~~~~~~~~~
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~

```

Expand Down

2 changes: 1 addition & 1 deletion
src/doc/trpl/references-and-borrowing.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,7 @@ We can’t modify `v` because it’s borrowed by the loop.
References must live as long as the resource they refer to. Rust will check the
scopes of your references to ensure that this is true.

If Rust didn’t check that this property, we could accidentally use a reference
If Rust didn’t check this property, we could accidentally use a reference
which was invalid. For example:

```rust,ignore
Expand Down

2 changes: 1 addition & 1 deletion
src/grammar/verify.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
 "LIT_BINARY_RAW" => token::Literal(token::BinaryRaw(Name(0), 0), None),
 "QUESTION" => token::Question,
 "SHEBANG" => token::Shebang(Name(0)),
 _ => panic!("Bad token str `{}`", val),
 _ => continue,
 };

 res.insert(num.to_string(), tok);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rollup of 3 pull requests#25560

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.

 Sign up for GitHub

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

 Merged

bors
merged 6 commits into

from

May 18, 2015
 Merged


Rollup of 3 pull requests
#25560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
09a473e

Fix typo in references-and-borrowing docs


chellmuth May 17, 2015
82447cf

Fix doc whitespace issues


peferron May 17, 2015
e70c858

Revert "Panic if the grammar verifier sees a token it doesn't recognize"


carols10cents May 16, 2015
6f2a069

Rollup merge of #25526 - chellmuth:patch-1, r=alexcrichton


Manishearth May 18, 2015
2520277

Rollup merge of #25530 - peferron:doc-closures-whitespace-fix, r=alex…


Manishearth May 18, 2015
5ed02b5

Rollup merge of #25537 - carols10cents:grammar-oops, r=alexcrichton


Manishearth May 18, 2015

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


12 changes: 6 additions & 6 deletions
src/doc/trpl/closures.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,9 +54,9 @@ The second is that the syntax is similar, but a bit different. I’ve added spac
here to make them look a little closer:

```rust
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
```

Small differences, but they’re similar in ways.
Expand DownExpand Up@@ -136,7 +136,7 @@ This gives us:
note: `nums` moved into closure environment here because it has type
 `[closure(()) -> collections::vec::Vec<i32>]`, which is non-copyable
let takes_nums = || nums;
^~~~~~~
 ^~~~~~~
```

`Vec<T>` has ownership over its contents, and therefore, when we refer to it
Expand DownExpand Up@@ -352,8 +352,8 @@ error: the trait `core::marker::Sized` is not implemented for the type
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~
note: `core::ops::Fn(i32) -> collections::vec::Vec<i32>` does not have a constant size known at compile-time
fa ctory() -> (Fn(i32) -> Vec<i32>) {
^~~~~~~~~~~~~~~~~~~~~
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~

```

Expand Down

2 changes: 1 addition & 1 deletion
src/doc/trpl/references-and-borrowing.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,7 @@ We can’t modify `v` because it’s borrowed by the loop.
References must live as long as the resource they refer to. Rust will check the
scopes of your references to ensure that this is true.

If Rust didn’t check that this property, we could accidentally use a reference
If Rust didn’t check this property, we could accidentally use a reference
which was invalid. For example:

```rust,ignore
Expand Down

2 changes: 1 addition & 1 deletion
src/grammar/verify.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
 "LIT_BINARY_RAW" => token::Literal(token::BinaryRaw(Name(0), 0), None),
 "QUESTION" => token::Question,
 "SHEBANG" => token::Shebang(Name(0)),
 _ => panic!("Bad token str `{}`", val),
 _ => continue,
 };

 res.insert(num.to_string(), tok);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rollup of 3 pull requests#25560

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.

 Sign up for GitHub

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

 Merged

bors
merged 6 commits into

from

May 18, 2015
 Merged


Rollup of 3 pull requests
#25560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
09a473e

Fix typo in references-and-borrowing docs


chellmuth May 17, 2015
82447cf

Fix doc whitespace issues


peferron May 17, 2015
e70c858

Revert "Panic if the grammar verifier sees a token it doesn't recognize"


carols10cents May 16, 2015
6f2a069

Rollup merge of #25526 - chellmuth:patch-1, r=alexcrichton


Manishearth May 18, 2015
2520277

Rollup merge of #25530 - peferron:doc-closures-whitespace-fix, r=alex…


Manishearth May 18, 2015
5ed02b5

Rollup merge of #25537 - carols10cents:grammar-oops, r=alexcrichton


Manishearth May 18, 2015

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


12 changes: 6 additions & 6 deletions
src/doc/trpl/closures.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,9 +54,9 @@ The second is that the syntax is similar, but a bit different. I’ve added spac
here to make them look a little closer:

```rust
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
```

Small differences, but they’re similar in ways.
Expand DownExpand Up@@ -136,7 +136,7 @@ This gives us:
note: `nums` moved into closure environment here because it has type
 `[closure(()) -> collections::vec::Vec<i32>]`, which is non-copyable
let takes_nums = || nums;
^~~~~~~
 ^~~~~~~
```

`Vec<T>` has ownership over its contents, and therefore, when we refer to it
Expand DownExpand Up@@ -352,8 +352,8 @@ error: the trait `core::marker::Sized` is not implemented for the type
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~
note: `core::ops::Fn(i32) -> collections::vec::Vec<i32>` does not have a constant size known at compile-time
fa ctory() -> (Fn(i32) -> Vec<i32>) {
^~~~~~~~~~~~~~~~~~~~~
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~

```

Expand Down

2 changes: 1 addition & 1 deletion
src/doc/trpl/references-and-borrowing.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,7 @@ We can’t modify `v` because it’s borrowed by the loop.
References must live as long as the resource they refer to. Rust will check the
scopes of your references to ensure that this is true.

If Rust didn’t check that this property, we could accidentally use a reference
If Rust didn’t check this property, we could accidentally use a reference
which was invalid. For example:

```rust,ignore
Expand Down

2 changes: 1 addition & 1 deletion
src/grammar/verify.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
 "LIT_BINARY_RAW" => token::Literal(token::BinaryRaw(Name(0), 0), None),
 "QUESTION" => token::Question,
 "SHEBANG" => token::Shebang(Name(0)),
 _ => panic!("Bad token str `{}`", val),
 _ => continue,
 };

 res.insert(num.to_string(), tok);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Rollup of 3 pull requests#25560

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.

 Sign up for GitHub

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

 Merged

bors
merged 6 commits into

from

May 18, 2015
 Merged


Rollup of 3 pull requests
#25560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
09a473e

Fix typo in references-and-borrowing docs


chellmuth May 17, 2015
82447cf

Fix doc whitespace issues


peferron May 17, 2015
e70c858

Revert "Panic if the grammar verifier sees a token it doesn't recognize"


carols10cents May 16, 2015
6f2a069

Rollup merge of #25526 - chellmuth:patch-1, r=alexcrichton


Manishearth May 18, 2015
2520277

Rollup merge of #25530 - peferron:doc-closures-whitespace-fix, r=alex…


Manishearth May 18, 2015
5ed02b5

Rollup merge of #25537 - carols10cents:grammar-oops, r=alexcrichton


Manishearth May 18, 2015

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


12 changes: 6 additions & 6 deletions
src/doc/trpl/closures.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,9 +54,9 @@ The second is that the syntax is similar, but a bit different. I’ve added spac
here to make them look a little closer:

```rust
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
```

Small differences, but they’re similar in ways.
Expand DownExpand Up@@ -136,7 +136,7 @@ This gives us:
note: `nums` moved into closure environment here because it has type
 `[closure(()) -> collections::vec::Vec<i32>]`, which is non-copyable
let takes_nums = || nums;
^~~~~~~
 ^~~~~~~
```

`Vec<T>` has ownership over its contents, and therefore, when we refer to it
Expand DownExpand Up@@ -352,8 +352,8 @@ error: the trait `core::marker::Sized` is not implemented for the type
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~
note: `core::ops::Fn(i32) -> collections::vec::Vec<i32>` does not have a constant size known at compile-time
fa ctory() -> (Fn(i32) -> Vec<i32>) {
^~~~~~~~~~~~~~~~~~~~~
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~

```

Expand Down

2 changes: 1 addition & 1 deletion
src/doc/trpl/references-and-borrowing.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,7 @@ We can’t modify `v` because it’s borrowed by the loop.
References must live as long as the resource they refer to. Rust will check the
scopes of your references to ensure that this is true.

If Rust didn’t check that this property, we could accidentally use a reference
If Rust didn’t check this property, we could accidentally use a reference
which was invalid. For example:

```rust,ignore
Expand Down

2 changes: 1 addition & 1 deletion
src/grammar/verify.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
 "LIT_BINARY_RAW" => token::Literal(token::BinaryRaw(Name(0), 0), None),
 "QUESTION" => token::Question,
 "SHEBANG" => token::Shebang(Name(0)),
 _ => panic!("Bad token str `{}`", val),
 _ => continue,
 };

 res.insert(num.to_string(), tok);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rollup of 3 pull requests#25560

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.

 Sign up for GitHub

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

 Merged

bors
merged 6 commits into

from

May 18, 2015
 Merged


Rollup of 3 pull requests
#25560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
09a473e

Fix typo in references-and-borrowing docs


chellmuth May 17, 2015
82447cf

Fix doc whitespace issues


peferron May 17, 2015
e70c858

Revert "Panic if the grammar verifier sees a token it doesn't recognize"


carols10cents May 16, 2015
6f2a069

Rollup merge of #25526 - chellmuth:patch-1, r=alexcrichton


Manishearth May 18, 2015
2520277

Rollup merge of #25530 - peferron:doc-closures-whitespace-fix, r=alex…


Manishearth May 18, 2015
5ed02b5

Rollup merge of #25537 - carols10cents:grammar-oops, r=alexcrichton


Manishearth May 18, 2015

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


12 changes: 6 additions & 6 deletions
src/doc/trpl/closures.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,9 +54,9 @@ The second is that the syntax is similar, but a bit different. I’ve added spac
here to make them look a little closer:

```rust
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
```

Small differences, but they’re similar in ways.
Expand DownExpand Up@@ -136,7 +136,7 @@ This gives us:
note: `nums` moved into closure environment here because it has type
 `[closure(()) -> collections::vec::Vec<i32>]`, which is non-copyable
let takes_nums = || nums;
^~~~~~~
 ^~~~~~~
```

`Vec<T>` has ownership over its contents, and therefore, when we refer to it
Expand DownExpand Up@@ -352,8 +352,8 @@ error: the trait `core::marker::Sized` is not implemented for the type
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~
note: `core::ops::Fn(i32) -> collections::vec::Vec<i32>` does not have a constant size known at compile-time
fa ctory() -> (Fn(i32) -> Vec<i32>) {
^~~~~~~~~~~~~~~~~~~~~
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~

```

Expand Down

2 changes: 1 addition & 1 deletion
src/doc/trpl/references-and-borrowing.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,7 @@ We can’t modify `v` because it’s borrowed by the loop.
References must live as long as the resource they refer to. Rust will check the
scopes of your references to ensure that this is true.

If Rust didn’t check that this property, we could accidentally use a reference
If Rust didn’t check this property, we could accidentally use a reference
which was invalid. For example:

```rust,ignore
Expand Down

2 changes: 1 addition & 1 deletion
src/grammar/verify.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
 "LIT_BINARY_RAW" => token::Literal(token::BinaryRaw(Name(0), 0), None),
 "QUESTION" => token::Question,
 "SHEBANG" => token::Shebang(Name(0)),
 _ => panic!("Bad token str `{}`", val),
 _ => continue,
 };

 res.insert(num.to_string(), tok);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Rollup of 3 pull requests#25560

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.

 Sign up for GitHub

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

 Merged

bors
merged 6 commits into

from

May 18, 2015
 Merged


Rollup of 3 pull requests
#25560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
09a473e

Fix typo in references-and-borrowing docs


chellmuth May 17, 2015
82447cf

Fix doc whitespace issues


peferron May 17, 2015
e70c858

Revert "Panic if the grammar verifier sees a token it doesn't recognize"


carols10cents May 16, 2015
6f2a069

Rollup merge of #25526 - chellmuth:patch-1, r=alexcrichton


Manishearth May 18, 2015
2520277

Rollup merge of #25530 - peferron:doc-closures-whitespace-fix, r=alex…


Manishearth May 18, 2015
5ed02b5

Rollup merge of #25537 - carols10cents:grammar-oops, r=alexcrichton


Manishearth May 18, 2015

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


12 changes: 6 additions & 6 deletions
src/doc/trpl/closures.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,9 +54,9 @@ The second is that the syntax is similar, but a bit different. I’ve added spac
here to make them look a little closer:

```rust
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
```

Small differences, but they’re similar in ways.
Expand DownExpand Up@@ -136,7 +136,7 @@ This gives us:
note: `nums` moved into closure environment here because it has type
 `[closure(()) -> collections::vec::Vec<i32>]`, which is non-copyable
let takes_nums = || nums;
^~~~~~~
 ^~~~~~~
```

`Vec<T>` has ownership over its contents, and therefore, when we refer to it
Expand DownExpand Up@@ -352,8 +352,8 @@ error: the trait `core::marker::Sized` is not implemented for the type
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~
note: `core::ops::Fn(i32) -> collections::vec::Vec<i32>` does not have a constant size known at compile-time
fa ctory() -> (Fn(i32) -> Vec<i32>) {
^~~~~~~~~~~~~~~~~~~~~
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~

```

Expand Down

2 changes: 1 addition & 1 deletion
src/doc/trpl/references-and-borrowing.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,7 @@ We can’t modify `v` because it’s borrowed by the loop.
References must live as long as the resource they refer to. Rust will check the
scopes of your references to ensure that this is true.

If Rust didn’t check that this property, we could accidentally use a reference
If Rust didn’t check this property, we could accidentally use a reference
which was invalid. For example:

```rust,ignore
Expand Down

2 changes: 1 addition & 1 deletion
src/grammar/verify.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
 "LIT_BINARY_RAW" => token::Literal(token::BinaryRaw(Name(0), 0), None),
 "QUESTION" => token::Question,
 "SHEBANG" => token::Shebang(Name(0)),
 _ => panic!("Bad token str `{}`", val),
 _ => continue,
 };

 res.insert(num.to_string(), tok);
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Rollup of 3 pull requests#25560

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.

 Sign up for GitHub

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

 Merged

bors
merged 6 commits into

from

May 18, 2015
 Merged


Rollup of 3 pull requests
#25560
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
09a473e

Fix typo in references-and-borrowing docs


chellmuth May 17, 2015
82447cf

Fix doc whitespace issues


peferron May 17, 2015
e70c858

Revert "Panic if the grammar verifier sees a token it doesn't recognize"


carols10cents May 16, 2015
6f2a069

Rollup merge of #25526 - chellmuth:patch-1, r=alexcrichton


Manishearth May 18, 2015
2520277

Rollup merge of #25530 - peferron:doc-closures-whitespace-fix, r=alex…


Manishearth May 18, 2015
5ed02b5

Rollup merge of #25537 - carols10cents:grammar-oops, r=alexcrichton


Manishearth May 18, 2015

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


12 changes: 6 additions & 6 deletions
src/doc/trpl/closures.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,9 +54,9 @@ The second is that the syntax is similar, but a bit different. I’ve added spac
here to make them look a little closer:

```rust
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
fn plus_one_v1 (x: i32) -> i32 { x + 1 }
let plus_one_v2 = |x: i32| -> i32 { x + 1 };
let plus_one_v3 = |x: i32| x + 1 ;
```

Small differences, but they’re similar in ways.
Expand DownExpand Up@@ -136,7 +136,7 @@ This gives us:
note: `nums` moved into closure environment here because it has type
 `[closure(()) -> collections::vec::Vec<i32>]`, which is non-copyable
let takes_nums = || nums;
^~~~~~~
 ^~~~~~~
```

`Vec<T>` has ownership over its contents, and therefore, when we refer to it
Expand DownExpand Up@@ -352,8 +352,8 @@ error: the trait `core::marker::Sized` is not implemented for the type
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~
note: `core::ops::Fn(i32) -> collections::vec::Vec<i32>` does not have a constant size known at compile-time
fa ctory() -> (Fn(i32) -> Vec<i32>) {
^~~~~~~~~~~~~~~~~~~~~
factory() -> (Fn(i32) -> Vec<i32>) {
 ^~~~~~~~~~~~~~~~~~~~~

```

Expand Down

2 changes: 1 addition & 1 deletion
src/doc/trpl/references-and-borrowing.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -297,7 +297,7 @@ We can’t modify `v` because it’s borrowed by the loop.
References must live as long as the resource they refer to. Rust will check the
scopes of your references to ensure that this is true.

If Rust didn’t check that this property, we could accidentally use a reference
If Rust didn’t check this property, we could accidentally use a reference
which was invalid. For example:

```rust,ignore
Expand Down

2 changes: 1 addition & 1 deletion
src/grammar/verify.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,7 @@ fn parse_token_list(file: &str) -> HashMap<String, token::Token> {
 "LIT_BINARY_RAW" => token::Literal(token::BinaryRaw(Name(0), 0), None),
 "QUESTION" => token::Question,
 "SHEBANG" => token::Shebang(Name(0)),
 _ => panic!("Bad token str `{}`", val),
 _ => continue,
 };

 res.insert(num.to_string(), tok);
Expand Down