Skip to content

Rollup of 3 pull requests - #25560

Merged
bors merged 6 commits into
rust-lang:masterfrom
Manishearth:rollup
May 18, 2015
Merged

Rollup of 3 pull requests#25560
bors merged 6 commits into
rust-lang:masterfrom
Manishearth:rollup

Conversation

@Manishearth

@ManishearthManishearth commented May 18, 2015

Copy link
Copy Markdown
Member

chellmuthand others added 6 commits May 17, 2015 00:19
@chellmuth
Fix typo in references-and-borrowing docs
09a473e
@peferron
Fix doc whitespace issues
82447cf
@carols10cents
Revert "Panic if the grammar verifier sees a token it doesn't recognize"
e70c858
This reverts commit 9c7d5ae.
This was wrong... the `continue` was to ignore the latter half of the
tokens file. Another mechanism will have to be used to keep the model
grammar's tokens in sync with the actual grammar's tokens :-/
@Manishearth
Rollup merge ofrust-lang#25526- chellmuth:patch-1, r=alexcrichton
6f2a069
@Manishearth
Rollup merge ofrust-lang#25530- peferron:doc-closures-whitespace-fi…
2520277
…x, r=alexcrichton
Tiny fixes collected while reading through the Rust book. If they're too nitpicky please let me know and I'll ignore the next ones. :)
The spaces after the function and closure arguments might be intentional, but they do not make much sense: the usual formatting doesn't have such spaces, and they aren't helping align the three lines together either.
r? @steveklabnik (as suggested by [CONTRIBUTING.md](https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md))
@Manishearth
Rollup merge ofrust-lang#25537- carols10cents:grammar-oops, r=alexc…
5ed02b5
…richton
Hiiii soooo I'm trying to get the reference grammar and associated tests running again, and I swear I tested before but I must have had multiple things going on when I did, because the change I made in rust-lang#25137 to verify.rs is totally wrong. The RustLexer.tokens file that antlr generates has two sections:
```
EQ=1
LT=2
LE=3
EQEQ=4
NE=5
...
COMMENT=56
SHEBANG=57
UTF8_BOM=58
'='=1
'<'=2
'<='=3
'=='=4
...
```
and verify.rs is only interested in the first half-- the `continue` is to ignore the second half. In 9c7d5ae, I made it panic instead. I was trying to make sure verify.rs handled everything that might happen in the first half and complain if it didn't. That would mean the reference grammar was out of sync with at least verify.rs, if not the real grammar. But it's totally ok for verify.rs to not handle the entire second half of the file.
I'm sorry for breaking this :( Good thing these tests aren't being run regularly yet...? 😳
@Manishearth

Manishearth commented May 18, 2015

Copy link
Copy Markdown
MemberAuthor

@bors: r+ force p=10

@bors

bors commented May 18, 2015

Copy link
Copy Markdown
Collaborator

📌 Commit 5ed02b5 has been approved by Manishearth

@rust-highfive

rust-highfive commented May 18, 2015

Copy link
Copy Markdown
Contributor

r? @brson

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

@bors

bors commented May 18, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5ed02b5 with merge eb2bbb0...

@bors

bors commented May 18, 2015

Copy link
Copy Markdown
Collaborator

💔 Test failed - auto-linux-64-nopt-t

@Manishearth

Manishearth commented May 18, 2015

Copy link
Copy Markdown
MemberAuthor

@bors: retry

@Manishearth

Manishearth commented May 18, 2015

Copy link
Copy Markdown
MemberAuthor

@bors: force

bors added a commit that referenced this pull request May 18, 2015
@bors
Auto merge of#25560- Manishearth:rollup, r=Manishearth
84b1e08
- Successful merges: #25526, #25530, #25537
- Failed merges:
@bors

bors commented May 18, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 5ed02b5 with merge 84b1e08...

@bors

bors commented May 18, 2015

Copy link
Copy Markdown
Collaborator

☀️ 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-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt

@bors
bors merged commit 5ed02b5 into rust-lang:masterMay 18, 2015
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

rollupA PR which is a rollup

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@Manishearth@bors@rust-highfive@brson@Centril@chellmuth@peferron@carols10cents
, '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" + '
Rollup of 3 pull requests by Manishearth · Pull Request #25560 · rust-lang/rust · GitHub
Skip to content
Rollup of 3 pull requests - #25560
Merged
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
May 18, 2015
Merged
Rollup of 3 pull requests#25560
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
Conversation
@Manishearth
@ManishearthManishearth
commented
May 18, 2015

