From bbbfed2f93d3ba58a53ed8bf353ed11f3bb751db Mon Sep 17 00:00:00 2001 From: Eli Friedman Date: Sun, 9 Aug 2015 14:15:05 -0700 Subject: Use https URLs to refer to rust-lang.org where appropriate. Also fixes a few outdated links. --- src/libsyntax/diagnostics/plugin.rs | 2 +- src/libsyntax/lib.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/diagnostics/plugin.rs b/src/libsyntax/diagnostics/plugin.rs index 48fd05a7550..6c3bee3f48e 100644 --- a/src/libsyntax/diagnostics/plugin.rs +++ b/src/libsyntax/diagnostics/plugin.rs @@ -115,7 +115,7 @@ pub fn expand_register_diagnostic<'cx>(ecx: &'cx mut ExtCtxt, } // URLs can be unavoidably longer than the line limit, so we allow them. - // Allowed format is: `[name]: http://rust-lang.org/` + // Allowed format is: `[name]: https://www.rust-lang.org/` let is_url = |l: &str| l.starts_with('[') && l.contains("]:") && l.contains("http"); if msg.lines().any(|line| line.len() > MAX_DESCRIPTION_WIDTH && !is_url(line)) { diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 5424c0b214a..94c920406c4 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -21,9 +21,9 @@ #![staged_api] #![crate_type = "dylib"] #![crate_type = "rlib"] -#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", +#![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png", html_favicon_url = "https://doc.rust-lang.org/favicon.ico", - html_root_url = "http://doc.rust-lang.org/nightly/")] + html_root_url = "https://doc.rust-lang.org/nightly/")] #![feature(associated_consts)] #![feature(bitset)] -- cgit 1.4.1-3-g733a5 From 29945d5db002cc5330b85e17eee2e462ba34a986 Mon Sep 17 00:00:00 2001 From: Georg Brandl Date: Tue, 11 Aug 2015 17:35:22 +0200 Subject: syntax: fix use of "vector" for [x; n] literal and [x, y] patterns --- src/libsyntax/ast.rs | 2 +- src/libsyntax/parse/parser.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index 307403fda9a..bcc90dc47d9 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -941,7 +941,7 @@ pub enum Expr_ { /// `Foo {x: 1, .. base}`, where `base` is the `Option`. ExprStruct(Path, Vec, Option>), - /// A vector literal constructed from one repeated element. + /// An array literal constructed from one repeated element. /// /// For example, `[1u8; 5]`. The first expression is the element /// to be repeated; the second is the number of times to repeat it. diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs index 77042547742..e6242690ac0 100644 --- a/src/libsyntax/parse/parser.rs +++ b/src/libsyntax/parse/parser.rs @@ -2075,7 +2075,7 @@ impl<'a> Parser<'a> { // Nonempty vector. let first_expr = try!(self.parse_expr_nopanic()); if self.check(&token::Semi) { - // Repeating vector syntax: [ 0; 512 ] + // Repeating array syntax: [ 0; 512 ] try!(self.bump()); let count = try!(self.parse_expr_nopanic()); try!(self.expect(&token::CloseDelim(token::Bracket))); @@ -3260,7 +3260,7 @@ impl<'a> Parser<'a> { pat = PatTup(fields); } token::OpenDelim(token::Bracket) => { - // Parse [pat,pat,...] as vector pattern + // Parse [pat,pat,...] as slice pattern try!(self.bump()); let (before, slice, after) = try!(self.parse_pat_vec_elements()); try!(self.expect(&token::CloseDelim(token::Bracket))); -- cgit 1.4.1-3-g733a5