Copy link


Copy Markdown

Member
chellmuthand others
added 6 commits
May 17, 2015 00:19
@chellmuth
Fix typo in references-and-borrowing docs
09a473e
@peferron
Fix doc whitespace issues
82447cf
@carols10cents
Revert "Panic if the grammar verifier sees a token it doesn't recognize"
e70c858
This reverts commit 9c7d5ae.
This was wrong... the `continue` was to ignore the latter half of the
tokens file. Another mechanism will have to be used to keep the model
grammar's tokens in sync with the actual grammar's tokens :-/
@Manishearth
Rollup merge ofrust-lang#25526- chellmuth:patch-1, r=alexcrichton
6f2a069
@Manishearth
Rollup merge ofrust-lang#25530- peferron:doc-closures-whitespace-fi…
2520277
…x, r=alexcrichton
Tiny fixes collected while reading through the Rust book. If they're too nitpicky please let me know and I'll ignore the next ones. :)
The spaces after the function and closure arguments might be intentional, but they do not make much sense: the usual formatting doesn't have such spaces, and they aren't helping align the three lines together either.
r? @steveklabnik (as suggested by [CONTRIBUTING.md](https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md))
@Manishearth
Rollup merge ofrust-lang#25537- carols10cents:grammar-oops, r=alexc…
5ed02b5
…richton
Hiiii soooo I'm trying to get the reference grammar and associated tests running again, and I swear I tested before but I must have had multiple things going on when I did, because the change I made in rust-lang#25137 to verify.rs is totally wrong. The RustLexer.tokens file that antlr generates has two sections:
```
EQ=1
LT=2
LE=3
EQEQ=4
NE=5
...
COMMENT=56
SHEBANG=57
UTF8_BOM=58
'='=1
'<'=2
'<='=3
'=='=4
...
```
and verify.rs is only interested in the first half-- the `continue` is to ignore the second half. In 9c7d5ae, I made it panic instead. I was trying to make sure verify.rs handled everything that might happen in the first half and complain if it didn't. That would mean the reference grammar was out of sync with at least verify.rs, if not the real grammar. But it's totally ok for verify.rs to not handle the entire second half of the file.
I'm sorry for breaking this :( Good thing these tests aren't being run regularly yet...? 😳
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: r+ force p=10
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
📌 Commit 5ed02b5 has been approved by Manishearth
@rust-highfive
rust-highfive
commented
May 18, 2015

Copy link


Copy Markdown

Contributor
r? @brson
(rust_highfive has picked a reviewer for you, use r? to override)
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge eb2bbb0...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
💔 Test failed - auto-linux-64-nopt-t
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: retry
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: force
bors added a commit
that referenced
this pull request
May 18, 2015
@bors
Auto merge of#25560- Manishearth:rollup, r=Manishearth
84b1e08
- Successful merges: #25526, #25530, #25537
- Failed merges:
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge 84b1e08...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
☀️ 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-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt
@bors
bors
merged commit 5ed02b5
into
rust-lang:masterMay 18, 2015
@CentrilCentril
added
the 
rollup
A PR which is a rollup
label
Oct 2, 2019
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

rollupA PR which is a rollup

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@Manishearth@bors@rust-highfive@brson@Centril@chellmuth@peferron@carols10cents

, '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('^' + ".*" + '
Rollup of 3 pull requests by Manishearth · Pull Request #25560 · rust-lang/rust · GitHub
Skip to content
Rollup of 3 pull requests - #25560
Merged
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
May 18, 2015
Merged
Rollup of 3 pull requests#25560
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
Conversation
@Manishearth
@ManishearthManishearth
commented
May 18, 2015

Copy link


Copy Markdown

Member
chellmuthand others
added 6 commits
May 17, 2015 00:19
@chellmuth
Fix typo in references-and-borrowing docs
09a473e
@peferron
Fix doc whitespace issues
82447cf
@carols10cents
Revert "Panic if the grammar verifier sees a token it doesn't recognize"
e70c858
This reverts commit 9c7d5ae.
This was wrong... the `continue` was to ignore the latter half of the
tokens file. Another mechanism will have to be used to keep the model
grammar's tokens in sync with the actual grammar's tokens :-/
@Manishearth
Rollup merge ofrust-lang#25526- chellmuth:patch-1, r=alexcrichton
6f2a069
@Manishearth
Rollup merge ofrust-lang#25530- peferron:doc-closures-whitespace-fi…
2520277
…x, r=alexcrichton
Tiny fixes collected while reading through the Rust book. If they're too nitpicky please let me know and I'll ignore the next ones. :)
The spaces after the function and closure arguments might be intentional, but they do not make much sense: the usual formatting doesn't have such spaces, and they aren't helping align the three lines together either.
r? @steveklabnik (as suggested by [CONTRIBUTING.md](https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md))
@Manishearth
Rollup merge ofrust-lang#25537- carols10cents:grammar-oops, r=alexc…
5ed02b5
…richton
Hiiii soooo I'm trying to get the reference grammar and associated tests running again, and I swear I tested before but I must have had multiple things going on when I did, because the change I made in rust-lang#25137 to verify.rs is totally wrong. The RustLexer.tokens file that antlr generates has two sections:
```
EQ=1
LT=2
LE=3
EQEQ=4
NE=5
...
COMMENT=56
SHEBANG=57
UTF8_BOM=58
'='=1
'<'=2
'<='=3
'=='=4
...
```
and verify.rs is only interested in the first half-- the `continue` is to ignore the second half. In 9c7d5ae, I made it panic instead. I was trying to make sure verify.rs handled everything that might happen in the first half and complain if it didn't. That would mean the reference grammar was out of sync with at least verify.rs, if not the real grammar. But it's totally ok for verify.rs to not handle the entire second half of the file.
I'm sorry for breaking this :( Good thing these tests aren't being run regularly yet...? 😳
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: r+ force p=10
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
📌 Commit 5ed02b5 has been approved by Manishearth
@rust-highfive
rust-highfive
commented
May 18, 2015

Copy link


Copy Markdown

Contributor
r? @brson
(rust_highfive has picked a reviewer for you, use r? to override)
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge eb2bbb0...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
💔 Test failed - auto-linux-64-nopt-t
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: retry
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: force
bors added a commit
that referenced
this pull request
May 18, 2015
@bors
Auto merge of#25560- Manishearth:rollup, r=Manishearth
84b1e08
- Successful merges: #25526, #25530, #25537
- Failed merges:
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge 84b1e08...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
☀️ 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-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt
@bors
bors
merged commit 5ed02b5
into
rust-lang:masterMay 18, 2015
@CentrilCentril
added
the 
rollup
A PR which is a rollup
label
Oct 2, 2019
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

rollupA PR which is a rollup

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@Manishearth@bors@rust-highfive@brson@Centril@chellmuth@peferron@carols10cents

, '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('^' + ".*" + '
Rollup of 3 pull requests by Manishearth · Pull Request #25560 · rust-lang/rust · GitHub
Skip to content
Rollup of 3 pull requests - #25560
Merged
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
May 18, 2015
Merged
Rollup of 3 pull requests#25560
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
Conversation
@Manishearth
@ManishearthManishearth
commented
May 18, 2015

Copy link


Copy Markdown

Member
chellmuthand others
added 6 commits
May 17, 2015 00:19
@chellmuth
Fix typo in references-and-borrowing docs
09a473e
@peferron
Fix doc whitespace issues
82447cf
@carols10cents
Revert "Panic if the grammar verifier sees a token it doesn't recognize"
e70c858
This reverts commit 9c7d5ae.
This was wrong... the `continue` was to ignore the latter half of the
tokens file. Another mechanism will have to be used to keep the model
grammar's tokens in sync with the actual grammar's tokens :-/
@Manishearth
Rollup merge ofrust-lang#25526- chellmuth:patch-1, r=alexcrichton
6f2a069
@Manishearth
Rollup merge ofrust-lang#25530- peferron:doc-closures-whitespace-fi…
2520277
…x, r=alexcrichton
Tiny fixes collected while reading through the Rust book. If they're too nitpicky please let me know and I'll ignore the next ones. :)
The spaces after the function and closure arguments might be intentional, but they do not make much sense: the usual formatting doesn't have such spaces, and they aren't helping align the three lines together either.
r? @steveklabnik (as suggested by [CONTRIBUTING.md](https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md))
@Manishearth
Rollup merge ofrust-lang#25537- carols10cents:grammar-oops, r=alexc…
5ed02b5
…richton
Hiiii soooo I'm trying to get the reference grammar and associated tests running again, and I swear I tested before but I must have had multiple things going on when I did, because the change I made in rust-lang#25137 to verify.rs is totally wrong. The RustLexer.tokens file that antlr generates has two sections:
```
EQ=1
LT=2
LE=3
EQEQ=4
NE=5
...
COMMENT=56
SHEBANG=57
UTF8_BOM=58
'='=1
'<'=2
'<='=3
'=='=4
...
```
and verify.rs is only interested in the first half-- the `continue` is to ignore the second half. In 9c7d5ae, I made it panic instead. I was trying to make sure verify.rs handled everything that might happen in the first half and complain if it didn't. That would mean the reference grammar was out of sync with at least verify.rs, if not the real grammar. But it's totally ok for verify.rs to not handle the entire second half of the file.
I'm sorry for breaking this :( Good thing these tests aren't being run regularly yet...? 😳
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: r+ force p=10
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
📌 Commit 5ed02b5 has been approved by Manishearth
@rust-highfive
rust-highfive
commented
May 18, 2015

Copy link


Copy Markdown

Contributor
r? @brson
(rust_highfive has picked a reviewer for you, use r? to override)
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge eb2bbb0...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
💔 Test failed - auto-linux-64-nopt-t
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: retry
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: force
bors added a commit
that referenced
this pull request
May 18, 2015
@bors
Auto merge of#25560- Manishearth:rollup, r=Manishearth
84b1e08
- Successful merges: #25526, #25530, #25537
- Failed merges:
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge 84b1e08...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
☀️ 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-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt
@bors
bors
merged commit 5ed02b5
into
rust-lang:masterMay 18, 2015
@CentrilCentril
added
the 
rollup
A PR which is a rollup
label
Oct 2, 2019
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

rollupA PR which is a rollup

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@Manishearth@bors@rust-highfive@brson@Centril@chellmuth@peferron@carols10cents

, '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" + '
Rollup of 3 pull requests by Manishearth · Pull Request #25560 · rust-lang/rust · GitHub
Skip to content
Rollup of 3 pull requests - #25560
Merged
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
May 18, 2015
Merged
Rollup of 3 pull requests#25560
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
Conversation
@Manishearth
@ManishearthManishearth
commented
May 18, 2015

Copy link


Copy Markdown

Member
chellmuthand others
added 6 commits
May 17, 2015 00:19
@chellmuth
Fix typo in references-and-borrowing docs
09a473e
@peferron
Fix doc whitespace issues
82447cf
@carols10cents
Revert "Panic if the grammar verifier sees a token it doesn't recognize"
e70c858
This reverts commit 9c7d5ae.
This was wrong... the `continue` was to ignore the latter half of the
tokens file. Another mechanism will have to be used to keep the model
grammar's tokens in sync with the actual grammar's tokens :-/
@Manishearth
Rollup merge ofrust-lang#25526- chellmuth:patch-1, r=alexcrichton
6f2a069
@Manishearth
Rollup merge ofrust-lang#25530- peferron:doc-closures-whitespace-fi…
2520277
…x, r=alexcrichton
Tiny fixes collected while reading through the Rust book. If they're too nitpicky please let me know and I'll ignore the next ones. :)
The spaces after the function and closure arguments might be intentional, but they do not make much sense: the usual formatting doesn't have such spaces, and they aren't helping align the three lines together either.
r? @steveklabnik (as suggested by [CONTRIBUTING.md](https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md))
@Manishearth
Rollup merge ofrust-lang#25537- carols10cents:grammar-oops, r=alexc…
5ed02b5
…richton
Hiiii soooo I'm trying to get the reference grammar and associated tests running again, and I swear I tested before but I must have had multiple things going on when I did, because the change I made in rust-lang#25137 to verify.rs is totally wrong. The RustLexer.tokens file that antlr generates has two sections:
```
EQ=1
LT=2
LE=3
EQEQ=4
NE=5
...
COMMENT=56
SHEBANG=57
UTF8_BOM=58
'='=1
'<'=2
'<='=3
'=='=4
...
```
and verify.rs is only interested in the first half-- the `continue` is to ignore the second half. In 9c7d5ae, I made it panic instead. I was trying to make sure verify.rs handled everything that might happen in the first half and complain if it didn't. That would mean the reference grammar was out of sync with at least verify.rs, if not the real grammar. But it's totally ok for verify.rs to not handle the entire second half of the file.
I'm sorry for breaking this :( Good thing these tests aren't being run regularly yet...? 😳
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: r+ force p=10
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
📌 Commit 5ed02b5 has been approved by Manishearth
@rust-highfive
rust-highfive
commented
May 18, 2015

Copy link


Copy Markdown

Contributor
r? @brson
(rust_highfive has picked a reviewer for you, use r? to override)
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge eb2bbb0...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
💔 Test failed - auto-linux-64-nopt-t
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: retry
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: force
bors added a commit
that referenced
this pull request
May 18, 2015
@bors
Auto merge of#25560- Manishearth:rollup, r=Manishearth
84b1e08
- Successful merges: #25526, #25530, #25537
- Failed merges:
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge 84b1e08...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
☀️ 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-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt
@bors
bors
merged commit 5ed02b5
into
rust-lang:masterMay 18, 2015
@CentrilCentril
added
the 
rollup
A PR which is a rollup
label
Oct 2, 2019
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

rollupA PR which is a rollup

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@Manishearth@bors@rust-highfive@brson@Centril@chellmuth@peferron@carols10cents

, '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('^' + ".*" + '
Rollup of 3 pull requests by Manishearth · Pull Request #25560 · rust-lang/rust · GitHub
Skip to content
Rollup of 3 pull requests - #25560
Merged
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
May 18, 2015
Merged
Rollup of 3 pull requests#25560
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
Conversation
@Manishearth
@ManishearthManishearth
commented
May 18, 2015

Copy link


Copy Markdown

Member
chellmuthand others
added 6 commits
May 17, 2015 00:19
@chellmuth
Fix typo in references-and-borrowing docs
09a473e
@peferron
Fix doc whitespace issues
82447cf
@carols10cents
Revert "Panic if the grammar verifier sees a token it doesn't recognize"
e70c858
This reverts commit 9c7d5ae.
This was wrong... the `continue` was to ignore the latter half of the
tokens file. Another mechanism will have to be used to keep the model
grammar's tokens in sync with the actual grammar's tokens :-/
@Manishearth
Rollup merge ofrust-lang#25526- chellmuth:patch-1, r=alexcrichton
6f2a069
@Manishearth
Rollup merge ofrust-lang#25530- peferron:doc-closures-whitespace-fi…
2520277
…x, r=alexcrichton
Tiny fixes collected while reading through the Rust book. If they're too nitpicky please let me know and I'll ignore the next ones. :)
The spaces after the function and closure arguments might be intentional, but they do not make much sense: the usual formatting doesn't have such spaces, and they aren't helping align the three lines together either.
r? @steveklabnik (as suggested by [CONTRIBUTING.md](https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md))
@Manishearth
Rollup merge ofrust-lang#25537- carols10cents:grammar-oops, r=alexc…
5ed02b5
…richton
Hiiii soooo I'm trying to get the reference grammar and associated tests running again, and I swear I tested before but I must have had multiple things going on when I did, because the change I made in rust-lang#25137 to verify.rs is totally wrong. The RustLexer.tokens file that antlr generates has two sections:
```
EQ=1
LT=2
LE=3
EQEQ=4
NE=5
...
COMMENT=56
SHEBANG=57
UTF8_BOM=58
'='=1
'<'=2
'<='=3
'=='=4
...
```
and verify.rs is only interested in the first half-- the `continue` is to ignore the second half. In 9c7d5ae, I made it panic instead. I was trying to make sure verify.rs handled everything that might happen in the first half and complain if it didn't. That would mean the reference grammar was out of sync with at least verify.rs, if not the real grammar. But it's totally ok for verify.rs to not handle the entire second half of the file.
I'm sorry for breaking this :( Good thing these tests aren't being run regularly yet...? 😳
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: r+ force p=10
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
📌 Commit 5ed02b5 has been approved by Manishearth
@rust-highfive
rust-highfive
commented
May 18, 2015

Copy link


Copy Markdown

Contributor
r? @brson
(rust_highfive has picked a reviewer for you, use r? to override)
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge eb2bbb0...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
💔 Test failed - auto-linux-64-nopt-t
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: retry
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: force
bors added a commit
that referenced
this pull request
May 18, 2015
@bors
Auto merge of#25560- Manishearth:rollup, r=Manishearth
84b1e08
- Successful merges: #25526, #25530, #25537
- Failed merges:
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge 84b1e08...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
☀️ 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-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt
@bors
bors
merged commit 5ed02b5
into
rust-lang:masterMay 18, 2015
@CentrilCentril
added
the 
rollup
A PR which is a rollup
label
Oct 2, 2019
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

rollupA PR which is a rollup

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@Manishearth@bors@rust-highfive@brson@Centril@chellmuth@peferron@carols10cents

, '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); }
})();
})();
Rollup of 3 pull requests by Manishearth · Pull Request #25560 · rust-lang/rust · GitHub
Skip to content
Rollup of 3 pull requests - #25560
Merged
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
May 18, 2015
Merged
Rollup of 3 pull requests#25560
bors merged 6 commits into
rust-lang:masterfrom 
Manishearth:rollup
Conversation
@Manishearth
@ManishearthManishearth
commented
May 18, 2015

Copy link


Copy Markdown

Member
chellmuthand others
added 6 commits
May 17, 2015 00:19
@chellmuth
Fix typo in references-and-borrowing docs
09a473e
@peferron
Fix doc whitespace issues
82447cf
@carols10cents
Revert "Panic if the grammar verifier sees a token it doesn't recognize"
e70c858
This reverts commit 9c7d5ae.
This was wrong... the `continue` was to ignore the latter half of the
tokens file. Another mechanism will have to be used to keep the model
grammar's tokens in sync with the actual grammar's tokens :-/
@Manishearth
Rollup merge ofrust-lang#25526- chellmuth:patch-1, r=alexcrichton
6f2a069
@Manishearth
Rollup merge ofrust-lang#25530- peferron:doc-closures-whitespace-fi…
2520277
…x, r=alexcrichton
Tiny fixes collected while reading through the Rust book. If they're too nitpicky please let me know and I'll ignore the next ones. :)
The spaces after the function and closure arguments might be intentional, but they do not make much sense: the usual formatting doesn't have such spaces, and they aren't helping align the three lines together either.
r? @steveklabnik (as suggested by [CONTRIBUTING.md](https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md))
@Manishearth
Rollup merge ofrust-lang#25537- carols10cents:grammar-oops, r=alexc…
5ed02b5
…richton
Hiiii soooo I'm trying to get the reference grammar and associated tests running again, and I swear I tested before but I must have had multiple things going on when I did, because the change I made in rust-lang#25137 to verify.rs is totally wrong. The RustLexer.tokens file that antlr generates has two sections:
```
EQ=1
LT=2
LE=3
EQEQ=4
NE=5
...
COMMENT=56
SHEBANG=57
UTF8_BOM=58
'='=1
'<'=2
'<='=3
'=='=4
...
```
and verify.rs is only interested in the first half-- the `continue` is to ignore the second half. In 9c7d5ae, I made it panic instead. I was trying to make sure verify.rs handled everything that might happen in the first half and complain if it didn't. That would mean the reference grammar was out of sync with at least verify.rs, if not the real grammar. But it's totally ok for verify.rs to not handle the entire second half of the file.
I'm sorry for breaking this :( Good thing these tests aren't being run regularly yet...? 😳
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: r+ force p=10
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
📌 Commit 5ed02b5 has been approved by Manishearth
@rust-highfive
rust-highfive
commented
May 18, 2015

Copy link


Copy Markdown

Contributor
r? @brson
(rust_highfive has picked a reviewer for you, use r? to override)
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge eb2bbb0...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
💔 Test failed - auto-linux-64-nopt-t
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: retry
@Manishearth
Manishearth
commented
May 18, 2015

Copy link


Copy Markdown

MemberAuthor
@bors: force
bors added a commit
that referenced
this pull request
May 18, 2015
@bors
Auto merge of#25560- Manishearth:rollup, r=Manishearth
84b1e08
- Successful merges: #25526, #25530, #25537
- Failed merges:
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
⌛ Testing commit 5ed02b5 with merge 84b1e08...
@bors
bors
commented
May 18, 2015

Copy link


Copy Markdown

Collaborator
☀️ 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-32-nopt-t, auto-win-32-opt, auto-win-64-nopt-t, auto-win-64-opt
@bors
bors
merged commit 5ed02b5
into
rust-lang:masterMay 18, 2015
@CentrilCentril
added
the 
rollup
A PR which is a rollup
label
Oct 2, 2019
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels

rollupA PR which is a rollup

Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

8 participants

@Manishearth@bors@rust-highfive@brson@Centril@chellmuth@peferron@carols10cents